[tomcat7] 10/11: Added ASM to the test classpath (required by Easymock)

[Emmanuel Bourg]

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

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

commit 256d41394fb29c5c24fae648b381ab96e2065151
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Feb 18 22:19:51 2016 +0100

    Added ASM to the test classpath (required by Easymock)
---
 debian/changelog                                    |  3 ++-
 debian/patches/0026-add-asm-to-test-classpath.patch | 13 +++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4493dd5..a519b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-tomcat7 (7.0.67-1) UNRELEASED; urgency=medium
+tomcat7 (7.0.68-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
     - Refreshed the patches
     - New build dependencies on easymock, cglib and objenesis
+    - Added ASM to the test classpath (required by Easymock)
   * Use LC_ALL instead of LANG to format the date and make the documentation
     reproducible on the builders
   * Standards-Version updated to 3.9.7 (no changes)
diff --git a/debian/patches/0026-add-asm-to-test-classpath.patch b/debian/patches/0026-add-asm-to-test-classpath.patch
new file mode 100644
index 0000000..ef988a4
--- /dev/null
+++ b/debian/patches/0026-add-asm-to-test-classpath.patch
@@ -0,0 +1,13 @@
+Description: Add ASM to the test classpath (required by Easymock)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -205,6 +205,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 e15f218..8fbc522 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 0022-update-test-certificates.patch
 0024-disable-unit-tests-depending-on-network-access.path
 0025-standard-taglibs-compatibility.patch
+0026-add-asm-to-test-classpath.patch

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