[tomcat8] 08/10: Added asm-all.jar to the test classpath to fix TestWebappServiceLoader

[Emmanuel Bourg]

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

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

commit 25acfc35283e79ef080402334b7d6ce47fecf49c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 23 17:49:08 2016 +0100

    Added asm-all.jar to the test classpath to fix TestWebappServiceLoader
---
 debian/changelog                        |  1 +
 debian/patches/fix-test-classpath.patch | 13 +++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a7e5192..0b8c011 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ tomcat8 (8.0.14-1+deb8u5) UNRELEASED; urgency=medium
   * Refreshed the expired SSL certificates used by the tests
   * Set the locale when running the tests to prevent locale sensitive tests
     from failing
+  * Added asm-all.jar to the test classpath to fix TestWebappServiceLoader
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Nov 2016 23:21:56 +0100
 
diff --git a/debian/patches/fix-test-classpath.patch b/debian/patches/fix-test-classpath.patch
new file mode 100644
index 0000000..fb08675
--- /dev/null
+++ b/debian/patches/fix-test-classpath.patch
@@ -0,0 +1,13 @@
+Description: Adds ASM to the test classpath (required by easymock)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -209,6 +209,7 @@
+     <pathelement location="${easymock.jar}"/>
+     <pathelement location="${cglib.jar}"/>
+     <pathelement location="${objenesis.jar}"/>
++    <pathelement location="/usr/share/java/asm4-all.jar"/>
+     <path refid="compile.classpath" />
+     <path refid="tomcat.classpath" />
+   </path>
diff --git a/debian/patches/series b/debian/patches/series
index 86b1e58..9b4eacd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,7 @@
 #0020-disable-java8-support-with-jdtcompiler.patch
 fix-TestNonLoginAndBasicAuthenticator.patch
 disable-sslv3-tests.patch
+fix-test-classpath.patch
 CVE-2014-7810.patch
 CVE-2015-5174.patch
 CVE-2015-5345.patch

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