[jenkins] 01/02: Depend on libasm4-java instead of libasm3-java

[Emmanuel Bourg]

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

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

commit daed14f1b37e28a48e9e470fb1851a55b05df66d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 15 17:46:43 2014 +0200

    Depend on libasm4-java instead of libasm3-java
---
 debian/changelog                                   |  1 +
 debian/control                                     |  2 +-
 debian/maven.rules                                 |  2 +-
 ...2-Exclude-asm-dependencies-from-jnr-posix.patch | 28 ----------------------
 ...e-stock-asm3.patch => 0015-use-stock-asm.patch} |  0
 debian/patches/series                              |  3 +--
 6 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 840dd4f..6021419 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ jenkins (1.565.2-1) UNRELEASED; urgency=medium
     - Depend on libstapler-adjunct-codemirror-java >= 1.3
     - Depend on jenkins-test-annotations >= 1.1
     - Depend on libbridge-method-injector-java >= 1.9
+    - Depend on libasm4-java instead of libasm3-java
   * jenkins-tomcat now targets Tomcat 8 instead of Tomcat 6 (Closes: #759623)
   * Fixed a build failure caused by the relocation of the Maven artifacts
     in groovy 1.8.6-4 (Closes: #759946)
diff --git a/debian/control b/debian/control
index e379b13..745b5bc 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Build-Depends-Indep:
  libantlr-maven-plugin-java,
  libaopalliance-java,
  libargs4j-java,
- libasm3-java,
+ libasm4-java,
  libbridge-method-injector-java (>= 1.9),
  libclassworlds-java,
  libcommons-beanutils-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index a22c58f..4e73704 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -28,7 +28,7 @@ org.kohsuke access-modifier-annotation jar s/.*/1.4/ * *
 org.kohsuke access-modifier-checker *  s/.*/1.4/ * *
 # 3.x is needed due to later versions of some deps in Debian
 # Patch to be submitted back upstream.
-asm * * s/2\..*/3.x/ * *
+s/asm/org.ow2.asm/ * * s/.*/4.x/ * *
 com.octo.captcha s/jcaptcha-all/jcaptcha/ * s/.*/debian/ * *
 commons-collections commons-collections * s/3\..*/3.x/ * *
 commons-httpclient commons-httpclient * s/3\..*/3.x/ * *
diff --git a/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch b/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
deleted file mode 100644
index 7816e1b..0000000
--- a/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: James Page <james.page at ubuntu.com>
-Date: Mon, 12 Aug 2013 21:08:43 +0100
-Subject: Exclude asm dependencies from jnr-posix
-
-This pulls in asm4 which creates class loading issues.
----
- core/pom.xml | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/core/pom.xml
-+++ b/core/pom.xml
-@@ -98,6 +98,16 @@
-       <groupId>org.jruby.ext.posix</groupId>
-       <artifactId>jna-posix</artifactId>
-       <version>1.0.3</version>
-+      <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>com.github.jnr</groupId>
diff --git a/debian/patches/build/0015-use-stock-asm3.patch b/debian/patches/build/0015-use-stock-asm.patch
similarity index 100%
rename from debian/patches/build/0015-use-stock-asm3.patch
rename to debian/patches/build/0015-use-stock-asm.patch
diff --git a/debian/patches/series b/debian/patches/series
index dcacaa4..377c983 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,14 +12,13 @@ native-integration/0011-purge-winp.patch
 dependency-upgrades/0012-jnr-posix-upgrade.patch
 build/0013-use-stock-jmdns.patch
 ubuntu/0014-ubuntu-font.patch
-build/0015-use-stock-asm3.patch
+build/0015-use-stock-asm.patch
 build/0016-use-debian-jbcrypt.patch
 build/0017-ignore-plugin-pom.xml.patch
 build/0018-fileupload-compat.patch
 build/0019-io-compat.pach.patch
 0020-Drop-use-of-gitsite-extension.patch
 0021-Compatibility-patch-for-guava-0.14.patch
-0022-Exclude-asm-dependencies-from-jnr-posix.patch
 0023-ignore-bytecode-compatibility-transformer.patch
 0024-args4j-compatibility.patch
 0025-specify-plugins-versions.patch

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