[jenkins] 01/03: Added dependency on libcglib3-java to fix NoClassDefFoundError at runtime

[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 605cae162c868c26a0b4c91b9cf790b870047ae9
Author: Yann Rouillard <yrouillard at octo.com>
Date:   Sat Nov 15 13:37:11 2014 +0000

    Added dependency on libcglib3-java to fix NoClassDefFoundError at runtime
---
 debian/changelog                               |  7 +++++++
 debian/control                                 |  1 +
 debian/maven.rules                             |  2 ++
 debian/patches/0027-add-cglib-dependency.patch | 23 +++++++++++++++++++++++
 debian/patches/series                          |  1 +
 5 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b91e7ae..35c3db9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenkins (1.565.3-2.1) unstable; urgency=medium
+
+  * Team upload.
+  * Added dependency on libcglib3-java to fix NoClassDefFoundError at runtime.
+
+ -- Yann Rouillard <yann at pleiades.fr.eu.org>  Sat, 15 Nov 2014 12:14:33 +0000
+
 jenkins (1.565.3-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index fb9bb58..10af03d 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Build-Depends-Indep:
  libasm4-java,
  libbridge-method-injector-java (>= 1.9),
  libbytecode-compatibility-transformer-java,
+ libcglib3-java,
  libclassworlds-java,
  libcommons-beanutils-java,
  libcommons-codec-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index f66a94d..293bd78 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -69,6 +69,8 @@ s/org.kohsuke/org.jvnet.libpam4j/ libpam4j * s/.*/debian/ * *
 org.springframework s/spring-webmvc/spring-web/ * s/.*/3.x/ * *
 
 com.google.inject guice * s/.*/debian/ s/no_aop// *
+cglib cglib * s/.*/3.x/ * *
+
 s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * *
 org.jsr-305 jsr305 * 0.x * *
 s/org.jvnet.hudson/org.jenkins-ci/ test-annotations * s/.*/debian/ * *
diff --git a/debian/patches/0027-add-cglib-dependency.patch b/debian/patches/0027-add-cglib-dependency.patch
new file mode 100644
index 0000000..a998d5f
--- /dev/null
+++ b/debian/patches/0027-add-cglib-dependency.patch
@@ -0,0 +1,23 @@
+Description: Add dependency on cglib as we don't use guice-noaop library,
+ and the one we use depends on cglib.
+ Note that the library cglib is required at runtime and not only at the
+ compilation step.
+Author: Yann Rouillard <yann at pleiades.fr.org>, François-Xavier Vende <francois.vende at gmail.com>
+Forwarded: not-needed
+Index: jenkins-1.565.3/core/pom.xml
+===================================================================
+--- jenkins-1.565.3.orig/core/pom.xml
++++ jenkins-1.565.3/core/pom.xml
+@@ -100,6 +100,12 @@ THE SOFTWARE.
+       <classifier>no_aop</classifier>
+     </dependency>
+
++    <dependency>
++      <groupId>cglib</groupId>
++      <artifactId>cglib</artifactId>
++      <version>3.x</version>
++    </dependency>
++
+     <dependency> <!-- for compatibility only; all new code should use JNR -->
+       <groupId>org.jruby.ext.posix</groupId>
+       <artifactId>jna-posix</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index 1a410c2..ef92203 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ build/0019-io-compat.pach.patch
 0024-args4j-compatibility.patch
 0025-specify-plugins-versions.patch
 0026-add-jsr305-dependency.patch
+0027-add-cglib-dependency.patch

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