[tomcat7] 04/06: Fixed a test failure in TestResourceBundleELResolver

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch jessie
in repository tomcat7.

commit f6d884458d5f40e40e454a3ea455dd16f184c152
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 23 22:06:59 2016 +0100

    Fixed a test failure in TestResourceBundleELResolver
---
 debian/changelog | 1 +
 debian/rules     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index af6dc3f..13f86f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ tomcat7 (7.0.56-3+deb8u6) UNRELEASED; urgency=medium
     from failing
   * Fixed a test failure in the new TestNamingContext test added with the fix
     for CVE-2016-6797
+  * Fixed a test failure in TestResourceBundleELResolver
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 23 Nov 2016 21:21:55 +0100
 
diff --git a/debian/rules b/debian/rules
index 8afe7f5..c22c855 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,7 @@ TOMCAT7_DISTRIBUTION := "$(shell lsb_release -si)"
 ANT_ARGS := -Dcompile.debug=true \
 	-Dant.build.javac.source=1.6 \
 	-Dant.build.javac.target=1.6 \
+	-Djava.7.home=$(JAVA_HOME) \
 	-Djdt.jar=/usr/share/java/ecj.jar \
 	-Djunit.jar=/usr/share/java/junit4.jar \
 	-Dhamcrest.jar=/usr/share/java/hamcrest-core.jar \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git