[jenkins] 25/32: Update exclusions for asm4
James Downing Page
jamespage at alioth.debian.org
Tue Aug 13 11:46:57 UTC 2013
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch master
in repository jenkins.
commit 3dd4f910f72a195f83dd02752614256e5c6cbf56
Author: James Page <james.page at ubuntu.com>
Date: Mon Aug 12 21:18:02 2013 +0100
Update exclusions for asm4
---
...2-Exclude-asm-dependencies-from-jnr-posix.patch | 26 +++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch b/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
index 0554b8d..ff252a6 100644
--- a/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
+++ b/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
@@ -4,25 +4,27 @@ Subject: Exclude asm dependencies from jnr-posix
This pulls in asm4 which creates class loading issues.
---
- core/pom.xml | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ core/pom.xml | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
diff --git a/core/pom.xml b/core/pom.xml
-index dc325b4..e366b72 100644
+index dc325b4..75e4a54 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -116,6 +116,14 @@ THE SOFTWARE.
+@@ -116,6 +116,16 @@ THE SOFTWARE.
<groupId>org.jruby.ext.posix</groupId>
<artifactId>jna-posix</artifactId>
<version>1.0.3</version>
-+ <exclusion>
-+ <groupId>org.ow2.asm</groupId>
-+ <artifactId>asm</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.ow2.asm</groupId>
-+ <artifactId>asm-commons</artifactId>
-+ </exclusion>
++ <exclusions>
++ <exclusion>
++ <groupId>org.ow2.asm</groupId>
++ <artifactId>asm</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>org.ow2.asm</groupId>
++ <artifactId>asm-commons</artifactId>
++ </exclusion>
++ </exclusions>
</dependency>
<dependency>
<groupId>org.jruby.extras</groupId>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git
More information about the pkg-java-commits
mailing list