[jenkins] 02/02: Refreshed the patches Ignore the dependency on org.kohsuke.jinterop:j-interop and org.jenkins-ci.modules:systemd-slave-installer Added a dependency on libjsr305-java Depend on libstapler-java >= 1.223
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Sep 3 22:13:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jenkins.
commit 279654c40c4f78ef545a12b5349154ae13796633
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 4 00:10:58 2014 +0200
Refreshed the patches
Ignore the dependency on org.kohsuke.jinterop:j-interop and org.jenkins-ci.modules:systemd-slave-installer
Added a dependency on libjsr305-java
Depend on libstapler-java >= 1.223
---
debian/changelog | 7 +++--
debian/control | 5 +--
debian/maven.ignoreRules | 2 ++
debian/maven.rules | 3 +-
.../0020-Drop-use-of-gitsite-extension.patch | 2 +-
.../0021-Compatibility-patch-for-guava-0.14.patch | 2 +-
...ignore-bytecode-compatibility-transformer.patch | 18 +++++------
debian/patches/0025-specify-plugins-versions.patch | 22 +++++++++++++
debian/patches/0026-add-jsr305-dependency.patch | 20 ++++++++++++
debian/patches/build/0001-build.patch | 8 ++---
debian/patches/build/0002-openjdk6.patch | 2 +-
debian/patches/build/0004-disable-plugins.patch | 36 ++++++++++++++++------
.../build/0005-apt-stapler-processing.patch | 2 +-
debian/patches/build/0007-remove-findbugs.patch | 26 ++++++++++------
debian/patches/build/0015-use-stock-asm3.patch | 2 +-
debian/patches/build/0016-use-debian-jbcrypt.patch | 4 +--
debian/patches/build/0019-io-compat.pach.patch | 4 +--
.../0012-jnr-posix-upgrade.patch | 4 +--
.../0008-windows-service-disable.patch | 2 +-
.../0009-filter-native-integrations.patch | 2 +-
debian/patches/series | 2 ++
debian/patches/ubuntu/0014-ubuntu-font.patch | 6 ++--
22 files changed, 125 insertions(+), 56 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d7698dd..7b41ea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,16 @@
-jenkins (1.532.3-1) UNRELEASED; urgency=medium
+jenkins (1.554.1-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Fixes multiple security vulnerabilities (Closes: #732708, #739067)
- Refreshed the patches
- Ignore the dependency on bytecode-compatibility-transformer
- - Added a dependency on libguice-java
+ - Ignore the dependency on org.kohsuke.jinterop:j-interop
+ - Ignore the dependency on org.jenkins-ci.modules:systemd-slave-installer
+ - Added a dependency on libguice-java and libjsr305-java
- Depend on libjenkins-remoting-java >= 2.32
- Depend on libannotation-indexer-java >= 1.7
+ - Depend on libstapler-java >= 1.223
* Fixed a build failure caused by the relocation of the Maven artifacts
in groovy 1.8.6-4 (Closes: #759946)
* Removed the sourceless and unused connection.swf file (Closes: #736792)
diff --git a/debian/control b/debian/control
index 298dcaa..b97361c 100644
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,7 @@ Build-Depends-Indep:
libjna-java,
libjnr-posix-java,
libjson-java,
+ libjsr305-java,
libjstl1.1-java,
libjtidy-java,
liblocalizer-java,
@@ -77,7 +78,7 @@ Build-Depends-Indep:
libmaven-hpi-plugin-java (>= 1.93),
libmaven-install-plugin-java,
libmaven-javadoc-plugin-java,
- libmaven-stapler-plugin-java,
+ libmaven-stapler-plugin-java (>= 1.17),
libmaven-war-plugin-java,
libmaven2-core-java,
libmetainf-services-java,
@@ -94,7 +95,7 @@ Build-Depends-Indep:
libspring-web-java,
libstapler-adjunct-codemirror-java (>= 1.2),
libstapler-adjunct-timeline-java (>= 1.4),
- libstapler-java (>= 1.207),
+ libstapler-java (>= 1.223),
libtrilead-putty-extension-java (>= 1.2),
libtxw2-java,
libxpp3-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 3211f95..cffdc4b 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -16,6 +16,7 @@
# OK: Don't need native stuff for Debian/Ubuntu
com.sun.winsw winsw * * * *
+org.kohsuke.jinterop j-interop * * * *
# OK: Bits of the build which don't add value for Debian
org.apache.maven.plugins maven-pmd-plugin * * * *
org.apache.maven.plugins maven-project-info-reports-plugin * * * *
@@ -88,6 +89,7 @@ org.jenkins-ci.modules slave-installer * * * *
org.jenkins-ci.modules windows-slave-installer * * * *
org.jenkins-ci.modules upstart-slave-installer * * * *
org.jenkins-ci.modules launchd-slave-installer * * * *
+org.jenkins-ci.modules systemd-slave-installer * * * *
# Drop animal-sniffer plugin usage
org.codehaus.mojo animal-sniffer-maven-plugin * * * *
# TODO: To be packaged
diff --git a/debian/maven.rules b/debian/maven.rules
index a8a56f8..4d4bb17 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,7 +22,7 @@ commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
junit s/junit-dep/junit/ * s/.*/4.x/ * *
junit junit * s/.*/4.x/ * *
# Map onto exact version during build process
-org.jenkins-ci.main * * s/1\..*/1.532.1/ * *
+org.jenkins-ci.main * * s/1\..*/1.554.1/ * *
# Handle plugin package
org.kohsuke access-modifier-annotation jar s/.*/1.4/ * *
org.kohsuke access-modifier-checker * s/.*/1.4/ * *
@@ -72,3 +72,4 @@ 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// *
+s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * *
diff --git a/debian/patches/0020-Drop-use-of-gitsite-extension.patch b/debian/patches/0020-Drop-use-of-gitsite-extension.patch
index 7269ff2..1d0e256 100644
--- a/debian/patches/0020-Drop-use-of-gitsite-extension.patch
+++ b/debian/patches/0020-Drop-use-of-gitsite-extension.patch
@@ -9,7 +9,7 @@ This is not required for the package build
--- a/pom.xml
+++ b/pom.xml
-@@ -701,14 +701,6 @@
+@@ -708,14 +708,6 @@
</dependencies>
</plugin>
</plugins>
diff --git a/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch b/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch
index 4b94421..2877a1b 100644
--- a/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch
+++ b/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch
@@ -9,7 +9,7 @@ Iterations.skip -> Iterators.advance
--- a/core/src/main/java/hudson/util/RunList.java
+++ b/core/src/main/java/hudson/util/RunList.java
-@@ -133,7 +133,7 @@
+@@ -132,7 +132,7 @@
public List<R> subList(int fromIndex, int toIndex) {
List<R> r = new ArrayList<R>();
Iterator<R> itr = iterator();
diff --git a/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch b/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
index 4e5dd45..c294649 100644
--- a/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
+++ b/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
@@ -3,15 +3,15 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
-@@ -96,7 +96,6 @@
+@@ -127,7 +127,6 @@
import org.acegisecurity.Authentication;
import org.acegisecurity.context.SecurityContext;
import org.acegisecurity.context.SecurityContextHolder;
-import org.jenkinsci.bytecode.AdaptField;
import org.kohsuke.accmod.Restricted;
+ import org.kohsuke.accmod.restrictions.DoNotUse;
import org.kohsuke.accmod.restrictions.NoExternalUse;
- import org.kohsuke.args4j.Argument;
-@@ -244,8 +243,7 @@
+@@ -248,8 +247,7 @@
/**
* List of all {@link Trigger}s for this project.
*/
@@ -21,7 +21,7 @@ Forwarded: not-needed
private static final AtomicReferenceFieldUpdater<AbstractProject,DescribableList> triggersUpdater
= AtomicReferenceFieldUpdater.newUpdater(AbstractProject.class,DescribableList.class,"triggers");
-@@ -346,7 +344,7 @@
+@@ -351,7 +349,7 @@
if (triggers == null) {
triggersUpdater.compareAndSet(this,null,new DescribableList<Trigger<?>,TriggerDescriptor>(this));
}
@@ -30,7 +30,7 @@ Forwarded: not-needed
}
@Override
-@@ -2010,7 +2008,7 @@
+@@ -2020,7 +2018,7 @@
for (Trigger t : triggers())
t.stop();
@@ -41,7 +41,7 @@ Forwarded: not-needed
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
-@@ -59,7 +59,6 @@
+@@ -58,7 +58,6 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.logging.LogFactory;
@@ -49,7 +49,7 @@ Forwarded: not-needed
import org.jvnet.hudson.reactor.Executable;
import org.jvnet.hudson.reactor.Reactor;
import org.jvnet.hudson.reactor.ReactorException;
-@@ -152,8 +151,6 @@
+@@ -154,8 +153,6 @@
// and load plugin-contributed classes.
public final ClassLoader uberClassLoader = new UberClassLoader();
@@ -58,7 +58,7 @@ Forwarded: not-needed
/**
* Once plugin is uploaded, this flag becomes true.
* This is used to report a message that Jenkins needs to be restarted
-@@ -182,17 +179,6 @@
+@@ -184,17 +181,6 @@
rootDir.mkdirs();
strategy = createPluginStrategy();
@@ -78,7 +78,7 @@ Forwarded: not-needed
public Api getApi() {
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
-@@ -693,8 +693,6 @@
+@@ -690,8 +690,6 @@
@Override
protected Class defineClassFromData(File container, byte[] classData, String classname) throws IOException {
diff --git a/debian/patches/0025-specify-plugins-versions.patch b/debian/patches/0025-specify-plugins-versions.patch
new file mode 100644
index 0000000..60c17cd
--- /dev/null
+++ b/debian/patches/0025-specify-plugins-versions.patch
@@ -0,0 +1,22 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -399,7 +399,7 @@
+ -->
+ <groupId>org.kohsuke.stapler</groupId>
+ <artifactId>maven-stapler-plugin</artifactId>
+- <!-- version specified in grandparent pom -->
++ <version>1.17</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -690,7 +690,7 @@
+ <plugin>
+ <groupId>org.kohsuke.stapler</groupId>
+ <artifactId>maven-stapler-plugin</artifactId>
+- <!-- version specified in grandparent pom -->
++ <version>1.17</version>
+ <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/0026-add-jsr305-dependency.patch b/debian/patches/0026-add-jsr305-dependency.patch
new file mode 100644
index 0000000..53981a2
--- /dev/null
+++ b/debian/patches/0026-add-jsr305-dependency.patch
@@ -0,0 +1,20 @@
+Description: Add an explicit dependency on com.google.code.findbugs:jsr305.
+ This was a transitive dependency of Guava 11 but it's now optional in the
+ version packaged in Debian and has to be declared explicitly in the pom.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -49,6 +49,12 @@
+
+ <dependencies>
+ <dependency>
++ <groupId>com.google.code.findbugs</groupId>
++ <artifactId>jsr305</artifactId>
++ <version>1.3.9</version>
++ </dependency>
++
++ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>remoting</artifactId>
+ <!-- specified in the parent -->
diff --git a/debian/patches/build/0001-build.patch b/debian/patches/build/0001-build.patch
index 91b9776..caa2daf 100644
--- a/debian/patches/build/0001-build.patch
+++ b/debian/patches/build/0001-build.patch
@@ -28,17 +28,15 @@ Subject: build
<groupId>commons-jelly</groupId>
--- a/pom.xml
+++ b/pom.xml
-@@ -48,9 +48,7 @@
-
+@@ -49,7 +49,6 @@
<modules>
<module>core</module>
-- <module>ui-samples-plugin</module>
<module>war</module>
- <module>test</module>
<module>cli</module>
<module>plugins</module>
</modules>
-@@ -626,9 +624,6 @@
+@@ -629,9 +628,6 @@
<requireJavaVersion>
<version>1.6.0-18</version>
</requireJavaVersion>
@@ -47,4 +45,4 @@ Subject: build
- </requireMavenVersion>
<enforceBytecodeVersion>
<maxJdkVersion>1.${java.level}</maxJdkVersion>
- </enforceBytecodeVersion>
+ <ignoreClasses>
diff --git a/debian/patches/build/0002-openjdk6.patch b/debian/patches/build/0002-openjdk6.patch
index c0f0471..7176760 100644
--- a/debian/patches/build/0002-openjdk6.patch
+++ b/debian/patches/build/0002-openjdk6.patch
@@ -23,7 +23,7 @@ Subject: openjdk6
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
-@@ -1345,6 +1345,15 @@
+@@ -1365,6 +1365,15 @@
}
private static final Logger LOGGER = Logger.getLogger(AbstractBuild.class.getName());
diff --git a/debian/patches/build/0004-disable-plugins.patch b/debian/patches/build/0004-disable-plugins.patch
index 8e4375a..62ce777 100644
--- a/debian/patches/build/0004-disable-plugins.patch
+++ b/debian/patches/build/0004-disable-plugins.patch
@@ -8,7 +8,7 @@ Subject: disable-plugins
--- a/war/pom.xml
+++ b/war/pom.xml
-@@ -173,6 +173,11 @@
+@@ -178,6 +178,11 @@
<scope>system</scope>
<systemPath>/usr/local/yjp/lib/yjp.jar</systemPath>
</dependency-->
@@ -20,7 +20,7 @@ Subject: disable-plugins
</dependencies>
<build>
-@@ -260,84 +265,6 @@
+@@ -265,102 +270,6 @@
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<destFileName>winstone.jar</destFileName>
</artifactItem>
@@ -45,19 +45,19 @@ Subject: disable-plugins
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>ssh-credentials</artifactId>
-- <version>1.5.1</version>
+- <version>1.6</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>subversion</artifactId>
-- <version>1.45</version>
+- <version>1.54</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>cvs</artifactId>
-- <version>2.8</version>
+- <version>2.11</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
@@ -81,25 +81,43 @@ Subject: disable-plugins
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>external-monitor-job</artifactId>
-- <version>1.1</version>
+- <version>1.2</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>ldap</artifactId>
-- <version>1.2</version>
+- <version>1.6</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>pam-auth</artifactId>
-- <version>1.0</version>
+- <version>1.1</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>mailer</artifactId>
-- <version>1.5</version>
+- <version>1.6</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>matrix-auth</artifactId>
+- <version>1.1</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>windows-slaves</artifactId>
+- <version>1.0</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>antisamy-markup-formatter</artifactId>
+- <version>1.0</version>
- <type>hpi</type>
- </artifactItem>
</artifactItems>
diff --git a/debian/patches/build/0005-apt-stapler-processing.patch b/debian/patches/build/0005-apt-stapler-processing.patch
index 3c6096c..6d27f26 100644
--- a/debian/patches/build/0005-apt-stapler-processing.patch
+++ b/debian/patches/build/0005-apt-stapler-processing.patch
@@ -8,7 +8,7 @@ Subject: apt-stapler-processing
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -660,6 +660,24 @@
+@@ -648,6 +648,24 @@
</executions>
</plugin>
<plugin>
diff --git a/debian/patches/build/0007-remove-findbugs.patch b/debian/patches/build/0007-remove-findbugs.patch
index b88d566..445758a 100644
--- a/debian/patches/build/0007-remove-findbugs.patch
+++ b/debian/patches/build/0007-remove-findbugs.patch
@@ -47,7 +47,7 @@ Subject: remove-findbugs
import hudson.Proc.LocalProc;
import hudson.model.TaskListener;
import hudson.os.PosixAPI;
-@@ -355,7 +354,6 @@
+@@ -349,7 +348,6 @@
return !fileInCanonicalParent.getCanonicalFile().equals( fileInCanonicalParent.getAbsoluteFile() );
}
@@ -57,7 +57,7 @@ Subject: remove-findbugs
Object path = File.class.getMethod("toPath").invoke(file);
--- a/core/src/main/java/hudson/WebAppMain.java
+++ b/core/src/main/java/hudson/WebAppMain.java
-@@ -255,7 +255,6 @@
+@@ -280,7 +280,6 @@
/**
* Installs log handler to monitor all Hudson logs.
*/
@@ -85,7 +85,7 @@ Subject: remove-findbugs
throw (ChannelClosedException)args[0];
--- a/core/src/main/java/hudson/logging/LogRecorderManager.java
+++ b/core/src/main/java/hudson/logging/LogRecorderManager.java
-@@ -125,7 +125,6 @@
+@@ -127,7 +127,6 @@
/**
* Configure the logging level.
*/
@@ -100,10 +100,10 @@ Subject: remove-findbugs
import antlr.ANTLRException;
import javax.annotation.CheckForNull;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+ import hudson.model.Items;
/**
- * Triggers a {@link Build}.
-@@ -276,7 +275,6 @@
+@@ -278,7 +277,6 @@
*
* @deprecated Use {@link jenkins.util.Timer#get()} instead.
*/
@@ -141,7 +141,7 @@ Subject: remove-findbugs
return classOwnership.ownerOf(clazz);
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
-@@ -741,10 +741,6 @@
+@@ -738,10 +738,6 @@
* @param pluginManager
* If non-null, use existing plugin manager. create a new one.
*/
@@ -152,7 +152,7 @@ Subject: remove-findbugs
protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
long start = System.currentTimeMillis();
-@@ -2661,7 +2657,6 @@
+@@ -2677,7 +2673,6 @@
/**
* Called to shut down the system.
*/
@@ -160,7 +160,7 @@ Subject: remove-findbugs
public void cleanUp() {
for (ItemListener l : ItemListener.all())
l.onBeforeShutdown();
-@@ -3111,7 +3106,6 @@
+@@ -3161,7 +3156,6 @@
/**
* For debugging. Expose URL to perform GC.
*/
@@ -175,9 +175,17 @@ Subject: remove-findbugs
package jenkins.util;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
- import hudson.model.Computer;
import java.util.concurrent.ExecutorService;
import java.util.logging.Level;
+ import java.util.logging.Logger;
+@@ -80,7 +79,6 @@
+ /**
+ * For internal use.
+ */
+- @SuppressWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
+ public final void start() {
+ final SecurityContext securityContext = SecurityContextHolder.getContext();
+ executorService().submit(new Runnable() {
--- a/core/src/test/java/hudson/slaves/ComputerLauncherTest.java
+++ b/core/src/test/java/hudson/slaves/ComputerLauncherTest.java
@@ -24,7 +24,6 @@
diff --git a/debian/patches/build/0015-use-stock-asm3.patch b/debian/patches/build/0015-use-stock-asm3.patch
index 972851b..9eaab65 100644
--- a/debian/patches/build/0015-use-stock-asm3.patch
+++ b/debian/patches/build/0015-use-stock-asm3.patch
@@ -9,7 +9,7 @@ Subject: use-stock-asm3
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -561,6 +561,13 @@
+@@ -556,6 +556,13 @@
</dependency>
<dependency>
diff --git a/debian/patches/build/0016-use-debian-jbcrypt.patch b/debian/patches/build/0016-use-debian-jbcrypt.patch
index 598d117..956aade 100644
--- a/debian/patches/build/0016-use-debian-jbcrypt.patch
+++ b/debian/patches/build/0016-use-debian-jbcrypt.patch
@@ -6,11 +6,9 @@ Subject: use-debian-jbcrypt
core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
-index a656863..c68ae4d 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
-@@ -59,7 +59,7 @@ import org.kohsuke.stapler.HttpResponses;
+@@ -58,7 +58,7 @@
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
diff --git a/debian/patches/build/0019-io-compat.pach.patch b/debian/patches/build/0019-io-compat.pach.patch
index 21fe41e..9ec6e41 100644
--- a/debian/patches/build/0019-io-compat.pach.patch
+++ b/debian/patches/build/0019-io-compat.pach.patch
@@ -6,11 +6,9 @@ Subject: io-compat.pach
core/src/main/java/hudson/util/IOUtils.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/core/src/main/java/hudson/util/IOUtils.java b/core/src/main/java/hudson/util/IOUtils.java
-index 4d046b7..240fda9 100644
--- a/core/src/main/java/hudson/util/IOUtils.java
+++ b/core/src/main/java/hudson/util/IOUtils.java
-@@ -76,16 +76,18 @@ public class IOUtils extends org.apache.commons.io.IOUtils {
+@@ -79,16 +79,18 @@
*
* @since 1.349
*/
diff --git a/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch b/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
index 90cc945..b36f671 100644
--- a/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
+++ b/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
@@ -161,7 +161,7 @@ Subject: jnr-posix-upgrade
/**
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
-@@ -40,8 +40,8 @@
+@@ -39,8 +39,8 @@
import org.apache.tools.ant.taskdefs.Chmod;
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.types.FileSet;
@@ -169,6 +169,6 @@ Subject: jnr-posix-upgrade
-import jnr.posix.POSIX;
+import org.jruby.ext.posix.FileStat;
+import org.jruby.ext.posix.POSIX;
- import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
import javax.crypto.SecretKey;
+ import javax.crypto.spec.SecretKeySpec;
diff --git a/debian/patches/native-integration/0008-windows-service-disable.patch b/debian/patches/native-integration/0008-windows-service-disable.patch
index a1a4f9a..be0fbac 100644
--- a/debian/patches/native-integration/0008-windows-service-disable.patch
+++ b/debian/patches/native-integration/0008-windows-service-disable.patch
@@ -8,7 +8,7 @@ Subject: windows-service-disable
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -742,32 +742,6 @@
+@@ -730,32 +730,6 @@
</executions>
</plugin>
<plugin>
diff --git a/debian/patches/native-integration/0009-filter-native-integrations.patch b/debian/patches/native-integration/0009-filter-native-integrations.patch
index 1fdb9bf..616a52e 100644
--- a/debian/patches/native-integration/0009-filter-native-integrations.patch
+++ b/debian/patches/native-integration/0009-filter-native-integrations.patch
@@ -8,7 +8,7 @@ Subject: filter-native-integrations
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -684,6 +684,17 @@
+@@ -672,6 +672,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/series b/debian/patches/series
index 0baf16e..dcacaa4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,5 @@ build/0019-io-compat.pach.patch
0022-Exclude-asm-dependencies-from-jnr-posix.patch
0023-ignore-bytecode-compatibility-transformer.patch
0024-args4j-compatibility.patch
+0025-specify-plugins-versions.patch
+0026-add-jsr305-dependency.patch
diff --git a/debian/patches/ubuntu/0014-ubuntu-font.patch b/debian/patches/ubuntu/0014-ubuntu-font.patch
index 4893c4e..f8046bf 100644
--- a/debian/patches/ubuntu/0014-ubuntu-font.patch
+++ b/debian/patches/ubuntu/0014-ubuntu-font.patch
@@ -6,11 +6,9 @@ Subject: ubuntu-font
war/src/main/webapp/css/style.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
-index eff6d3e..0b33301 100644
--- a/war/src/main/webapp/css/style.css
+++ b/war/src/main/webapp/css/style.css
-@@ -29,7 +29,7 @@ body {
+@@ -29,7 +29,7 @@
body, table, form, input, td, th, p, textarea, select
{
@@ -19,7 +17,7 @@ index eff6d3e..0b33301 100644
font-size: 11px;
}
-@@ -357,7 +357,7 @@ th.pane {
+@@ -372,7 +372,7 @@
padding: 4px 0;
margin-left: 0;
border-bottom: 1px solid #090;
--
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