tags 655906 + patch thanks Hi,
I'm attaching a patch to fix this bug, please consider it. Thanks, -- Miguel Landaeta, miguel at miguel.cc secure email with PGP 0x7D8967E9 available at http://keyserver.pgp.com/ "Faith means not wanting to know what is true." -- Nietzsche
diff -Nru jenkins-1.409.3+dfsg/debian/changelog
jenkins-1.409.3+dfsg/debian/changelog
--- jenkins-1.409.3+dfsg/debian/changelog 2012-01-14 13:11:55.000000000
-0430
+++ jenkins-1.409.3+dfsg/debian/changelog 2012-01-22 14:51:49.000000000
-0430
@@ -1,3 +1,11 @@
+jenkins (1.409.3+dfsg-3~miguel1) unstable; urgency=low
+
+ * Team upload.
+ * Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones.
+ (Closes: #655906).
+
+ -- Miguel Landaeta <mig...@miguel.cc> Sun, 22 Jan 2012 14:50:23 -0430
+
jenkins (1.409.3+dfsg-2) unstable; urgency=low
[ James Page ]
diff -Nru jenkins-1.409.3+dfsg/debian/control
jenkins-1.409.3+dfsg/debian/control
--- jenkins-1.409.3+dfsg/debian/control 2012-01-14 13:11:55.000000000 -0430
+++ jenkins-1.409.3+dfsg/debian/control 2012-01-22 14:47:20.000000000 -0430
@@ -77,11 +77,10 @@
librobust-http-client-java,
libservlet2.4-java,
libsezpoz-java,
- libspring-aop-2.5-java,
- libspring-core-2.5-java,
+ libspring-aop-java,
+ libspring-core-java,
libspring-ldap-java,
- libspring-web-2.5-java,
- libspring-webmvc-2.5-java,
+ libspring-web-java,
libstapler-adjunct-timeline-java,
libstapler-java,
libtrilead-putty-extension-java,
diff -Nru jenkins-1.409.3+dfsg/debian/maven.rules
jenkins-1.409.3+dfsg/debian/maven.rules
--- jenkins-1.409.3+dfsg/debian/maven.rules 2012-01-14 13:11:55.000000000
-0430
+++ jenkins-1.409.3+dfsg/debian/maven.rules 2012-01-22 14:48:39.000000000
-0430
@@ -37,7 +37,7 @@
s/ant/org.apache.ant/ * * s/.*/debian/ * *
s/groovy/org.codehaus.groovy/ groovy* * s/.*/debian/ * *
org.mortbay.jetty * * s/6\..*/6.x/ * *
-org.springframework * * s/2\..*/2.x/ * *
+org.springframework * * s/2\..*/3.x/ * *
s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * *
# Remap hudson forks back to standard versions
s/org.jvnet.hudson/javax.activation/ activation * s/.*/debian/ * *
diff -Nru
jenkins-1.409.3+dfsg/debian/patches/dependency-upgrades/spring-webmvc-fix.patch
jenkins-1.409.3+dfsg/debian/patches/dependency-upgrades/spring-webmvc-fix.patch
---
jenkins-1.409.3+dfsg/debian/patches/dependency-upgrades/spring-webmvc-fix.patch
2012-01-14 13:11:55.000000000 -0430
+++
jenkins-1.409.3+dfsg/debian/patches/dependency-upgrades/spring-webmvc-fix.patch
1969-12-31 20:00:00.000000000 -0400
@@ -1,23 +0,0 @@
-Description: Additional optional dependency from Acegi Security which is
required
- Jenkins - this is due to use of later versions of Spring in the Acegi build
on
- Ubuntu/Debian
-Author: james.p...@canonical.com
-Forwarded: not-needed
-
-Index: jenkins/core/pom.xml
-===================================================================
---- jenkins.orig/core/pom.xml 2011-11-22 08:20:35.783223924 +0000
-+++ jenkins/core/pom.xml 2011-11-22 08:20:36.059223700 +0000
-@@ -684,6 +684,12 @@
- <version>2.5</version>
- </dependency>
- <dependency>
-+ <!-- Optional dependency for Acegi Security that Jenkins needs -->
-+ <groupId>org.springframework</groupId>
-+ <artifactId>spring-webmvc</artifactId>
-+ <version>2.5</version>
-+ </dependency>
-+ <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.5</version>
diff -Nru jenkins-1.409.3+dfsg/debian/patches/series
jenkins-1.409.3+dfsg/debian/patches/series
--- jenkins-1.409.3+dfsg/debian/patches/series 2012-01-14 13:11:55.000000000
-0430
+++ jenkins-1.409.3+dfsg/debian/patches/series 2012-01-22 14:50:11.000000000
-0430
@@ -14,7 +14,6 @@
native-integration/purge-windows-support.patch
dependency-upgrades/jcaptcha-slf4j.patch
dependency-upgrades/groovy-upgrade.patch
-dependency-upgrades/spring-webmvc-fix.patch
dependency-upgrades/jnr-posix-upgrade.patch
dependency-upgrades/asm3-upgrade.patch
ubuntu/ubuntu-font.patch
signature.asc
Description: Digital signature
