[jenkins] 05/32: Export patch queue for new upstream release
James Downing Page
jamespage at alioth.debian.org
Tue Aug 13 11:46:53 UTC 2013
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch master
in repository jenkins.
commit dcc07eee63a01e94e6d7e922aba4b8488fb41512
Author: James Page <james.page at ubuntu.com>
Date: Mon Aug 12 09:17:02 2013 +0100
Export patch queue for new upstream release
---
debian/patches/build/0001-build.patch | 6 +-
debian/patches/build/0002-openjdk6.patch | 8 +-
.../build/0003-remove-licensing-report.patch | 24 ++-
debian/patches/build/0004-disable-plugins.patch | 30 +++-
.../build/0005-apt-stapler-processing.patch | 6 +-
debian/patches/build/0007-remove-findbugs.patch | 183 +++++++++++++++++---
...tock-jmdns.patch => 0013-use-stock-jmdns.patch} | 4 +-
...-stock-asm3.patch => 0015-use-stock-asm3.patch} | 6 +-
...jbcrypt.patch => 0016-use-debian-jbcrypt.patch} | 2 +-
....xml.patch => 0017-ignore-plugin-pom.xml.patch} | 2 +-
...d-compat.patch => 0018-fileupload-compat.patch} | 4 +-
...compat.pach.patch => 0019-io-compat.pach.patch} | 0
...-upgrade.patch => 0012-jnr-posix-upgrade.patch} | 2 +-
.../0008-windows-service-disable.patch | 4 +-
.../0009-filter-native-integrations.patch | 4 +-
.../native-integration/0011-purge-winp.patch | 16 +-
.../0012-purge-windows-support.patch | 28 ---
debian/patches/series | 17 +-
...15-ubuntu-font.patch => 0014-ubuntu-font.patch} | 2 +-
19 files changed, 238 insertions(+), 110 deletions(-)
diff --git a/debian/patches/build/0001-build.patch b/debian/patches/build/0001-build.patch
index 0b48a06..8f02bf6 100644
--- a/debian/patches/build/0001-build.patch
+++ b/debian/patches/build/0001-build.patch
@@ -8,7 +8,7 @@ Subject: build
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
-index aeb3ded..f7bef0b 100644
+index c72677e..55078a5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -326,6 +326,16 @@ THE SOFTWARE.
@@ -29,7 +29,7 @@ index aeb3ded..f7bef0b 100644
<dependency>
<groupId>commons-jelly</groupId>
diff --git a/pom.xml b/pom.xml
-index f1823c0..2800795 100644
+index 9e32fca..8b43d42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,10 +48,7 @@ THE SOFTWARE.
@@ -43,7 +43,7 @@ index f1823c0..2800795 100644
<module>cli</module>
<module>plugins</module>
</modules>
-@@ -581,9 +578,6 @@ THE SOFTWARE.
+@@ -621,9 +618,6 @@ THE SOFTWARE.
<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 af70e59..142e8b3 100644
--- a/debian/patches/build/0002-openjdk6.patch
+++ b/debian/patches/build/0002-openjdk6.patch
@@ -8,7 +8,7 @@ Subject: openjdk6
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 0778c46..8bc6f20 100644
+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
@@ -20,14 +20,14 @@ index 0778c46..8bc6f20 100644
+ @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);
+ 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 26e536d..ffe3898 100644
+index 3c3be27..54607f9 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
-@@ -1276,6 +1276,15 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
+@@ -1362,6 +1362,15 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
}
private static final Logger LOGGER = Logger.getLogger(AbstractBuild.class.getName());
diff --git a/debian/patches/build/0003-remove-licensing-report.patch b/debian/patches/build/0003-remove-licensing-report.patch
index 87e0681..ac2418f 100644
--- a/debian/patches/build/0003-remove-licensing-report.patch
+++ b/debian/patches/build/0003-remove-licensing-report.patch
@@ -3,15 +3,15 @@ Date: Sun, 11 Aug 2013 10:41:38 +0100
Subject: remove-licensing-report
---
- core/src/main/resources/hudson/AboutJenkins/index.jelly | 7 -------
- core/src/main/resources/hudson/AboutJenkins/index.properties | 4 ++--
- 2 files changed, 2 insertions(+), 9 deletions(-)
+ core/src/main/resources/hudson/AboutJenkins/index.jelly | 15 ---------------
+ .../main/resources/hudson/AboutJenkins/index.properties | 4 ++--
+ 2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly
-index ac9a036..21e3d00 100644
+index 267ef11..21e3d00 100644
--- a/core/src/main/resources/hudson/AboutJenkins/index.jelly
+++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly
-@@ -31,13 +31,6 @@ THE SOFTWARE.
+@@ -31,21 +31,6 @@ THE SOFTWARE.
<p>
${%blurb}
</p>
@@ -19,9 +19,17 @@ index ac9a036..21e3d00 100644
- <p>
- ${%dependencies}
- </p>
-- <t:thirdPartyLicenses>
-- <st:include page="/META-INF/licenses.xml" optional="true" />
-- </t:thirdPartyLicenses>
+- <j:set var="uri" value="${it.licensesURL}"/>
+- <j:choose>
+- <j:when test="${uri != null}">
+- <t:thirdPartyLicenses>
+- <j:include uri="${uri}"/>
+- </t:thirdPartyLicenses>
+- </j:when>
+- <j:otherwise>
+- <p>${%No information recorded}</p>
+- </j:otherwise>
+- </j:choose>
</l:main-panel>
</l:layout>
</j:jelly>
diff --git a/debian/patches/build/0004-disable-plugins.patch b/debian/patches/build/0004-disable-plugins.patch
index 3e22487..73624be 100644
--- a/debian/patches/build/0004-disable-plugins.patch
+++ b/debian/patches/build/0004-disable-plugins.patch
@@ -3,11 +3,11 @@ Date: Sun, 11 Aug 2013 10:41:38 +0100
Subject: disable-plugins
---
- war/pom.xml | 65 +++++--------------------------------------------------------
- 1 file changed, 5 insertions(+), 60 deletions(-)
+ war/pom.xml | 83 ++++---------------------------------------------------------
+ 1 file changed, 5 insertions(+), 78 deletions(-)
diff --git a/war/pom.xml b/war/pom.xml
-index e2eb447..1ba526a 100644
+index 8a6b2eb..49ad021 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -174,6 +174,11 @@ THE SOFTWARE.
@@ -22,7 +22,7 @@ index e2eb447..1ba526a 100644
</dependencies>
<build>
-@@ -261,66 +266,6 @@ THE SOFTWARE.
+@@ -261,84 +266,6 @@ THE SOFTWARE.
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<destFileName>winstone.jar</destFileName>
</artifactItem>
@@ -35,7 +35,19 @@ index e2eb447..1ba526a 100644
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>ssh-slaves</artifactId>
-- <version>0.21</version>
+- <version>0.25</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>credentials</artifactId>
+- <version>1.3.1</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>ssh-credentials</artifactId>
+- <version>0.2</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
@@ -65,7 +77,7 @@ index e2eb447..1ba526a 100644
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>translation</artifactId>
-- <version>1.8</version>
+- <version>1.10</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
@@ -86,6 +98,12 @@ index e2eb447..1ba526a 100644
- <version>1.0</version>
- <type>hpi</type>
- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>mailer</artifactId>
+- <version>1.4</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/0005-apt-stapler-processing.patch b/debian/patches/build/0005-apt-stapler-processing.patch
index 333809a..fbcae0e 100644
--- a/debian/patches/build/0005-apt-stapler-processing.patch
+++ b/debian/patches/build/0005-apt-stapler-processing.patch
@@ -7,10 +7,10 @@ Subject: apt-stapler-processing
1 file changed, 18 insertions(+)
diff --git a/core/pom.xml b/core/pom.xml
-index f7bef0b..18d777f 100644
+index 55078a5..b6465c2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -652,6 +652,24 @@ THE SOFTWARE.
+@@ -678,6 +678,24 @@ THE SOFTWARE.
</executions>
</plugin>
<plugin>
@@ -34,4 +34,4 @@ index f7bef0b..18d777f 100644
+ <plugin>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
- <version>1.16</version>
+ <!-- version specified in grandparent pom -->
diff --git a/debian/patches/build/0007-remove-findbugs.patch b/debian/patches/build/0007-remove-findbugs.patch
index 7b5f0a4..f1c8b9a 100644
--- a/debian/patches/build/0007-remove-findbugs.patch
+++ b/debian/patches/build/0007-remove-findbugs.patch
@@ -3,30 +3,76 @@ Date: Sun, 11 Aug 2013 10:41:39 +0100
Subject: remove-findbugs
---
- core/src/main/java/hudson/WebAppMain.java | 1 -
- core/src/main/java/hudson/cli/GroovyshCommand.java | 2 --
- core/src/main/java/hudson/logging/LogRecorderManager.java | 1 -
- core/src/main/java/hudson/util/PluginServletFilter.java | 1 -
- core/src/main/java/jenkins/model/Jenkins.java | 2 --
- core/src/main/java/jenkins/util/ProgressiveRendering.java | 1 -
- maven-plugin/src/main/java/hudson/maven/MavenUtil.java | 2 --
- maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java | 1 -
- 8 files changed, 11 deletions(-)
+ core/src/main/java/hudson/UDPBroadcastThread.java | 2 --
+ core/src/main/java/hudson/Util.java | 2 --
+ core/src/main/java/hudson/WebAppMain.java | 1 -
+ core/src/main/java/hudson/cli/GroovyshCommand.java | 2 --
+ core/src/main/java/hudson/logging/LogRecorderManager.java | 1 -
+ core/src/main/java/hudson/triggers/Trigger.java | 2 --
+ core/src/main/java/hudson/util/PluginServletFilter.java | 1 -
+ core/src/main/java/hudson/util/XStream2.java | 2 --
+ core/src/main/java/jenkins/model/Jenkins.java | 6 ------
+ core/src/main/java/jenkins/util/ProgressiveRendering.java | 1 -
+ core/src/test/java/hudson/slaves/ComputerLauncherTest.java | 2 --
+ core/src/test/java/hudson/tasks/junit/SuiteResultTest.java | 2 --
+ maven-plugin/src/main/java/hudson/maven/MavenUtil.java | 2 --
+ .../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 @@
+ */
+ package hudson;
+
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+ import hudson.model.Hudson;
+ import jenkins.model.Jenkins;
+ import hudson.util.OneShotEvent;
+@@ -69,7 +68,6 @@ public class UDPBroadcastThread extends Thread {
+ mcs = new MulticastSocket(PORT);
+ }
+
+- @SuppressWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
+ @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;
+ import com.sun.jna.Memory;
+ import com.sun.jna.Native;
+ import com.sun.jna.NativeLong;
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+ import hudson.Proc.LocalProc;
+ import hudson.model.TaskListener;
+ import hudson.os.PosixAPI;
+@@ -356,7 +355,6 @@ public class Util {
+ return !fileInCanonicalParent.getCanonicalFile().equals( fileInCanonicalParent.getAbsoluteFile() );
+ }
+
+- @SuppressWarnings("NP_BOOLEAN_RETURN_NULL")
+ 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 07e679d..d7e38a5 100644
+index f73bbe0..cff39a0 100644
--- a/core/src/main/java/hudson/WebAppMain.java
+++ b/core/src/main/java/hudson/WebAppMain.java
-@@ -251,7 +251,6 @@ public final class WebAppMain implements ServletContextListener {
+@@ -248,7 +248,6 @@ public final class WebAppMain implements ServletContextListener {
/**
* Installs log handler to monitor all Hudson logs.
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings("LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE")
private void installLogger() {
Jenkins.logRecords = handler.getView();
- Logger.getLogger("hudson").addHandler(handler);
+ 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 22a20ec..8d13d3b 100644
+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 {
@@ -46,7 +92,7 @@ index 22a20ec..8d13d3b 100644
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 3ceff0a..9e1f22c 100644
+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 {
@@ -57,6 +103,26 @@ index 3ceff0a..9e1f22c 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;
+
+ import antlr.ANTLRException;
+ import javax.annotation.CheckForNull;
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
+ /**
+ * Triggers a {@link Build}.
+@@ -280,7 +279,6 @@ public abstract class Trigger<J extends Item> implements Describable<Trigger<?>>
+ *
+ * If plugins want to run periodic jobs, they should implement {@link PeriodicWork}.
+ */
+- @SuppressWarnings("MS_SHOULD_BE_FINAL")
+ 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
@@ -69,19 +135,50 @@ 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;
+ import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+ import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+ import com.thoughtworks.xstream.mapper.CannotResolveClassException;
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+ import hudson.PluginManager;
+ import hudson.PluginWrapper;
+ import hudson.diagnosis.OldDataMonitor;
+@@ -388,7 +387,6 @@ public class XStream2 extends XStream {
+
+ private PluginManager pm;
+
+- @SuppressWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE") // classOwnership checked for null so why does FB complain?
+ @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 97da277..eab0e9c 100755
+index 7816b24..59ceb9e 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
-@@ -730,7 +730,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
+@@ -730,10 +730,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
* @param pluginManager
* If non-null, use existing plugin manager. create a new one.
*/
-- @edu.umd.cs.findbugs.annotations.SuppressWarnings("SC_START_IN_CTOR") // bug in FindBugs. It flags UDPBroadcastThread.start() call but that's for another class
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings({
+- "SC_START_IN_CTOR", // bug in FindBugs. It flags UDPBroadcastThread.start() call but that's for another class
+- "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" // Trigger.timer
+- })
protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
long start = System.currentTimeMillis();
-@@ -3019,7 +3018,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
+@@ -2642,7 +2638,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
+ /**
+ * Called to shut down the system.
+ */
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
+ public void cleanUp() {
+ for (ItemListener l : ItemListener.all())
+ l.onBeforeShutdown();
+@@ -3084,7 +3079,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
/**
* For debugging. Expose URL to perform GC.
*/
@@ -101,11 +198,51 @@ 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 @@
+
+ package hudson.slaves;
+
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+ import java.io.BufferedReader;
+ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
+@@ -34,7 +33,6 @@ import org.apache.commons.io.output.NullOutputStream;
+ import org.junit.Test;
+ import static org.junit.Assert.*;
+
+- at SuppressWarnings("DM_DEFAULT_ENCODING")
+ 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 @@
+ */
+ package hudson.tasks.junit;
+
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+ import java.io.File;
+ import java.util.List;
+ import java.net.URISyntaxException;
+@@ -178,7 +177,6 @@ public class SuiteResultTest extends TestCase {
+ }
+ }
+
+- @SuppressWarnings({"RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", "DM_DEFAULT_ENCODING", "OS_OPEN_STREAM"})
+ 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 65d2a26..f2f40c6 100755
+index 5fb2297..225c765 100755
--- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
-@@ -53,7 +53,6 @@ import org.apache.maven.artifact.versioning.ComparableVersion;
+@@ -54,7 +54,6 @@ import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
@@ -113,7 +250,7 @@ index 65d2a26..f2f40c6 100755
/**
* @author Kohsuke Kawaguchi
-@@ -140,7 +139,6 @@ public class MavenUtil {
+@@ -142,7 +141,6 @@ public class MavenUtil {
* Creates a fresh {@link MavenEmbedder} instance.
*
*/
@@ -122,10 +259,10 @@ index 65d2a26..f2f40c6 100755
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 987b311..85fb82e 100644
+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
-@@ -170,7 +170,6 @@ public class SurefireArchiver extends MavenReporter {
+@@ -199,7 +199,6 @@ public class SurefireArchiver extends TestFailureDetector {
return true;
}
diff --git a/debian/patches/build/0014-use-stock-jmdns.patch b/debian/patches/build/0013-use-stock-jmdns.patch
similarity index 91%
rename from debian/patches/build/0014-use-stock-jmdns.patch
rename to debian/patches/build/0013-use-stock-jmdns.patch
index 7a66a32..45e3ccb 100644
--- a/debian/patches/build/0014-use-stock-jmdns.patch
+++ b/debian/patches/build/0013-use-stock-jmdns.patch
@@ -7,10 +7,10 @@ Subject: use-stock-jmdns
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/hudson/DNSMultiCast.java b/core/src/main/java/hudson/DNSMultiCast.java
-index 2f187bd..a2cfcdc 100644
+index 8d029b6..e2a82f0 100644
--- a/core/src/main/java/hudson/DNSMultiCast.java
+++ b/core/src/main/java/hudson/DNSMultiCast.java
-@@ -66,12 +66,12 @@ public class DNSMultiCast implements Closeable {
+@@ -75,12 +75,12 @@ public class DNSMultiCast implements Closeable {
public void close() {
if (jmdns!=null) {
diff --git a/debian/patches/build/0016-use-stock-asm3.patch b/debian/patches/build/0015-use-stock-asm3.patch
similarity index 94%
rename from debian/patches/build/0016-use-stock-asm3.patch
rename to debian/patches/build/0015-use-stock-asm3.patch
index 69f5932..5fd88eb 100644
--- a/debian/patches/build/0016-use-stock-asm3.patch
+++ b/debian/patches/build/0015-use-stock-asm3.patch
@@ -8,10 +8,10 @@ Subject: use-stock-asm3
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
-index d474892..8596c28 100644
+index a668216..dc325b4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -584,6 +584,13 @@ THE SOFTWARE.
+@@ -585,6 +585,13 @@ THE SOFTWARE.
</dependency>
<dependency>
@@ -24,7 +24,7 @@ index d474892..8596c28 100644
+ <dependency>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-annotation</artifactId>
- <version>1.0</version>
+ <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
diff --git a/debian/patches/build/0017-use-debian-jbcrypt.patch b/debian/patches/build/0016-use-debian-jbcrypt.patch
similarity index 96%
rename from debian/patches/build/0017-use-debian-jbcrypt.patch
rename to debian/patches/build/0016-use-debian-jbcrypt.patch
index d492140..598d117 100644
--- a/debian/patches/build/0017-use-debian-jbcrypt.patch
+++ b/debian/patches/build/0016-use-debian-jbcrypt.patch
@@ -7,7 +7,7 @@ Subject: use-debian-jbcrypt
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 7c3a242..3f9127c 100644
+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;
diff --git a/debian/patches/build/0018-ignore-plugin-pom.xml.patch b/debian/patches/build/0017-ignore-plugin-pom.xml.patch
similarity index 93%
rename from debian/patches/build/0018-ignore-plugin-pom.xml.patch
rename to debian/patches/build/0017-ignore-plugin-pom.xml.patch
index e906379..205b471 100644
--- a/debian/patches/build/0018-ignore-plugin-pom.xml.patch
+++ b/debian/patches/build/0017-ignore-plugin-pom.xml.patch
@@ -7,7 +7,7 @@ Subject: ignore-plugin-pom.xml
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
-index 2800795..3ddd688 100644
+index 8b43d42..9e36e37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,6 @@ THE SOFTWARE.
diff --git a/debian/patches/build/0019-fileupload-compat.patch b/debian/patches/build/0018-fileupload-compat.patch
similarity index 92%
rename from debian/patches/build/0019-fileupload-compat.patch
rename to debian/patches/build/0018-fileupload-compat.patch
index 4a824ff..58150c6 100644
--- a/debian/patches/build/0019-fileupload-compat.patch
+++ b/debian/patches/build/0018-fileupload-compat.patch
@@ -7,7 +7,7 @@ Subject: fileupload-compat
1 file changed, 8 insertions(+)
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
-index dd322ab..18d9075 100644
+index 2251ea5..afcfcaf 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -40,6 +40,7 @@ import javax.servlet.ServletException;
@@ -18,7 +18,7 @@ index dd322ab..18d9075 100644
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-@@ -277,5 +278,12 @@ public class FileParameterValue extends ParameterValue {
+@@ -284,5 +285,12 @@ public class FileParameterValue extends ParameterValue {
public OutputStream getOutputStream() throws IOException {
return new FileOutputStream(file);
}
diff --git a/debian/patches/build/0020-io-compat.pach.patch b/debian/patches/build/0019-io-compat.pach.patch
similarity index 100%
rename from debian/patches/build/0020-io-compat.pach.patch
rename to debian/patches/build/0019-io-compat.pach.patch
diff --git a/debian/patches/dependency-upgrades/0013-jnr-posix-upgrade.patch b/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
similarity index 98%
rename from debian/patches/dependency-upgrades/0013-jnr-posix-upgrade.patch
rename to debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
index fc0f758..5be68da 100644
--- a/debian/patches/dependency-upgrades/0013-jnr-posix-upgrade.patch
+++ b/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
@@ -9,7 +9,7 @@ Subject: jnr-posix-upgrade
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
-index 4a76cf4..d474892 100644
+index 5b48543..a668216 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -118,6 +118,11 @@ THE SOFTWARE.
diff --git a/debian/patches/native-integration/0008-windows-service-disable.patch b/debian/patches/native-integration/0008-windows-service-disable.patch
index b5518d2..497d620 100644
--- a/debian/patches/native-integration/0008-windows-service-disable.patch
+++ b/debian/patches/native-integration/0008-windows-service-disable.patch
@@ -7,10 +7,10 @@ Subject: windows-service-disable
1 file changed, 26 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
-index 18d777f..d6934ea 100644
+index b6465c2..69241b5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -734,32 +734,6 @@ THE SOFTWARE.
+@@ -759,32 +759,6 @@ THE SOFTWARE.
</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 3f5f619..68164a7 100644
--- a/debian/patches/native-integration/0009-filter-native-integrations.patch
+++ b/debian/patches/native-integration/0009-filter-native-integrations.patch
@@ -7,10 +7,10 @@ Subject: filter-native-integrations
1 file changed, 11 insertions(+)
diff --git a/core/pom.xml b/core/pom.xml
-index d6934ea..4a76cf4 100644
+index 69241b5..5b48543 100644
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -677,6 +677,17 @@ THE SOFTWARE.
+@@ -702,6 +702,17 @@ THE SOFTWARE.
<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/0011-purge-winp.patch b/debian/patches/native-integration/0011-purge-winp.patch
index 5697bf2..361ab86 100644
--- a/debian/patches/native-integration/0011-purge-winp.patch
+++ b/debian/patches/native-integration/0011-purge-winp.patch
@@ -3,11 +3,11 @@ Date: Sun, 11 Aug 2013 10:41:39 +0100
Subject: purge-winp
---
- core/src/main/java/hudson/util/ProcessTree.java | 82 +------------------------
- 1 file changed, 1 insertion(+), 81 deletions(-)
+ core/src/main/java/hudson/util/ProcessTree.java | 81 -------------------------
+ 1 file changed, 81 deletions(-)
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
-index 020978c..da06757 100644
+index 392e73c..da06757 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -37,8 +37,6 @@ import hudson.util.ProcessTree.OSProcess;
@@ -29,7 +29,7 @@ index 020978c..da06757 100644
String os = Util.fixNull(System.getProperty("os.name"));
if(os.equals("Linux"))
return new Linux();
-@@ -390,81 +385,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
+@@ -390,82 +385,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
}
};
@@ -38,6 +38,7 @@ index 020978c..da06757 100644
- Windows() {
- for (final WinProcess p : WinProcess.all()) {
- int pid = p.getPid();
+- if(pid == 0 || pid == 4) continue; // skip the System Idle and System processes
- super.processes.put(pid,new OSProcess(pid) {
- private EnvVars env;
- private List<String> args;
@@ -111,10 +112,3 @@ index 020978c..da06757 100644
static abstract class Unix extends Local {
@Override
public OSProcess get(Process proc) {
-@@ -1227,4 +1147,4 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
- */
- public static boolean enabled = !Boolean.getBoolean(ProcessTreeKiller.class.getName()+".disable")
- && !Boolean.getBoolean(ProcessTree.class.getName()+".disable");
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/native-integration/0012-purge-windows-support.patch b/debian/patches/native-integration/0012-purge-windows-support.patch
deleted file mode 100644
index 4f807c8..0000000
--- a/debian/patches/native-integration/0012-purge-windows-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Sun, 11 Aug 2013 10:41:39 +0100
-Subject: purge-windows-support
-
----
- core/src/main/java/hudson/slaves/SlaveComputer.java | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
-index 66dc98e..4099007 100644
---- a/core/src/main/java/hudson/slaves/SlaveComputer.java
-+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
-@@ -36,7 +36,6 @@ import hudson.util.NullStream;
- import hudson.util.RingBufferLogHandler;
- import hudson.util.Futures;
- import hudson.FilePath;
--import hudson.lifecycle.WindowsSlaveInstaller;
- import hudson.Util;
- import hudson.AbortException;
- import hudson.remoting.Launcher;
-@@ -389,7 +388,6 @@ public class SlaveComputer extends Computer {
- channel.pinClassLoader(getClass().getClassLoader());
-
- channel.call(new SlaveInitializer());
--// channel.call(new WindowsSlaveInstaller(remoteFs));
- for (ComputerListener cl : ComputerListener.all())
- cl.preOnline(this,channel,root,taskListener);
-
diff --git a/debian/patches/series b/debian/patches/series
index 90ae41b..64dffc1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,12 +9,11 @@ native-integration/0008-windows-service-disable.patch
native-integration/0009-filter-native-integrations.patch
native-integration/0010-purge-embedded-su4j.patch
native-integration/0011-purge-winp.patch
-native-integration/0012-purge-windows-support.patch
-dependency-upgrades/0013-jnr-posix-upgrade.patch
-build/0014-use-stock-jmdns.patch
-ubuntu/0015-ubuntu-font.patch
-build/0016-use-stock-asm3.patch
-build/0017-use-debian-jbcrypt.patch
-build/0018-ignore-plugin-pom.xml.patch
-build/0019-fileupload-compat.patch
-build/0020-io-compat.pach.patch
+dependency-upgrades/0012-jnr-posix-upgrade.patch
+build/0013-use-stock-jmdns.patch
+ubuntu/0014-ubuntu-font.patch
+build/0015-use-stock-asm3.patch
+build/0016-use-debian-jbcrypt.patch
+build/0017-ignore-plugin-pom.xml.patch
+build/0018-fileupload-compat.patch
+build/0019-io-compat.pach.patch
diff --git a/debian/patches/ubuntu/0015-ubuntu-font.patch b/debian/patches/ubuntu/0014-ubuntu-font.patch
similarity index 96%
rename from debian/patches/ubuntu/0015-ubuntu-font.patch
rename to debian/patches/ubuntu/0014-ubuntu-font.patch
index b616d0e..4893c4e 100644
--- a/debian/patches/ubuntu/0015-ubuntu-font.patch
+++ b/debian/patches/ubuntu/0014-ubuntu-font.patch
@@ -7,7 +7,7 @@ Subject: ubuntu-font
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 8504f88..0f6afca 100644
+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 {
--
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