[SCM] jenkins packaging branch, master, updated. debian/1.409.3+dfsg-2-4-gc3a7611
James Page
james.page at ubuntu.com
Wed Feb 1 11:54:30 UTC 2012
The following commit has been merged in the master branch:
commit 0546e7fbae3eec0444e5df048b3840319baffa98
Author: James Page <james.page at ubuntu.com>
Date: Tue Jan 31 10:38:31 2012 +0000
Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones. (Closes: #655906).
* Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones.
(Closes: #655906).
* New upstream release.
- d/control: Add new dependencies on libjenkins-remoting-java,
libstapler-adjunct-codemirror-java and libmaven-hpi-plugin-java.
- d/control: Dropped libjcaptcha-java; no longer needed.
* d/control: Switch to using packaged animal-sniffer.
* Refreshed patches:
- d/patches/build/{debianize-antrun-war,animal-sniffer-annotation}.patch:
dropped as no longer required.
diff --git a/debian/NEWS b/debian/NEWS
index 2bbb29a..6aa482f 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,8 +1,15 @@
-jenkins (1.409.3-1) unstable; urgency=low
+jenkins (1.424.2+dfsg-1) precise; urgency=low
- * This release of jenkins for Debian makes some changes to the way that
- the upstart configuration files work when built for Ubuntu; specifically
- all environment variable changes should now be made in /etc/default/jenkins
- and /etc/default/jenkins-slave rather than using upstart override files.
+ * This new upstream release of Jenkins does not currently include
+ the new ssh-cli and rsa identity management features.
+
+ -- James Page <james.page at ubuntu.com> Tue, 31 Jan 2012 10:37:33 +0000
+
+jenkins (1.409.3+dfsg-1) unstable; urgency=low
+
+ * This release of jenkins for Debian makes some changes to the way that
+ the upstart configuration files work when built for Ubuntu; specifically
+ all environment variable changes should now be made in /etc/default/jenkins
+ and /etc/default/jenkins-slave rather than using upstart override files.
-- James Page <james.page at ubuntu.com> Fri, 09 Dec 2011 13:02:09 +0000
diff --git a/debian/changelog b/debian/changelog
index 3ca4d06..1e8df39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+jenkins (1.424.2+dfsg-1) unstable; urgency=low
+
+ [ Miguel Landaeta ]
+ * Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones.
+ (Closes: #655906).
+
+ [ James Page ]
+ * New upstream release.
+ - d/control: Add new dependencies on libjenkins-remoting-java,
+ libstapler-adjunct-codemirror-java and libmaven-hpi-plugin-java.
+ - d/control: Dropped libjcaptcha-java; no longer needed.
+ * d/control: Switch to using packaged animal-sniffer.
+ * Refreshed patches:
+ - d/patches/build/{debianize-antrun-war,animal-sniffer-annotation}.patch:
+ dropped as no longer required.
+
+ -- James Page <james.page at ubuntu.com> Tue, 31 Jan 2012 10:33:56 +0000
+
jenkins (1.409.3+dfsg-2) unstable; urgency=low
[ James Page ]
diff --git a/debian/control b/debian/control
index 5d9970e..cc4aadb 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Build-Depends-Indep:
libaccess-modifier-checker-java,
libacegi-security-java,
libakuma-java,
+ libanimal-sniffer-java,
libannotation-indexer-java,
libantlr-java,
libantlr-maven-plugin-java,
@@ -43,12 +44,12 @@ Build-Depends-Indep:
libcommons-lang-java,
libcommons-logging-java,
libjaxen-java,
- libjcaptcha-java,
libjellydoc-java,
libjenkins-commons-jelly-java,
libjenkins-commons-jexl-java,
libjenkins-htmlunit-java,
libjenkins-json-java (>= 2.1-rev7),
+ libjenkins-remoting-java,
libjenkins-trilead-ssh2-java,
libjenkins-winstone-java (>= 0.9.10-jenkins-31),
libjenkins-xstream-java,
@@ -67,6 +68,7 @@ Build-Depends-Indep:
libmaven-dependency-plugin-java,
libmaven-embedder-java,
libmaven-enforcer-plugin-java,
+ libmaven-hpi-plugin-java,
libmaven-install-plugin-java,
libmaven-javadoc-plugin-java,
libmaven-stapler-plugin-java,
@@ -77,11 +79,11 @@ Build-Depends-Indep:
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-codemirror-java,
libstapler-adjunct-timeline-java,
libstapler-java,
libtrilead-putty-extension-java,
@@ -145,7 +147,12 @@ Description: Jenkins CI core Java libraries
Package: jenkins-common
Architecture: all
-Depends: libjffi-java, libjna-java, libjnr-posix-java, ${misc:Depends}
+Depends:
+ libjenkins-remoting-java,
+ libjffi-java,
+ libjna-java,
+ libjnr-posix-java,
+ ${misc:Depends}
Recommends: jenkins-cli
Description: Jenkins common Java components and web application
Jenkins monitors executions of repeated jobs, such as building a software
@@ -238,6 +245,7 @@ Depends:
default-jre-headless | java6-runtime-headless,
libcommons-io-java,
libcommons-lang-java,
+ libjenkins-remoting-java,
libjenkins-xstream-java,
libjffi-java,
libjnr-posix-java,
diff --git a/debian/copyright b/debian/copyright
index 8ab3871..d600d78 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -45,11 +45,6 @@ Copyright: 2004- Kohsuke Kawaguchi,
2004- and a number of other of contributers
License: MIT
-Files: remoting/src/main/java/hudson/remoting/FastPipedOutputStream.java
- remoting/src/main/java/hudson/remoting/FastPipedInputStream.java
-Copyright: 2006-2008 Makoto YUI
-License: Apache-2.0
-
Files: test/src/test/java/hudson/maven/Maven3BuildTest.java
maven-plugin/src/main/java/hudson/maven/util/ExecutionEventLogger.java
maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java
diff --git a/debian/jenkins-cli.classpath b/debian/jenkins-cli.classpath
index 2196a13..c0150c1 100644
--- a/debian/jenkins-cli.classpath
+++ b/debian/jenkins-cli.classpath
@@ -1 +1 @@
-usr/share/jenkins/cli/java/cli.jar /usr/share/java/args4j.jar /usr/share/java/localizer.jar /usr/share/jenkins/cli/java/remoting.jar
+usr/share/jenkins/cli/java/cli.jar /usr/share/java/args4j.jar /usr/share/java/localizer.jar /usr/share/java/jenkins-remoting.jar
diff --git a/debian/jenkins-cli.install b/debian/jenkins-cli.install
index 32da268..0e2bfcd 100644
--- a/debian/jenkins-cli.install
+++ b/debian/jenkins-cli.install
@@ -1,4 +1,3 @@
-#remoting/target/remoting-*.jar usr/share/jenkins/cli/java
cli/target/cli-*-jar-with-dependencies.jar usr/share/jenkins/cli/java
debian/bin/jenkins-cli usr/bin
debian/etc/cli.conf etc/jenkins
diff --git a/debian/jenkins-external-job-monitor.install b/debian/jenkins-external-job-monitor.install
index e2a34f9..6849f85 100644
--- a/debian/jenkins-external-job-monitor.install
+++ b/debian/jenkins-external-job-monitor.install
@@ -1,4 +1,3 @@
core/target/jenkins-core-*.jar usr/share/jenkins/external-job-monitor/java
debian/bin/jenkins-monitor-job usr/bin
debian/etc/external-job-monitor.conf etc/jenkins
-remoting/target/remoting-*.jar usr/share/jenkins/external-job-monitor/java
diff --git a/debian/jenkins-external-job-monitor.links b/debian/jenkins-external-job-monitor.links
index fc63c4f..b9e2d0b 100644
--- a/debian/jenkins-external-job-monitor.links
+++ b/debian/jenkins-external-job-monitor.links
@@ -5,3 +5,4 @@
/usr/share/java/commons-lang.jar /usr/share/jenkins/external-job-monitor/java/commons-lang-debian.jar
/usr/share/java/jenkins-xstream.jar /usr/share/jenkins/external-job-monitor/java/xstream-debian.jar
/usr/share/java/commons-io.jar /usr/share/jenkins/external-job-monitor/java/commons-io-debian.jar
+/usr/share/java/jenkins-remoting.jar /usr/share/jenkins/external-job-monitor/java/remoting.jar
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index 6f72d3f..889880c 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -24,7 +24,6 @@
# temporarily for certain artifacts such as Javadoc jars.
#
pom.xml --has-package-version --no-parent
-remoting/pom.xml --has-package-version --ignore-pom
core/pom.xml --has-package-version --ignore-pom
war/pom.xml --has-package-version --ignore-pom
cli/pom.xml --has-package-version --ignore-pom
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index 77f9ba4..91cfafc 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -68,3 +68,9 @@ org.kohsuke access-modifier-checker * * * *
org.codehaus.mojo antlr-maven-plugin * * * *
org.apache.maven.plugins maven-war-plugin * * * *
org.apache.maven.plugins maven-dependency-plugin * * * *
+org.apache.maven.plugins maven-assembly-plugin * * * *
+# New deps to ignore for 1.424.1
+org.codehaus.mojo build-helper-maven-plugin * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
+org.jenkins-ci.tools maven-hpi-plugin * * * *
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index e791943..9fd8fe9 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -53,9 +53,6 @@ org.jenkins-ci.main maven-plugin * * * *
# OK: Modules not current built as part of jenkins core on Ubuntu
org.jenkins-ci.main jenkins-test-harness * * * *
org.jenkins-ci.main ui-samples-plugin * * * *
-# FIXME: Animal Sniffer will be patched in for the time being
-org.jvnet animal-sniffer * * * *
-org.jvnet animal-sniffer-annotation * * * *
# OK: Cloudbees License Plugin - disable for Debian build
com.cloudbees maven-license-plugin * * * *
# OK: Platform Specific Libraries not relevant for Debian
@@ -68,3 +65,13 @@ org.jenkins-ci windows-remote-command * * * *
#asm asm-attrs * * * *
# OK: Ignore identity stuff in Jenkins for now
org.jenkins-ci.modules instance-identity * * * *
+# New deps to ignore for 1.424.1
+org.codehaus.mojo build-helper-maven-plugin * * * *
+# Ignore JRebel - does not appear to by used
+org.kohsuke.stapler stapler-jrebel * * * *
+# Ignore core annotation processors - this is a dummy pakcage
+org.jenkins-ci core-annotation-processors * * * *
+# FIXME: Temp ignore - these need packaging but maven-hpi-plugin
+# needs fixing up first.
+org.jenkins-ci.modules instance-identity * * * *
+org.jenkins-ci.modules ssh-cli-auth * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 39acad8..ec75f6d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,7 +22,7 @@ commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
junit junit jar s/3\..*/3.x/ * *
junit junit jar s/4\..*/4.x/ * *
# Map onto exact version during build process
-org.jenkins-ci.main * * s/1\..*/1.409.3/ * *
+org.jenkins-ci.main * * s/1\..*/1.424.2/ * *
org.kohsuke access-modifier-annotation jar s/.*/1.0/ * *
org.kohsuke access-modifier-checker * s/.*/1.0/ * *
# 3.x is needed due to later versions of some deps in Debian
@@ -37,7 +37,7 @@ org.kohsuke.stapler maven-stapler-plugin * s/.*/1.15/ * *
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/ * *
@@ -45,7 +45,7 @@ s/org.jenkins-ci/javax.jmdns/ jmdns * s/.*/debian/ * *
s/org.jvnet.hudson/net.sf.jtidy/ jtidy * s/.*/debian/ * *
s/org.jvnet.hudson/org.apache.maven/ maven-embedder * s/.*/debian/ * *
org.springframework.security * * s/2\..*/2.x/ * *
-org.jenkins-ci.tools maven-hpi-plugin * s/.*/1.63/ * *
+org.jenkins-ci.tools maven-hpi-plugin * s/.*/1.79/ * *
org.jenkins-ci jenkins pom s/.*/1.x/ * *
org.jenkins-ci.plugins plugin * s/1\..*/1.x/ * *
# Remap of jellys to jenkins variant
@@ -57,3 +57,6 @@ s/org.jvnet.hudson/org.jenkins-ci/ task-reactor * s/.*/debian/ * *
javax.servlet jstl * s/1\.1\..*/1.1/ * *
# Remap for rename jna->jnr in Debian
org.jruby.ext.posix s/jna-posix/jnr-posix/ * s/.*/debian/ * *
+# Remap for later version of animal sniffer
+s/org.jvnet/org.codehaus.mojo/ s/animal-sniffer-annotation/animal-sniffer-annotations/ jar s/.*/debian/ * *
+
diff --git a/debian/patches/build/animal-sniffer-annotation.patch b/debian/patches/build/animal-sniffer-annotation.patch
deleted file mode 100644
index 57b885e..0000000
--- a/debian/patches/build/animal-sniffer-annotation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Source code annotation for animal-sniffer which detects
- and warns about backwards Java compatibility. Not used in Debian build
- of Jenkins and under separate ITP (at which point this patch can be
- dropped). This patch plugs in the IgnoreJRERequirement annotation to
- allow compilation only.
-Author: James Page <james.page at ubuntu.com>
-Forwarded: not-needed
-
-Index: jenkins/core/src/main/java/org/jvnet/animal_sniffer/IgnoreJRERequirement.java
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ jenkins/core/src/main/java/org/jvnet/animal_sniffer/IgnoreJRERequirement.java 2011-11-22 08:20:32.023226979 +0000
-@@ -0,0 +1,16 @@
-+package org.jvnet.animal_sniffer;
-+
-+import java.lang.annotation.Retention;
-+import java.lang.annotation.Documented;
-+import java.lang.annotation.Target;
-+import java.lang.annotation.ElementType;
-+import static java.lang.annotation.RetentionPolicy.CLASS;
-+
-+/**
-+ * @author Kohsuke Kawaguchi
-+ */
-+ at Retention(CLASS)
-+ at Documented
-+ at Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE})
-+public @interface IgnoreJRERequirement {
-+}
diff --git a/debian/patches/build/apt-stapler-processing.patch b/debian/patches/build/apt-stapler-processing.patch
index c078d8a..d3e2e57 100644
--- a/debian/patches/build/apt-stapler-processing.patch
+++ b/debian/patches/build/apt-stapler-processing.patch
@@ -10,18 +10,9 @@ Forwarded: not-needed
Index: jenkins/core/pom.xml
===================================================================
---- jenkins.orig/core/pom.xml 2011-11-22 08:20:31.439227453 +0000
-+++ jenkins/core/pom.xml 2011-11-22 08:20:33.767225562 +0000
-@@ -33,7 +33,7 @@
- </parent>
-
- <artifactId>jenkins-core</artifactId>
-- <packaging>stapler-jar</packaging>
-+
- <name>Jenkins core</name>
- <description>
- Contains the core Jenkins code and view files to render HTML.
-@@ -71,16 +71,26 @@
+--- jenkins.orig/core/pom.xml 2012-01-31 10:35:32.864316397 +0000
++++ jenkins/core/pom.xml 2012-01-31 10:35:34.520316354 +0000
+@@ -573,6 +573,24 @@
</executions>
</plugin>
<plugin>
@@ -45,14 +36,4 @@ Index: jenkins/core/pom.xml
+ <plugin>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
-- <extensions>true</extensions>
-- <dependencies>
-- <dependency>
-- <groupId>org.jvnet.maven-jellydoc-plugin</groupId>
-- <artifactId>maven-jellydoc-plugin</artifactId>
-- <version>1.4</version>
-- </dependency>
-- </dependencies>
- <configuration>
- <fork>${staplerFork}</fork><!-- the source code is big enough now that otherwise it fails with OutOfMemoryError -->
- <maxmem>128m</maxmem>
+ <version>1.16</version>
diff --git a/debian/patches/build/build.patch b/debian/patches/build/build.patch
index 1c4cc7a..3d8a2ae 100644
--- a/debian/patches/build/build.patch
+++ b/debian/patches/build/build.patch
@@ -4,11 +4,11 @@ Forwarded: not-needed
Index: jenkins/pom.xml
===================================================================
---- jenkins.orig/pom.xml 2011-11-22 08:20:18.891237652 +0000
-+++ jenkins/pom.xml 2011-11-22 08:20:31.439227453 +0000
-@@ -41,10 +41,7 @@
+--- jenkins.orig/pom.xml 2012-01-31 10:35:19.684316727 +0000
++++ jenkins/pom.xml 2012-01-31 10:35:32.864316397 +0000
+@@ -48,10 +48,7 @@
+
<modules>
- <module>remoting</module>
<module>core</module>
- <module>maven-plugin</module>
- <module>ui-samples-plugin</module>
@@ -16,12 +16,12 @@ Index: jenkins/pom.xml
- <module>test</module>
<module>cli</module>
</modules>
-
+
Index: jenkins/core/pom.xml
===================================================================
---- jenkins.orig/core/pom.xml 2011-11-22 08:20:18.875237665 +0000
-+++ jenkins/core/pom.xml 2011-11-22 08:20:31.439227453 +0000
-@@ -557,6 +557,16 @@
+--- jenkins.orig/core/pom.xml 2012-01-31 10:35:19.708316726 +0000
++++ jenkins/core/pom.xml 2012-01-31 10:35:32.864316397 +0000
+@@ -285,6 +285,16 @@
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
<version>1.0</version>
diff --git a/debian/patches/build/debianize-antrun-war.patch b/debian/patches/build/debianize-antrun-war.patch
deleted file mode 100644
index 6f646ad..0000000
--- a/debian/patches/build/debianize-antrun-war.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Debianize the version numbers of maven artefacts
- in the antrun target for the web application. This is not
- transformed by maven-debian-helper.
-Author: James Page <james.page at ubuntu.com>
-Forwarded: not-needed
-
-Index: jenkins/war/pom.xml
-===================================================================
---- jenkins.orig/war/pom.xml 2011-11-22 08:20:18.471237994 +0000
-+++ jenkins/war/pom.xml 2011-11-22 08:20:32.891226274 +0000
-@@ -109,7 +109,7 @@
- <mkdir dir="target/generated-resources" />
-
- <!-- put executable war header -->
-- <resolveArtifact groupId="org.jenkins-ci" artifactId="executable-war" version="1.19" type="jar" property="executable-war.jar" />
-+ <resolveArtifact groupId="org.jenkins-ci" artifactId="executable-war" version="debian" type="jar" property="executable-war.jar" />
- <unjar src="${executable-war.jar}" dest="target/generated-resources">
- <patternset>
- <include name="**/*.class" />
diff --git a/debian/patches/build/disable-avalon-frawework.patch b/debian/patches/build/disable-avalon-frawework.patch
index 0874cf3..9bec7f9 100644
--- a/debian/patches/build/disable-avalon-frawework.patch
+++ b/debian/patches/build/disable-avalon-frawework.patch
@@ -5,8 +5,8 @@ Forwarded: no
Index: jenkins/core/src/main/java/hudson/util/DescribableList.java
===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/DescribableList.java 2011-11-22 08:20:18.619237873 +0000
-+++ jenkins/core/src/main/java/hudson/util/DescribableList.java 2011-11-22 08:20:32.315226742 +0000
+--- jenkins.orig/core/src/main/java/hudson/util/DescribableList.java 2012-01-31 10:35:19.540316731 +0000
++++ jenkins/core/src/main/java/hudson/util/DescribableList.java 2012-01-31 10:35:33.408316383 +0000
@@ -39,7 +39,6 @@
import hudson.model.ReconfigurableDescribable;
import hudson.model.Saveable;
diff --git a/debian/patches/build/disable-plugins.patch b/debian/patches/build/disable-plugins.patch
index d389c53..0d7539a 100644
--- a/debian/patches/build/disable-plugins.patch
+++ b/debian/patches/build/disable-plugins.patch
@@ -4,21 +4,9 @@ Forwarded: not-needed
Index: jenkins/war/pom.xml
===================================================================
---- jenkins.orig/war/pom.xml 2011-11-22 08:20:32.891226274 +0000
-+++ jenkins/war/pom.xml 2011-11-22 08:20:33.479225796 +0000
-@@ -122,11 +122,6 @@
- <resolveArtifact groupId="${project.groupId}" artifactId="cli" classifier="jar-with-dependencies" version="${project.version}" type="jar" tofile="${basedir}/target/generated-resources/WEB-INF/jenkins-cli.jar" />
- <resolveArtifact artifactId="winstone" tofile="${basedir}/target/generated-resources/winstone.jar" />
-
-- <!-- bundled plugins -->
-- <resolveArtifact type="hpi" groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
-- <resolveArtifact type="hpi" groupId="org.jenkins-ci.plugins" artifactId="ssh-slaves" version="0.15" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
-- <resolveArtifact type="hpi" groupId="org.jenkins-ci.plugins" artifactId="subversion" version="1.25" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
-- <resolveArtifact type="hpi" groupId="org.jvnet.hudson.plugins" artifactId="cvs" version="1.2" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/cvs.hpi" />
- </tasks>
- </configuration>
- </execution>
-@@ -281,6 +276,11 @@
+--- jenkins.orig/war/pom.xml 2012-01-31 10:35:19.368316735 +0000
++++ jenkins/war/pom.xml 2012-01-31 10:35:34.256316362 +0000
+@@ -121,6 +121,11 @@
<scope>system</scope>
<systemPath>/usr/local/yjp/lib/yjp.jar</systemPath>
</dependency-->
@@ -28,5 +16,36 @@ Index: jenkins/war/pom.xml
+ <version>3.1-rc1</version>
+ </dependency>
</dependencies>
-
- <properties>
+
+ <build>
+@@ -208,30 +213,6 @@
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+ <destFileName>winstone.jar</destFileName>
+ </artifactItem>
+- <!-- bundled plugins -->
+- <artifactItem>
+- <groupId>${project.groupId}</groupId>
+- <artifactId>maven-plugin</artifactId>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>ssh-slaves</artifactId>
+- <version>0.17</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>subversion</artifactId>
+- <version>1.28</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jvnet.hudson.plugins</groupId>
+- <artifactId>cvs</artifactId>
+- <version>1.2</version>
+- <type>hpi</type>
+- </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/plugins</outputDirectory>
+ <stripVersion>true</stripVersion>
diff --git a/debian/patches/build/openjdk6.patch b/debian/patches/build/openjdk6.patch
index b429b33..619e644 100644
--- a/debian/patches/build/openjdk6.patch
+++ b/debian/patches/build/openjdk6.patch
@@ -6,9 +6,9 @@ Forwarded: https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/716959
Index: jenkins/core/src/main/java/hudson/model/AbstractBuild.java
===================================================================
---- jenkins.orig/core/src/main/java/hudson/model/AbstractBuild.java 2011-11-22 08:20:18.547237932 +0000
-+++ jenkins/core/src/main/java/hudson/model/AbstractBuild.java 2011-11-22 08:20:32.603226508 +0000
-@@ -1135,4 +1135,13 @@
+--- jenkins.orig/core/src/main/java/hudson/model/AbstractBuild.java 2012-01-31 10:35:19.484316732 +0000
++++ jenkins/core/src/main/java/hudson/model/AbstractBuild.java 2012-01-31 10:35:33.684316375 +0000
+@@ -1186,4 +1186,13 @@
}
private static final Logger LOGGER = Logger.getLogger(AbstractBuild.class.getName());
@@ -22,3 +22,19 @@ Index: jenkins/core/src/main/java/hudson/model/AbstractBuild.java
+
+
}
+Index: jenkins/core/src/main/java/hudson/DescriptorExtensionList.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/DescriptorExtensionList.java 2012-01-31 10:35:19.464316733 +0000
++++ jenkins/core/src/main/java/hudson/DescriptorExtensionList.java 2012-01-31 10:35:33.684316375 +0000
+@@ -79,8 +79,9 @@
+ * @deprecated as of 1.416
+ * Use {@link #create(Jenkins, Class)}
+ */
+- public static <T extends Describable<T>,D extends Descriptor<T>>
+- DescriptorExtensionList<T,D> createDescriptorList(Hudson hudson, Class<T> describableType) {
++ @SuppressWarnings({"unchecked", "rawtypes"})
++ public static /*<T extends Describable<T>,D extends Descriptor<T>>*/
++ DescriptorExtensionList/*<T,D>*/ createDescriptorList(Hudson hudson, Class/*<T>*/ describableType) {
+ return createDescriptorList((Jenkins)hudson,describableType);
+ }
+
diff --git a/debian/patches/build/plugin.patch b/debian/patches/build/plugin.patch
index f5f49eb..3159e7a 100644
--- a/debian/patches/build/plugin.patch
+++ b/debian/patches/build/plugin.patch
@@ -5,53 +5,53 @@ Forwarded: not-needed
Index: jenkins/plugins/pom.xml
===================================================================
---- jenkins.orig/plugins/pom.xml 2011-11-22 08:20:18.751237766 +0000
-+++ jenkins/plugins/pom.xml 2011-11-22 08:20:31.743227207 +0000
+--- jenkins.orig/plugins/pom.xml 2012-01-31 10:35:19.584316730 +0000
++++ jenkins/plugins/pom.xml 2012-01-31 10:35:33.136316390 +0000
@@ -10,7 +10,7 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<name>Jenkins plugin POM</name>
-- <version>1.409-SNAPSHOT</version>
-+ <version>1.409.3</version>
+- <version>1.424.2-SNAPSHOT</version>
++ <version>1.424.2</version>
<packaging>pom</packaging>
- <properties>
-@@ -38,7 +38,7 @@
+ <!--
+@@ -33,7 +33,7 @@
<dependency><!-- if a plugin wants to depend on the maven plugin, choose the right version automatically -->
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
-- <version>1.409-SNAPSHOT</version>
-+ <version>1.409.3</version>
+- <version>1.424.2-SNAPSHOT</version>
++ <version>1.424.2</version>
</dependency>
</dependencies>
</dependencyManagement>
-@@ -48,25 +48,25 @@
+@@ -43,25 +43,25 @@
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-war</artifactId>
<type>war</type>
-- <version>1.409-SNAPSHOT</version>
-+ <version>1.409.3</version>
+- <version>1.424.2-SNAPSHOT</version>
++ <version>1.424.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-core</artifactId>
-- <version>1.409-SNAPSHOT</version>
-+ <version>1.409.3</version>
+- <version>1.424.2-SNAPSHOT</version>
++ <version>1.424.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness</artifactId>
-- <version>1.409-SNAPSHOT</version>
-+ <version>1.409.3</version>
+- <version>1.424.2-SNAPSHOT</version>
++ <version>1.424.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>ui-samples-plugin</artifactId>
-- <version>1.409-SNAPSHOT</version>
-+ <version>1.409.3</version>
+- <version>1.424.2-SNAPSHOT</version>
++ <version>1.424.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/debian/patches/build/remove-licensing-report.patch b/debian/patches/build/remove-licensing-report.patch
index 8a11c8c..a890438 100644
--- a/debian/patches/build/remove-licensing-report.patch
+++ b/debian/patches/build/remove-licensing-report.patch
@@ -5,9 +5,9 @@ Forwarded: not-needed
Index: jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly
===================================================================
---- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.jelly 2011-11-22 08:20:18.359238085 +0000
-+++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly 2011-11-22 08:20:33.175226043 +0000
-@@ -30,13 +30,6 @@
+--- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.jelly 2012-01-31 10:35:19.420316734 +0000
++++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly 2012-01-31 10:35:33.968316369 +0000
+@@ -31,13 +31,6 @@
<p>
${%blurb}
</p>
@@ -16,16 +16,19 @@ Index: jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly
- ${%dependencies}
- </p>
- <t:thirdPartyLicenses>
-- <st:include page="/META-INF/licenses.xml" />
+- <st:include page="/META-INF/licenses.xml" optional="true" />
- </t:thirdPartyLicenses>
</l:main-panel>
</l:layout>
</j:jelly>
Index: jenkins/core/src/main/resources/hudson/AboutJenkins/index.properties
===================================================================
---- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.properties 2011-11-22 08:20:18.327238111 +0000
-+++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.properties 2011-11-22 08:20:33.175226043 +0000
-@@ -1,4 +1,4 @@
+--- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.properties 2012-01-31 10:35:19.400316734 +0000
++++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.properties 2012-01-31 10:35:33.968316369 +0000
+@@ -20,7 +20,7 @@
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ # THE SOFTWARE.
+
-about=About Jenkins {0}
+about=About Jenkins {0} (Debian/Ubuntu distribution)
blurb=<a href="http://jenkins-ci.org/">Jenkins</a> is a community-developed open-source continuous integration server.
diff --git a/debian/patches/dependency-upgrades/animal-sniffer-upgrade.patch b/debian/patches/dependency-upgrades/animal-sniffer-upgrade.patch
new file mode 100644
index 0000000..6b60fac
--- /dev/null
+++ b/debian/patches/dependency-upgrades/animal-sniffer-upgrade.patch
@@ -0,0 +1,109 @@
+Description: Upgrade packages for animal-sniffer to support
+ latest 1.7 revision.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: https://github.com/jenkinsci/jenkins/commit/dd8cdda6eeb4a29d991a61d58e06167b51ffa20f
+
+Index: jenkins/core/src/main/java/hudson/Functions.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/Functions.java 2012-01-31 10:35:18.596316754 +0000
++++ jenkins/core/src/main/java/hudson/Functions.java 2012-01-31 10:35:37.188316288 +0000
+@@ -63,7 +63,7 @@
+ import org.apache.commons.jelly.XMLOutput;
+ import org.apache.commons.jexl.parser.ASTSizeFunction;
+ import org.apache.commons.jexl.util.Introspector;
+-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
++import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+ import org.jvnet.tiger_types.Types;
+ import org.kohsuke.stapler.Ancestor;
+ import org.kohsuke.stapler.Stapler;
+Index: jenkins/core/src/main/java/hudson/Util.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/Util.java 2012-01-31 10:35:18.604316753 +0000
++++ jenkins/core/src/main/java/hudson/Util.java 2012-01-31 10:35:37.188316288 +0000
+@@ -42,7 +42,7 @@
+ import org.jruby.ext.posix.FileStat;
+ import org.jruby.ext.posix.POSIX;
+ import org.kohsuke.stapler.Stapler;
+-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
++import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+
+ import javax.crypto.SecretKey;
+ import javax.crypto.spec.SecretKeySpec;
+Index: jenkins/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java 2012-01-31 10:35:18.640316752 +0000
++++ jenkins/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java 2012-01-31 10:35:37.188316288 +0000
+@@ -26,7 +26,7 @@
+ import hudson.Extension;
+ import jenkins.model.Jenkins;
+ import hudson.model.PeriodicWork;
+-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
++import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+
+ import java.util.logging.Logger;
+
+Index: jenkins/core/src/main/java/hudson/model/ExternalRun.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/model/ExternalRun.java 2012-01-31 10:35:18.616316754 +0000
++++ jenkins/core/src/main/java/hudson/model/ExternalRun.java 2012-01-31 10:35:37.188316288 +0000
+@@ -26,7 +26,7 @@
+ import hudson.Proc;
+ import hudson.util.DecodingStream;
+ import hudson.util.DualOutputStream;
+-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
++import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+
+ import javax.xml.stream.XMLInputFactory;
+ import javax.xml.stream.XMLStreamException;
+Index: jenkins/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java 2012-01-31 10:35:18.624316754 +0000
++++ jenkins/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java 2012-01-31 10:35:37.188316288 +0000
+@@ -29,7 +29,7 @@
+ import hudson.Util;
+ import hudson.slaves.OfflineCause;
+ import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace;
+-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
++import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+
+ import java.io.File;
+ import java.io.IOException;
+Index: jenkins/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java 2012-01-31 10:35:18.632316753 +0000
++++ jenkins/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java 2012-01-31 10:35:37.188316288 +0000
+@@ -31,7 +31,7 @@
+ import jenkins.model.Jenkins;
+ import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace;
+ import hudson.remoting.VirtualChannel;
+-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
++import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+ import org.kohsuke.stapler.DataBoundConstructor;
+
+ import java.io.File;
+Index: jenkins/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java 2012-01-31 10:35:18.668316753 +0000
++++ jenkins/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java 2012-01-31 10:35:37.188316288 +0000
+@@ -16,7 +16,7 @@
+ import org.acegisecurity.userdetails.UserDetails;
+ import org.acegisecurity.userdetails.UserDetailsService;
+ import org.acegisecurity.userdetails.UsernameNotFoundException;
+-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
++import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+ import org.kohsuke.args4j.Option;
+ import org.springframework.dao.DataAccessException;
+ import org.springframework.web.context.WebApplicationContext;
+Index: jenkins/core/src/main/java/hudson/tools/ZipExtractionInstaller.java
+===================================================================
+--- jenkins.orig/core/src/main/java/hudson/tools/ZipExtractionInstaller.java 2012-01-31 10:35:18.652316753 +0000
++++ jenkins/core/src/main/java/hudson/tools/ZipExtractionInstaller.java 2012-01-31 10:35:37.188316288 +0000
+@@ -45,7 +45,7 @@
+ import java.net.URLConnection;
+ import org.kohsuke.stapler.DataBoundConstructor;
+ import org.kohsuke.stapler.QueryParameter;
+-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
++import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
+
+ /**
+ * Installs a tool into the Hudson working area by downloading and unpacking a ZIP file.
diff --git a/debian/patches/dependency-upgrades/asm3-upgrade.patch b/debian/patches/dependency-upgrades/asm3-upgrade.patch
index a30351e..51e110c 100644
--- a/debian/patches/dependency-upgrades/asm3-upgrade.patch
+++ b/debian/patches/dependency-upgrades/asm3-upgrade.patch
@@ -6,8 +6,8 @@ Forwarded: no
Index: jenkins/core/src/main/java/hudson/util/SubClassGenerator.java
===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/SubClassGenerator.java 2011-11-22 08:20:17.135239080 +0000
-+++ jenkins/core/src/main/java/hudson/util/SubClassGenerator.java 2011-11-22 08:20:36.671223202 +0000
+--- jenkins.orig/core/src/main/java/hudson/util/SubClassGenerator.java 2012-01-31 10:35:18.708316752 +0000
++++ jenkins/core/src/main/java/hudson/util/SubClassGenerator.java 2012-01-31 10:35:36.912316294 +0000
@@ -44,7 +44,7 @@
}
@@ -17,59 +17,3 @@ Index: jenkins/core/src/main/java/hudson/util/SubClassGenerator.java
cw.visit(49, ACC_PUBLIC, name.replace('.', '/'), null,
Type.getInternalName(base),null);
-Index: jenkins/remoting/src/test/java/hudson/remoting/ClassRemotingTest.java
-===================================================================
---- jenkins.orig/remoting/src/test/java/hudson/remoting/ClassRemotingTest.java 2011-11-22 08:20:17.199239028 +0000
-+++ jenkins/remoting/src/test/java/hudson/remoting/ClassRemotingTest.java 2011-11-22 08:20:36.675223199 +0000
-@@ -48,7 +48,7 @@
- // make sure the bytes are what we are expecting
- System.out.println("Resource is "+((byte[])r[1]).length+" bytes");
- ClassReader cr = new ClassReader((byte[])r[1]);
-- cr.accept(new EmptyVisitor(),false);
-+ cr.accept(new EmptyVisitor(),0);
-
- // make sure cache is taking effect
- System.out.println(r[2]);
-Index: jenkins/remoting/src/test/java/hudson/remoting/DummyClassLoader.java
-===================================================================
---- jenkins.orig/remoting/src/test/java/hudson/remoting/DummyClassLoader.java 2011-11-22 08:20:17.151239067 +0000
-+++ jenkins/remoting/src/test/java/hudson/remoting/DummyClassLoader.java 2011-11-22 08:20:36.675223199 +0000
-@@ -64,12 +64,12 @@
-
- // rename a class
- ClassReader cr = new ClassReader(in);
-- ClassWriter w = new ClassWriter(cr,true) {
-+ ClassWriter w = new ClassWriter(cr,0) {
- public void visit(int version, int access, String _name, String sig, String superName, String[] interfaces) {
- super.visit(version, access, name.replace('.','/'), sig, superName, interfaces);
- }
- };
-- cr.accept(w,false);
-+ cr.accept(w,0);
-
- return w.toByteArray();
- }
-Index: jenkins/remoting/src/test/java/hudson/remoting/PrefetchTest.java
-===================================================================
---- jenkins.orig/remoting/src/test/java/hudson/remoting/PrefetchTest.java 2011-11-22 08:20:17.167239054 +0000
-+++ jenkins/remoting/src/test/java/hudson/remoting/PrefetchTest.java 2011-11-22 08:20:36.675223199 +0000
-@@ -24,7 +24,7 @@
- package hudson.remoting;
-
- import org.objectweb.asm.ClassReader;
--import org.objectweb.asm.attrs.StackMapAttribute;
-+import org.objectweb.asm.Label;
-
- import java.io.IOException;
-
-@@ -42,8 +42,8 @@
-
- private static class VerifyTask implements Callable<String,IOException> {
- public String call() throws IOException {
-- StackMapAttribute sma = new StackMapAttribute();
-- return Which.jarFile(sma.getClass()).getPath();
-+ Label l = new Label();
-+ return Which.jarFile(l.getClass()).getPath();
- }
- }
- }
diff --git a/debian/patches/dependency-upgrades/groovy-upgrade.patch b/debian/patches/dependency-upgrades/groovy-upgrade.patch
index 6760b62..9b695f7 100644
--- a/debian/patches/dependency-upgrades/groovy-upgrade.patch
+++ b/debian/patches/dependency-upgrades/groovy-upgrade.patch
@@ -5,9 +5,9 @@ Forwarded: not-needed
Index: jenkins/core/pom.xml
===================================================================
---- jenkins.orig/core/pom.xml 2011-11-22 08:20:35.491224161 +0000
-+++ jenkins/core/pom.xml 2011-11-22 08:20:35.783223924 +0000
-@@ -665,6 +665,16 @@
+--- jenkins.orig/core/pom.xml 2012-01-31 10:35:36.104316316 +0000
++++ jenkins/core/pom.xml 2012-01-31 10:35:36.356316308 +0000
+@@ -376,6 +376,16 @@
<version>1.6.0</version>
</dependency>
<dependency>
diff --git a/debian/patches/dependency-upgrades/jcaptcha-slf4j.patch b/debian/patches/dependency-upgrades/jcaptcha-slf4j.patch
index e376459..c224ead 100644
--- a/debian/patches/dependency-upgrades/jcaptcha-slf4j.patch
+++ b/debian/patches/dependency-upgrades/jcaptcha-slf4j.patch
@@ -5,11 +5,11 @@ Forwarded: not-needed
Index: jenkins/core/pom.xml
===================================================================
---- jenkins.orig/core/pom.xml 2011-11-22 08:20:34.343225094 +0000
-+++ jenkins/core/pom.xml 2011-11-22 08:20:35.491224161 +0000
-@@ -767,6 +767,12 @@
- </exclusion>
- </exclusions>
+--- jenkins.orig/core/pom.xml 2012-01-31 10:35:35.048316342 +0000
++++ jenkins/core/pom.xml 2012-01-31 10:35:36.104316316 +0000
+@@ -435,6 +435,12 @@
+ <artifactId>memory-monitor</artifactId>
+ <version>1.5</version>
</dependency>
+ <!-- JCaptcha 2.0 uses slf4j which needs an implementation class -->
+ <dependency>
diff --git a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
index 3a5fab1..e54d2cc 100644
--- a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
+++ b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
@@ -5,8 +5,8 @@ Forwarded: not-needed
Index: jenkins/core/src/main/java/hudson/os/PosixAPI.java
===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/PosixAPI.java 2011-11-22 08:20:17.307238939 +0000
-+++ jenkins/core/src/main/java/hudson/os/PosixAPI.java 2011-11-22 08:20:36.343223468 +0000
+--- jenkins.orig/core/src/main/java/hudson/os/PosixAPI.java 2012-01-31 10:35:18.760316749 +0000
++++ jenkins/core/src/main/java/hudson/os/PosixAPI.java 2012-01-31 10:35:36.612316303 +0000
@@ -1,10 +1,9 @@
package hudson.os;
@@ -44,8 +44,8 @@ Index: jenkins/core/src/main/java/hudson/os/PosixAPI.java
public File getCurrentWorkingDirectory() {
Index: jenkins/core/src/main/java/hudson/os/PosixException.java
===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/PosixException.java 2011-11-22 08:20:17.275238965 +0000
-+++ jenkins/core/src/main/java/hudson/os/PosixException.java 2011-11-22 08:20:36.343223468 +0000
+--- jenkins.orig/core/src/main/java/hudson/os/PosixException.java 2012-01-31 10:35:18.780316750 +0000
++++ jenkins/core/src/main/java/hudson/os/PosixException.java 2012-01-31 10:35:36.612316303 +0000
@@ -1,6 +1,6 @@
package hudson.os;
@@ -74,9 +74,9 @@ Index: jenkins/core/src/main/java/hudson/os/PosixException.java
Index: jenkins/core/pom.xml
===================================================================
---- jenkins.orig/core/pom.xml 2011-11-22 08:20:36.059223700 +0000
-+++ jenkins/core/pom.xml 2011-11-22 08:20:36.347223465 +0000
-@@ -394,6 +394,11 @@
+--- jenkins.orig/core/pom.xml 2012-01-31 10:35:36.356316308 +0000
++++ jenkins/core/pom.xml 2012-01-31 10:35:36.612316303 +0000
+@@ -86,6 +86,11 @@
<version>1.0.3</version>
</dependency>
<dependency>
diff --git a/debian/patches/dependency-upgrades/spring-webmvc-fix.patch b/debian/patches/dependency-upgrades/spring-webmvc-fix.patch
deleted file mode 100644
index 2810766..0000000
--- a/debian/patches/dependency-upgrades/spring-webmvc-fix.patch
+++ /dev/null
@@ -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.page at 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 --git a/debian/patches/native-integration/filter-native-integrations.patch b/debian/patches/native-integration/filter-native-integrations.patch
index 9d7e50c..b3a66d7 100644
--- a/debian/patches/native-integration/filter-native-integrations.patch
+++ b/debian/patches/native-integration/filter-native-integrations.patch
@@ -1,8 +1,8 @@
Index: jenkins/core/pom.xml
===================================================================
---- jenkins.orig/core/pom.xml 2011-11-22 08:20:34.055225328 +0000
-+++ jenkins/core/pom.xml 2011-11-22 08:20:34.343225094 +0000
-@@ -94,6 +94,17 @@
+--- jenkins.orig/core/pom.xml 2012-01-31 10:35:34.780316349 +0000
++++ jenkins/core/pom.xml 2012-01-31 10:35:35.048316342 +0000
+@@ -598,6 +598,17 @@
<configuration>
<fork>${staplerFork}</fork><!-- the source code is big enough now that otherwise it fails with OutOfMemoryError -->
<maxmem>128m</maxmem>
diff --git a/debian/patches/native-integration/purge-embedded-su4j.patch b/debian/patches/native-integration/purge-embedded-su4j.patch
index 70978fe..6a6a90b 100644
--- a/debian/patches/native-integration/purge-embedded-su4j.patch
+++ b/debian/patches/native-integration/purge-embedded-su4j.patch
@@ -4,8 +4,8 @@ Forwarded: not-needed
Index: jenkins/core/src/main/java/hudson/os/SU.java
===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/SU.java 2011-11-22 08:20:17.863238488 +0000
-+++ jenkins/core/src/main/java/hudson/os/SU.java 2011-11-22 08:20:34.627224863 +0000
+--- jenkins.orig/core/src/main/java/hudson/os/SU.java 2012-01-31 10:35:19.076316741 +0000
++++ jenkins/core/src/main/java/hudson/os/SU.java 2012-01-31 10:35:35.320316334 +0000
@@ -23,7 +23,6 @@
*/
package hudson.os;
diff --git a/debian/patches/native-integration/purge-windows-support.patch b/debian/patches/native-integration/purge-windows-support.patch
index 721375b..b52e88c 100644
--- a/debian/patches/native-integration/purge-windows-support.patch
+++ b/debian/patches/native-integration/purge-windows-support.patch
@@ -6,9 +6,9 @@ Forwarded: not-needed
Index: jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java
===================================================================
---- jenkins.orig/core/src/main/java/hudson/slaves/SlaveComputer.java 2011-11-22 08:20:17.719238605 +0000
-+++ jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java 2011-11-22 08:20:35.203224395 +0000
-@@ -33,7 +33,6 @@
+--- jenkins.orig/core/src/main/java/hudson/slaves/SlaveComputer.java 2012-01-31 10:35:18.996316743 +0000
++++ jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java 2012-01-31 10:35:35.840316321 +0000
+@@ -34,7 +34,6 @@
import hudson.util.RingBufferLogHandler;
import hudson.util.Futures;
import hudson.FilePath;
@@ -16,7 +16,7 @@ Index: jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java
import hudson.Util;
import hudson.AbortException;
import hudson.remoting.Launcher;
-@@ -348,7 +347,6 @@
+@@ -350,7 +349,6 @@
channel.pinClassLoader(getClass().getClassLoader());
channel.call(new SlaveInitializer());
diff --git a/debian/patches/native-integration/purge-winp.patch b/debian/patches/native-integration/purge-winp.patch
index e6ff235..f8cffdc 100644
--- a/debian/patches/native-integration/purge-winp.patch
+++ b/debian/patches/native-integration/purge-winp.patch
@@ -5,8 +5,8 @@ Forwarded: not-needed
Index: jenkins/core/src/main/java/hudson/util/ProcessTree.java
===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/ProcessTree.java 2011-11-22 08:20:17.795238543 +0000
-+++ jenkins/core/src/main/java/hudson/util/ProcessTree.java 2011-11-22 08:20:34.923224623 +0000
+--- jenkins.orig/core/src/main/java/hudson/util/ProcessTree.java 2012-01-31 10:35:19.036316742 +0000
++++ jenkins/core/src/main/java/hudson/util/ProcessTree.java 2012-01-31 10:35:35.580316329 +0000
@@ -37,8 +37,6 @@
import hudson.util.ProcessTreeRemoting.IOSProcess;
import hudson.util.ProcessTreeRemoting.IProcessTree;
@@ -108,7 +108,7 @@ Index: jenkins/core/src/main/java/hudson/util/ProcessTree.java
static abstract class Unix extends Local {
@Override
public OSProcess get(Process proc) {
-@@ -1219,4 +1139,4 @@
+@@ -1223,4 +1143,4 @@
*/
public static boolean enabled = !Boolean.getBoolean(ProcessTreeKiller.class.getName()+".disable")
&& !Boolean.getBoolean(ProcessTree.class.getName()+".disable");
diff --git a/debian/patches/native-integration/windows-service-disable.patch b/debian/patches/native-integration/windows-service-disable.patch
index f48c49b..481d3f3 100644
--- a/debian/patches/native-integration/windows-service-disable.patch
+++ b/debian/patches/native-integration/windows-service-disable.patch
@@ -4,16 +4,38 @@ Forwarded: not-needed
Index: jenkins/core/pom.xml
===================================================================
---- jenkins.orig/core/pom.xml 2011-11-22 08:20:33.767225562 +0000
-+++ jenkins/core/pom.xml 2011-11-22 08:20:34.055225328 +0000
-@@ -177,10 +177,6 @@
- <mkdir dir="target/classes/hudson/model" />
- <echo file="target/classes/hudson/model/hudson-version.properties">version=${build.version}
- </echo>
--
-- <!-- download winsw.exe -->
-- <mkdir dir="target/classes/windows-service" />
-- <resolveArtifact artifactId="winsw" tofile="target/classes/windows-service/jenkins.exe" />
- </tasks>
- </configuration>
- <goals>
+--- jenkins.orig/core/pom.xml 2012-01-31 10:35:34.520316354 +0000
++++ jenkins/core/pom.xml 2012-01-31 10:35:34.780316349 +0000
+@@ -655,32 +655,6 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <artifactId>maven-dependency-plugin</artifactId>
+- <executions>
+- <execution>
+- <id>winsw</id>
+- <phase>generate-resources</phase>
+- <goals>
+- <!-- we use copy as this is a dependency from outside the reactor -->
+- <goal>copy</goal>
+- </goals>
+- <configuration>
+- <artifactItems>
+- <artifactItem>
+- <groupId>com.sun.winsw</groupId>
+- <artifactId>winsw</artifactId>
+- <version>1.10</version>
+- <classifier>bin</classifier>
+- <type>exe</type>
+- <outputDirectory>${project.build.outputDirectory}/windows-service</outputDirectory>
+- <destFileName>jenkins.exe</destFileName>
+- </artifactItem>
+- </artifactItems>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+ <plugin><!-- set main class -->
+ <artifactId>maven-jar-plugin</artifactId>
+ <!-- version specified in grandparent pom -->
diff --git a/debian/patches/series b/debian/patches/series
index ed7d1b4..ae3021d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,7 @@
build/build.patch
build/plugin.patch
-build/animal-sniffer-annotation.patch
build/disable-avalon-frawework.patch
build/openjdk6.patch
-build/debianize-antrun-war.patch
build/remove-licensing-report.patch
build/disable-plugins.patch
build/apt-stapler-processing.patch
@@ -14,7 +12,8 @@ native-integration/purge-winp.patch
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
+dependency-upgrades/animal-sniffer-upgrade.patch
ubuntu/ubuntu-font.patch
+#groovy-2.0.0-compat.patch
diff --git a/debian/patches/ubuntu/ubuntu-font.patch b/debian/patches/ubuntu/ubuntu-font.patch
index 5fefac7..6bd4def 100644
--- a/debian/patches/ubuntu/ubuntu-font.patch
+++ b/debian/patches/ubuntu/ubuntu-font.patch
@@ -4,8 +4,8 @@ Forwarded: not-needed
Index: jenkins/war/src/main/webapp/css/style.css
===================================================================
---- jenkins.orig/war/src/main/webapp/css/style.css 2011-11-22 08:20:17.063239138 +0000
-+++ jenkins/war/src/main/webapp/css/style.css 2011-11-22 08:20:37.019222919 +0000
+--- jenkins.orig/war/src/main/webapp/css/style.css 2012-01-31 10:35:18.568316756 +0000
++++ jenkins/war/src/main/webapp/css/style.css 2012-01-31 10:35:37.608316278 +0000
@@ -29,7 +29,7 @@
body, table, form, input, td, th, p, textarea, select
@@ -15,7 +15,7 @@ Index: jenkins/war/src/main/webapp/css/style.css
font-size: 11px;
}
-@@ -367,7 +367,7 @@
+@@ -373,7 +373,7 @@
padding: 4px 0;
margin-left: 0;
border-bottom: 1px solid #090;
diff --git a/debian/rules b/debian/rules
index 92f8e33..1bbe024 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/maven.mk
JAVA_HOME := /usr/lib/jvm/default-java
# Parse upstream version without +dfsg for source download+
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
-DEB_MAVEN_BUILD_TARGET := install
+DEB_MAVEN_BUILD_TARGET := install
DEB_MAVEN_ARGS := -e -Dbuild.version="$(DEB_UPSTREAM_VERSION)"
DEB_MAVEN_INSTALL_TO_USJ := false
@@ -31,8 +31,6 @@ binary-post-install/jenkins-cli::
# Create handy links for script wrapper
binary-post-install/jenkins-external-job-monitor::
- dh_link -pjenkins-external-job-monitor usr/share/jenkins/external-job-monitor/java/remoting-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/jenkins/external-job-monitor/java/remoting.jar
dh_link -pjenkins-external-job-monitor usr/share/jenkins/external-job-monitor/java/jenkins-core-$(DEB_UPSTREAM_VERSION).jar \
usr/share/jenkins/external-job-monitor/java/jenkins-core.jar
--
jenkins packaging
More information about the pkg-java-commits
mailing list