[jenkins] 05/09: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Sep 2 20:42:32 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 52a49ab60797efe326a779679d08d7aa2310edbe
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Sep 2 17:11:09 2014 +0200
Refreshed the patches
---
debian/changelog | 6 +-
debian/maven.rules | 2 +-
.../0020-Drop-use-of-gitsite-extension.patch | 4 +-
...2-Exclude-asm-dependencies-from-jnr-posix.patch | 6 +-
debian/patches/build/0001-build.patch | 10 +--
debian/patches/build/0002-openjdk6.patch | 8 +--
debian/patches/build/0004-disable-plugins.patch | 8 +--
.../build/0005-apt-stapler-processing.patch | 4 +-
debian/patches/build/0007-remove-findbugs.patch | 80 +++++++---------------
debian/patches/build/0015-use-stock-asm3.patch | 8 +--
.../patches/build/0023-stapler-compatibility.patch | 16 -----
.../0012-jnr-posix-upgrade.patch | 55 ++++++++-------
.../0008-windows-service-disable.patch | 4 +-
.../0009-filter-native-integrations.patch | 4 +-
debian/patches/series | 1 -
15 files changed, 76 insertions(+), 140 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5e202fb..b57065c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-jenkins (1.509.2+dfsg-3) UNRELEASED; urgency=medium
+jenkins (1.509.4-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Refreshed the patches
* Fixed a build failure caused by the relocation of the Maven artifacts
in groovy 1.8.6-4 (Closes: #759946)
- * Fixed a compilation error related to stapler
- (@DataBoundConstructor must be applied to a public constructor)
* Removed the sourceless and unused connection.swf file (Closes: #736792)
* debian/watch: Fixed to match only the LTS releases (Closes: #731204)
* Switch to debhelper level 9
diff --git a/debian/maven.rules b/debian/maven.rules
index 7dbf597..7a734ec 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.509.2/ * *
+org.jenkins-ci.main * * s/1\..*/1.509.4/ * *
# Handle plugin package
org.kohsuke access-modifier-annotation jar s/.*/1.4/ * *
org.kohsuke access-modifier-checker * s/.*/1.4/ * *
diff --git a/debian/patches/0020-Drop-use-of-gitsite-extension.patch b/debian/patches/0020-Drop-use-of-gitsite-extension.patch
index 7567da9..7d49392 100644
--- a/debian/patches/0020-Drop-use-of-gitsite-extension.patch
+++ b/debian/patches/0020-Drop-use-of-gitsite-extension.patch
@@ -7,11 +7,9 @@ This is not required for the package build
pom.xml | 8 --------
1 file changed, 8 deletions(-)
-diff --git a/pom.xml b/pom.xml
-index 9e36e37..8eaecdd 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -670,14 +670,6 @@ THE SOFTWARE.
+@@ -667,14 +667,6 @@
</dependencies>
</plugin>
</plugins>
diff --git a/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch b/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
index ff252a6..a0e07f3 100644
--- a/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
+++ b/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
@@ -7,11 +7,9 @@ This pulls in asm4 which creates class loading issues.
core/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
-diff --git a/core/pom.xml b/core/pom.xml
-index dc325b4..75e4a54 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -116,6 +116,16 @@ THE SOFTWARE.
+@@ -116,6 +116,16 @@
<groupId>org.jruby.ext.posix</groupId>
<artifactId>jna-posix</artifactId>
<version>1.0.3</version>
@@ -27,4 +25,4 @@ index dc325b4..75e4a54 100644
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jruby.extras</groupId>
+ <groupId>com.github.jnr</groupId>
diff --git a/debian/patches/build/0001-build.patch b/debian/patches/build/0001-build.patch
index 8f02bf6..3a60450 100644
--- a/debian/patches/build/0001-build.patch
+++ b/debian/patches/build/0001-build.patch
@@ -7,11 +7,9 @@ Subject: build
pom.xml | 6 ------
2 files changed, 10 insertions(+), 6 deletions(-)
-diff --git a/core/pom.xml b/core/pom.xml
-index c72677e..55078a5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -326,6 +326,16 @@ THE SOFTWARE.
+@@ -330,6 +330,16 @@
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
<version>1.0</version>
@@ -28,11 +26,9 @@ index c72677e..55078a5 100644
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
-diff --git a/pom.xml b/pom.xml
-index 9e32fca..8b43d42 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -48,10 +48,7 @@ THE SOFTWARE.
+@@ -48,10 +48,7 @@
<modules>
<module>core</module>
@@ -43,7 +39,7 @@ index 9e32fca..8b43d42 100644
<module>cli</module>
<module>plugins</module>
</modules>
-@@ -621,9 +618,6 @@ THE SOFTWARE.
+@@ -618,9 +615,6 @@
<requireJavaVersion>
<version>1.6.0-18</version>
</requireJavaVersion>
diff --git a/debian/patches/build/0002-openjdk6.patch b/debian/patches/build/0002-openjdk6.patch
index 142e8b3..27b12e6 100644
--- a/debian/patches/build/0002-openjdk6.patch
+++ b/debian/patches/build/0002-openjdk6.patch
@@ -7,11 +7,9 @@ Subject: openjdk6
core/src/main/java/hudson/model/AbstractBuild.java | 9 +++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
-diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java
-index 08c814e..9ee9b8c 100644
--- a/core/src/main/java/hudson/DescriptorExtensionList.java
+++ b/core/src/main/java/hudson/DescriptorExtensionList.java
-@@ -81,8 +81,9 @@ public class DescriptorExtensionList<T extends Describable<T>, D extends Descrip
+@@ -81,8 +81,9 @@
* @deprecated as of 1.416
* Use {@link #create(Jenkins, Class)}
*/
@@ -23,11 +21,9 @@ index 08c814e..9ee9b8c 100644
return (DescriptorExtensionList)createDescriptorList((Jenkins)hudson,describableType);
}
-diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
-index 3c3be27..54607f9 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
-@@ -1362,6 +1362,15 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
+@@ -1340,6 +1340,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 73624be..8ee4956 100644
--- a/debian/patches/build/0004-disable-plugins.patch
+++ b/debian/patches/build/0004-disable-plugins.patch
@@ -6,11 +6,9 @@ Subject: disable-plugins
war/pom.xml | 83 ++++---------------------------------------------------------
1 file changed, 5 insertions(+), 78 deletions(-)
-diff --git a/war/pom.xml b/war/pom.xml
-index 8a6b2eb..49ad021 100644
--- a/war/pom.xml
+++ b/war/pom.xml
-@@ -174,6 +174,11 @@ THE SOFTWARE.
+@@ -174,6 +174,11 @@
<scope>system</scope>
<systemPath>/usr/local/yjp/lib/yjp.jar</systemPath>
</dependency-->
@@ -22,7 +20,7 @@ index 8a6b2eb..49ad021 100644
</dependencies>
<build>
-@@ -261,84 +266,6 @@ THE SOFTWARE.
+@@ -261,84 +266,6 @@
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<destFileName>winstone.jar</destFileName>
</artifactItem>
@@ -47,7 +45,7 @@ index 8a6b2eb..49ad021 100644
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>ssh-credentials</artifactId>
-- <version>0.2</version>
+- <version>0.3</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
diff --git a/debian/patches/build/0005-apt-stapler-processing.patch b/debian/patches/build/0005-apt-stapler-processing.patch
index fbcae0e..d7daad4 100644
--- a/debian/patches/build/0005-apt-stapler-processing.patch
+++ b/debian/patches/build/0005-apt-stapler-processing.patch
@@ -6,11 +6,9 @@ Subject: apt-stapler-processing
core/pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
-diff --git a/core/pom.xml b/core/pom.xml
-index 55078a5..b6465c2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -678,6 +678,24 @@ THE SOFTWARE.
+@@ -682,6 +682,24 @@
</executions>
</plugin>
<plugin>
diff --git a/debian/patches/build/0007-remove-findbugs.patch b/debian/patches/build/0007-remove-findbugs.patch
index f1c8b9a..9883469 100644
--- a/debian/patches/build/0007-remove-findbugs.patch
+++ b/debian/patches/build/0007-remove-findbugs.patch
@@ -19,8 +19,6 @@ Subject: remove-findbugs
.../src/main/java/hudson/maven/reporters/SurefireArchiver.java | 1 -
14 files changed, 27 deletions(-)
-diff --git a/core/src/main/java/hudson/UDPBroadcastThread.java b/core/src/main/java/hudson/UDPBroadcastThread.java
-index 384321a..038a65e 100644
--- a/core/src/main/java/hudson/UDPBroadcastThread.java
+++ b/core/src/main/java/hudson/UDPBroadcastThread.java
@@ -23,7 +23,6 @@
@@ -31,7 +29,7 @@ index 384321a..038a65e 100644
import hudson.model.Hudson;
import jenkins.model.Jenkins;
import hudson.util.OneShotEvent;
-@@ -69,7 +68,6 @@ public class UDPBroadcastThread extends Thread {
+@@ -69,7 +68,6 @@
mcs = new MulticastSocket(PORT);
}
@@ -39,11 +37,9 @@ index 384321a..038a65e 100644
@Override
public void run() {
try {
-diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
-index 9275e7f..29bb528 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
-@@ -26,7 +26,6 @@ package hudson;
+@@ -26,7 +26,6 @@
import com.sun.jna.Memory;
import com.sun.jna.Native;
import com.sun.jna.NativeLong;
@@ -51,7 +47,7 @@ index 9275e7f..29bb528 100644
import hudson.Proc.LocalProc;
import hudson.model.TaskListener;
import hudson.os.PosixAPI;
-@@ -356,7 +355,6 @@ public class Util {
+@@ -357,7 +356,6 @@
return !fileInCanonicalParent.getCanonicalFile().equals( fileInCanonicalParent.getAbsoluteFile() );
}
@@ -59,11 +55,9 @@ index 9275e7f..29bb528 100644
private static Boolean isSymlinkJava7(File file) throws IOException {
try {
Object path = File.class.getMethod("toPath").invoke(file);
-diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java
-index f73bbe0..cff39a0 100644
--- a/core/src/main/java/hudson/WebAppMain.java
+++ b/core/src/main/java/hudson/WebAppMain.java
-@@ -248,7 +248,6 @@ public final class WebAppMain implements ServletContextListener {
+@@ -255,7 +255,6 @@
/**
* Installs log handler to monitor all Hudson logs.
*/
@@ -71,11 +65,9 @@ index f73bbe0..cff39a0 100644
private void installLogger() {
Jenkins.logRecords = handler.getView();
Logger.getLogger("").addHandler(handler);
-diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java
-index ffd0b1d..5abc7b1 100644
--- a/core/src/main/java/hudson/cli/GroovyshCommand.java
+++ b/core/src/main/java/hudson/cli/GroovyshCommand.java
-@@ -87,7 +87,6 @@ public class GroovyshCommand extends CLICommand {
+@@ -87,7 +87,6 @@
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
@@ -83,7 +75,7 @@ index ffd0b1d..5abc7b1 100644
public Object doCall(Object[] args) {
assert(args.length == 1);
assert(args[0] instanceof Shell);
-@@ -110,7 +109,6 @@ public class GroovyshCommand extends CLICommand {
+@@ -110,7 +109,6 @@
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
@@ -91,11 +83,9 @@ index ffd0b1d..5abc7b1 100644
public Object doCall(Object[] args) throws ChannelClosedException {
if (args.length == 1 && args[0] instanceof ChannelClosedException) {
throw (ChannelClosedException)args[0];
-diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java
-index f09a1c7..65896af 100644
--- a/core/src/main/java/hudson/logging/LogRecorderManager.java
+++ b/core/src/main/java/hudson/logging/LogRecorderManager.java
-@@ -112,7 +112,6 @@ public class LogRecorderManager extends AbstractModelObject {
+@@ -112,7 +112,6 @@
/**
* Configure the logging level.
*/
@@ -103,11 +93,9 @@ index f09a1c7..65896af 100644
public HttpResponse doConfigLogger(@QueryParameter String name, @QueryParameter String level) {
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
Level lv;
-diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java
-index e6714ca..372ae89 100644
--- a/core/src/main/java/hudson/triggers/Trigger.java
+++ b/core/src/main/java/hudson/triggers/Trigger.java
-@@ -63,7 +63,6 @@ import java.util.logging.Logger;
+@@ -63,7 +63,6 @@
import antlr.ANTLRException;
import javax.annotation.CheckForNull;
@@ -115,7 +103,7 @@ index e6714ca..372ae89 100644
/**
* Triggers a {@link Build}.
-@@ -280,7 +279,6 @@ public abstract class Trigger<J extends Item> implements Describable<Trigger<?>>
+@@ -280,7 +279,6 @@
*
* If plugins want to run periodic jobs, they should implement {@link PeriodicWork}.
*/
@@ -123,11 +111,9 @@ index e6714ca..372ae89 100644
public static @CheckForNull Timer timer;
@Initializer(after=JOB_LOADED)
-diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java
-index 0decb8f..946cb43 100644
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
-@@ -58,7 +58,6 @@ public class PluginServletFilter implements Filter, ExtensionPoint {
+@@ -58,7 +58,6 @@
public PluginServletFilter() {
}
@@ -135,11 +121,9 @@ index 0decb8f..946cb43 100644
public void init(FilterConfig filterConfig) throws ServletException {
PluginServletFilter.filterConfig = filterConfig;
synchronized (LIST) {
-diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java
-index c454397..134e660 100644
--- a/core/src/main/java/hudson/util/XStream2.java
+++ b/core/src/main/java/hudson/util/XStream2.java
-@@ -41,7 +41,6 @@ import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
+@@ -41,7 +41,6 @@
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.mapper.CannotResolveClassException;
@@ -147,7 +131,7 @@ index c454397..134e660 100644
import hudson.PluginManager;
import hudson.PluginWrapper;
import hudson.diagnosis.OldDataMonitor;
-@@ -388,7 +387,6 @@ public class XStream2 extends XStream {
+@@ -388,7 +387,6 @@
private PluginManager pm;
@@ -155,11 +139,9 @@ index c454397..134e660 100644
@Override public String ownerOf(Class<?> clazz) {
if (classOwnership != null) {
return classOwnership.ownerOf(clazz);
-diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
-index 7816b24..59ceb9e 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
-@@ -730,10 +730,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
+@@ -731,10 +731,6 @@
* @param pluginManager
* If non-null, use existing plugin manager. create a new one.
*/
@@ -170,7 +152,7 @@ index 7816b24..59ceb9e 100755
protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
long start = System.currentTimeMillis();
-@@ -2642,7 +2638,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
+@@ -2647,7 +2643,6 @@
/**
* Called to shut down the system.
*/
@@ -178,7 +160,7 @@ index 7816b24..59ceb9e 100755
public void cleanUp() {
for (ItemListener l : ItemListener.all())
l.onBeforeShutdown();
-@@ -3084,7 +3079,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
+@@ -3089,7 +3084,6 @@
/**
* For debugging. Expose URL to perform GC.
*/
@@ -186,8 +168,6 @@ index 7816b24..59ceb9e 100755
public void doGc(StaplerResponse rsp) throws IOException {
checkPermission(Jenkins.ADMINISTER);
System.gc();
-diff --git a/core/src/main/java/jenkins/util/ProgressiveRendering.java b/core/src/main/java/jenkins/util/ProgressiveRendering.java
-index c13932e..6be3a13 100644
--- a/core/src/main/java/jenkins/util/ProgressiveRendering.java
+++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java
@@ -24,7 +24,6 @@
@@ -198,8 +178,6 @@ index c13932e..6be3a13 100644
import hudson.model.Computer;
import java.util.concurrent.ExecutorService;
import java.util.logging.Level;
-diff --git a/core/src/test/java/hudson/slaves/ComputerLauncherTest.java b/core/src/test/java/hudson/slaves/ComputerLauncherTest.java
-index 2ce563c..8c45ebf 100644
--- a/core/src/test/java/hudson/slaves/ComputerLauncherTest.java
+++ b/core/src/test/java/hudson/slaves/ComputerLauncherTest.java
@@ -24,7 +24,6 @@
@@ -210,7 +188,7 @@ index 2ce563c..8c45ebf 100644
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-@@ -34,7 +33,6 @@ import org.apache.commons.io.output.NullOutputStream;
+@@ -34,7 +33,6 @@
import org.junit.Test;
import static org.junit.Assert.*;
@@ -218,8 +196,6 @@ index 2ce563c..8c45ebf 100644
public class ComputerLauncherTest {
@Test public void jdk7() throws IOException {
-diff --git a/core/src/test/java/hudson/tasks/junit/SuiteResultTest.java b/core/src/test/java/hudson/tasks/junit/SuiteResultTest.java
-index ffeb8a0..02ecbeb 100644
--- a/core/src/test/java/hudson/tasks/junit/SuiteResultTest.java
+++ b/core/src/test/java/hudson/tasks/junit/SuiteResultTest.java
@@ -23,7 +23,6 @@
@@ -230,7 +206,7 @@ index ffeb8a0..02ecbeb 100644
import java.io.File;
import java.util.List;
import java.net.URISyntaxException;
-@@ -178,7 +177,6 @@ public class SuiteResultTest extends TestCase {
+@@ -178,7 +177,6 @@
}
}
@@ -238,31 +214,27 @@ index ffeb8a0..02ecbeb 100644
public void testSuiteStdioTrimmingSurefire() throws Exception {
File data = File.createTempFile("TEST-", ".xml");
try {
-diff --git a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
-index 5fb2297..225c765 100755
--- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
-@@ -54,7 +54,6 @@ import org.apache.maven.artifact.versioning.ComparableVersion;
- import org.apache.maven.project.MavenProject;
- import org.apache.maven.project.ProjectBuildingException;
+@@ -23,7 +23,6 @@
+ */
+ package hudson.maven;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
- /**
- * @author Kohsuke Kawaguchi
-@@ -142,7 +141,6 @@ public class MavenUtil {
+ import hudson.AbortException;
+ import hudson.FilePath;
+ import hudson.Util;
+@@ -139,7 +138,6 @@
* Creates a fresh {@link MavenEmbedder} instance.
*
*/
- @SuppressWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
- public static MavenEmbedder createEmbedder(MavenEmbedderRequest mavenEmbedderRequest) throws MavenEmbedderException, IOException {
+ public static MavenEmbedder createEmbedder(MavenEmbedderRequest mer) throws MavenEmbedderException, IOException {
-diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java
-index 52c8cf7..62532ef 100644
--- a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java
+++ b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java
-@@ -199,7 +199,6 @@ public class SurefireArchiver extends TestFailureDetector {
+@@ -199,7 +199,6 @@
return true;
}
diff --git a/debian/patches/build/0015-use-stock-asm3.patch b/debian/patches/build/0015-use-stock-asm3.patch
index 5fd88eb..a442ea1 100644
--- a/debian/patches/build/0015-use-stock-asm3.patch
+++ b/debian/patches/build/0015-use-stock-asm3.patch
@@ -7,11 +7,9 @@ Subject: use-stock-asm3
core/src/main/java/hudson/util/SubClassGenerator.java | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
-diff --git a/core/pom.xml b/core/pom.xml
-index a668216..dc325b4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -585,6 +585,13 @@ THE SOFTWARE.
+@@ -589,6 +589,13 @@
</dependency>
<dependency>
@@ -25,11 +23,9 @@ index a668216..dc325b4 100644
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-annotation</artifactId>
<version>1.4</version>
-diff --git a/core/src/main/java/hudson/util/SubClassGenerator.java b/core/src/main/java/hudson/util/SubClassGenerator.java
-index d40a9e9..4486a37 100644
--- a/core/src/main/java/hudson/util/SubClassGenerator.java
+++ b/core/src/main/java/hudson/util/SubClassGenerator.java
-@@ -25,13 +25,13 @@ package hudson.util;
+@@ -25,13 +25,13 @@
import hudson.PluginManager.UberClassLoader;
import jenkins.model.Jenkins;
diff --git a/debian/patches/build/0023-stapler-compatibility.patch b/debian/patches/build/0023-stapler-compatibility.patch
deleted file mode 100644
index 5baceaa..0000000
--- a/debian/patches/build/0023-stapler-compatibility.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fixes a compilation error related to stapler (@DataBoundConstructor must be applied to a public constructor)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
-diff --git a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
-index 49c362a..62cfdac 100644
---- a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
-+++ b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
-@@ -27,7 +27,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller {
- public final String id;
-
- @DataBoundConstructor
-- protected DownloadFromUrlInstaller(String id) {
-+ public DownloadFromUrlInstaller(String id) {
- // this installer implementation is designed for platform independent binary,
- // and as such we don't provide the label support
- super(null);
diff --git a/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch b/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
index 5be68da..2a2613c 100644
--- a/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
+++ b/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
@@ -8,12 +8,10 @@ Subject: jnr-posix-upgrade
core/src/main/java/hudson/os/PosixException.java | 8 ++++----
3 files changed, 12 insertions(+), 8 deletions(-)
-diff --git a/core/pom.xml b/core/pom.xml
-index 5b48543..a668216 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -118,6 +118,11 @@ THE SOFTWARE.
- <version>1.0.3</version>
+@@ -123,6 +123,11 @@
+ <version>3.0.0</version>
</dependency>
<dependency>
+ <groupId>org.jruby.extras</groupId>
@@ -24,38 +22,43 @@ index 5b48543..a668216 100644
<groupId>org.kohsuke</groupId>
<artifactId>trilead-putty-extension</artifactId>
<version>1.2</version>
-diff --git a/core/src/main/java/hudson/os/PosixAPI.java b/core/src/main/java/hudson/os/PosixAPI.java
-index 1e893c1..db0aa7a 100644
--- a/core/src/main/java/hudson/os/PosixAPI.java
+++ b/core/src/main/java/hudson/os/PosixAPI.java
-@@ -1,10 +1,9 @@
- package hudson.os;
-
--import org.jruby.ext.posix.JavaPOSIX;
- import org.jruby.ext.posix.POSIX;
- import org.jruby.ext.posix.POSIXFactory;
- import org.jruby.ext.posix.POSIXHandler;
--import org.jruby.ext.posix.POSIX.ERRORS;
+@@ -5,10 +5,10 @@
+ import java.io.PrintStream;
+ import java.util.Map;
+ import java.util.logging.Logger;
+-import jnr.constants.platform.Errno;
+-import jnr.posix.POSIX;
+-import jnr.posix.POSIXFactory;
+-import jnr.posix.util.DefaultPOSIXHandler;
++import org.jruby.ext.posix.POSIX;
++import org.jruby.ext.posix.POSIXFactory;
++import org.jruby.ext.posix.POSIXHandler;
+import com.kenai.constantine.platform.Errno;
- import java.io.File;
- import java.io.InputStream;
-@@ -35,11 +34,11 @@ public class PosixAPI {
- * used a fallback java implementation which does not support many operations.
+ /**
+ * POSIX API wrapper.
+@@ -59,7 +59,7 @@
*/
+ @Deprecated
public static boolean supportsNative() {
-- return !(posix instanceof JavaPOSIX);
+- return !(jnaPosix instanceof org.jruby.ext.posix.JavaPOSIX);
+ return posix.isNative();
}
-
- private static final POSIX posix = POSIXFactory.getPOSIX(new POSIXHandler() {
-- public void error(ERRORS errors, String s) {
+
+ private static org.jruby.ext.posix.POSIX jnaPosix;
+@@ -67,8 +67,8 @@
+ @Deprecated
+ public static synchronized org.jruby.ext.posix.POSIX get() {
+ if (jnaPosix == null) {
+- jnaPosix = org.jruby.ext.posix.POSIXFactory.getPOSIX(new org.jruby.ext.posix.POSIXHandler() {
+- public void error(org.jruby.ext.posix.POSIX.ERRORS errors, String s) {
++ jnaPosix = POSIXFactory.getPOSIX(new POSIXHandler() {
+ public void error(Errno errors, String s) {
throw new PosixException(s,errors);
}
-diff --git a/core/src/main/java/hudson/os/PosixException.java b/core/src/main/java/hudson/os/PosixException.java
-index 93e96ef..b30e33b 100644
--- a/core/src/main/java/hudson/os/PosixException.java
+++ b/core/src/main/java/hudson/os/PosixException.java
@@ -1,6 +1,6 @@
@@ -66,7 +69,7 @@ index 93e96ef..b30e33b 100644
/**
* Indicates an error during POSIX API call.
-@@ -8,14 +8,14 @@ import org.jruby.ext.posix.POSIX.ERRORS;
+@@ -8,16 +8,16 @@
* @author Kohsuke Kawaguchi
*/
public class PosixException extends RuntimeException {
@@ -79,6 +82,8 @@ index 93e96ef..b30e33b 100644
this.errors = errors;
}
+ /** @deprecated Leaks reference to deprecated jna-posix API. */
+ @Deprecated
- public ERRORS getErrorCode() {
+ public Errno getErrorCode() {
return errors;
diff --git a/debian/patches/native-integration/0008-windows-service-disable.patch b/debian/patches/native-integration/0008-windows-service-disable.patch
index 497d620..85a5e0a 100644
--- a/debian/patches/native-integration/0008-windows-service-disable.patch
+++ b/debian/patches/native-integration/0008-windows-service-disable.patch
@@ -6,11 +6,9 @@ Subject: windows-service-disable
core/pom.xml | 26 --------------------------
1 file changed, 26 deletions(-)
-diff --git a/core/pom.xml b/core/pom.xml
-index b6465c2..69241b5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -759,32 +759,6 @@ THE SOFTWARE.
+@@ -763,32 +763,6 @@
</execution>
</executions>
</plugin>
diff --git a/debian/patches/native-integration/0009-filter-native-integrations.patch b/debian/patches/native-integration/0009-filter-native-integrations.patch
index 68164a7..e26c029 100644
--- a/debian/patches/native-integration/0009-filter-native-integrations.patch
+++ b/debian/patches/native-integration/0009-filter-native-integrations.patch
@@ -6,11 +6,9 @@ Subject: filter-native-integrations
core/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
-diff --git a/core/pom.xml b/core/pom.xml
-index 69241b5..5b48543 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -702,6 +702,17 @@ THE SOFTWARE.
+@@ -706,6 +706,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 6c9ddf1..2c5e474 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,4 +20,3 @@ 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
-build/0023-stapler-compatibility.patch
--
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