[jenkins] 02/02: Refreshed the patches Added a dependency on libguice-java Depend on libjenkins-remoting-java >= 2.32
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Sep 3 13:21:37 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 93b8be1bafcc38e74bf755e0f0f2bb691dc326dc
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Sep 3 15:20:29 2014 +0200
Refreshed the patches
Added a dependency on libguice-java
Depend on libjenkins-remoting-java >= 2.32
---
debian/changelog | 4 ++-
debian/control | 5 +--
debian/maven.ignoreRules | 1 +
debian/maven.rules | 4 ++-
.../0020-Drop-use-of-gitsite-extension.patch | 2 +-
.../0021-Compatibility-patch-for-guava-0.14.patch | 4 +--
...2-Exclude-asm-dependencies-from-jnr-posix.patch | 2 +-
...ignore-bytecode-compatibility-transformer.patch | 23 +++++-------
debian/patches/0024-args4j-compatibility.patch | 30 ++++++++++++++++
debian/patches/build/0001-build.patch | 13 ++++---
debian/patches/build/0002-openjdk6.patch | 2 +-
.../build/0003-remove-licensing-report.patch | 19 ++++------
debian/patches/build/0004-disable-plugins.patch | 22 ++++++------
.../build/0005-apt-stapler-processing.patch | 2 +-
debian/patches/build/0007-remove-findbugs.patch | 42 ++++------------------
debian/patches/build/0015-use-stock-asm3.patch | 2 +-
debian/patches/build/0018-fileupload-compat.patch | 6 ++--
.../0012-jnr-posix-upgrade.patch | 8 ++---
.../0008-windows-service-disable.patch | 14 ++++----
.../0009-filter-native-integrations.patch | 2 +-
.../native-integration/0011-purge-winp.patch | 26 +++++++++-----
debian/patches/series | 1 +
22 files changed, 117 insertions(+), 117 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0ade132..72fc5b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-jenkins (1.509.4-1) UNRELEASED; urgency=medium
+jenkins (1.532.1-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
- Ignore the dependency on bytecode-compatibility-transformer
+ - Added a dependency on libguice-java
+ - Depend on libjenkins-remoting-java >= 2.32
* 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 2b36493..c2ecc66 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Build-Depends-Indep:
libcommons-io-java (>= 2.4),
libcommons-lang-java,
libcommons-logging-java,
+ libguice-java,
libjaxen-java,
libjbcrypt-java (>= 0.3-4~),
libjellydoc-java,
@@ -54,7 +55,7 @@ Build-Depends-Indep:
libjenkins-htmlunit-java,
libjenkins-json-java (>= 2.4-jenkins-1),
libjenkins-plugin-parent-java,
- libjenkins-remoting-java (>= 2.23),
+ libjenkins-remoting-java (>= 2.32),
libjenkins-trilead-ssh2-java (>= 214-jenkins-1),
libjenkins-winstone-java (>= 0.9.10-jenkins-44),
libjenkins-xstream-java (>= 1.4.4-jenkins-3),
@@ -164,7 +165,7 @@ Description: Jenkins Plugin Parent Maven POM
Package: jenkins-common
Architecture: all
Depends:
- libjenkins-remoting-java (>= 2.23),
+ libjenkins-remoting-java (>= 2.32),
libjffi-java,
libjna-java,
libjnr-posix-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 7aba12e..3211f95 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -21,6 +21,7 @@ org.apache.maven.plugins maven-pmd-plugin * * * *
org.apache.maven.plugins maven-project-info-reports-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-remote-resources-plugin * * * *
+org.apache.maven.plugins maven-enforcer-plugin * * * *
# OK: Used for generating the wiki - not required for Debian
org.codehaus.mojo apt-maven-plugin * * * *
org.jvnet.maven-jellydoc-plugin maven-jellydoc-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 0c04aca..a8a56f8 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.4/ * *
+org.jenkins-ci.main * * s/1\..*/1.532.1/ * *
# Handle plugin package
org.kohsuke access-modifier-annotation jar s/.*/1.4/ * *
org.kohsuke access-modifier-checker * s/.*/1.4/ * *
@@ -70,3 +70,5 @@ s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer * s/.*/debian/ * *
s/org.kohsuke/org.jvnet.libpam4j/ libpam4j * s/.*/debian/ * *
# Updates for 1.480.3
org.springframework s/spring-webmvc/spring-web/ * s/.*/3.x/ * *
+
+com.google.inject guice * s/.*/debian/ s/no_aop// *
diff --git a/debian/patches/0020-Drop-use-of-gitsite-extension.patch b/debian/patches/0020-Drop-use-of-gitsite-extension.patch
index 7d49392..7269ff2 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
-@@ -667,14 +667,6 @@
+@@ -701,14 +701,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 c0e61ea..4b94421 100644
--- a/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch
+++ b/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch
@@ -7,11 +7,9 @@ Iterations.skip -> Iterators.advance
core/src/main/java/hudson/util/RunList.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java
-index 25f7dea..cb35d2c 100644
--- a/core/src/main/java/hudson/util/RunList.java
+++ b/core/src/main/java/hudson/util/RunList.java
-@@ -138,7 +138,7 @@ public class RunList<R extends Run> extends AbstractList<R> {
+@@ -133,7 +133,7 @@
public List<R> subList(int fromIndex, int toIndex) {
List<R> r = new ArrayList<R>();
Iterator<R> itr = iterator();
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 a0e07f3..7816e1b 100644
--- a/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
+++ b/debian/patches/0022-Exclude-asm-dependencies-from-jnr-posix.patch
@@ -9,7 +9,7 @@ This pulls in asm4 which creates class loading issues.
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -116,6 +116,16 @@
+@@ -98,6 +98,16 @@
<groupId>org.jruby.ext.posix</groupId>
<artifactId>jna-posix</artifactId>
<version>1.0.3</version>
diff --git a/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch b/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
index ec415c3..4f941e6 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
-@@ -91,7 +91,6 @@
- import net.sf.json.JSONObject;
+@@ -96,7 +96,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.NoExternalUse;
import org.kohsuke.args4j.Argument;
-@@ -236,8 +235,7 @@
+@@ -244,8 +243,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");
-@@ -332,7 +330,7 @@
+@@ -346,7 +344,7 @@
if (triggers == null) {
triggersUpdater.compareAndSet(this,null,new DescribableList<Trigger<?>,TriggerDescriptor>(this));
}
@@ -30,7 +30,7 @@ Forwarded: not-needed
}
@Override
-@@ -1966,7 +1964,7 @@
+@@ -2003,7 +2001,7 @@
for (Trigger t : triggers())
t.stop();
@@ -78,17 +78,12 @@ Forwarded: not-needed
public Api getApi() {
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
-@@ -626,11 +626,12 @@
+@@ -693,8 +693,6 @@
- return url;
- }
--
-+/*
@Override
protected Class defineClassFromData(File container, byte[] classData, String classname) throws IOException {
- return super.defineClassFromData(container, pluginManager.getCompatibilityTransformer().transform(classname,classData), classname);
+- if (!DISABLE_TRANSFORMER)
+- classData = pluginManager.getCompatibilityTransformer().transform(classname, classData);
+ return super.defineClassFromData(container, classData, classname);
}
-+*/
}
-
- public static boolean useAntClassLoader = Boolean.getBoolean(ClassicPluginStrategy.class.getName()+".useAntClassLoader");
diff --git a/debian/patches/0024-args4j-compatibility.patch b/debian/patches/0024-args4j-compatibility.patch
new file mode 100644
index 0000000..8b025de
--- /dev/null
+++ b/debian/patches/0024-args4j-compatibility.patch
@@ -0,0 +1,30 @@
+Description: Ensure the compatibility with the version of args4j in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/core/src/main/java/hudson/cli/declarative/MethodBinder.java
++++ b/core/src/main/java/hudson/cli/declarative/MethodBinder.java
+@@ -79,6 +79,14 @@
+ public boolean isMultiValued() {
+ return false;
+ }
++
++ public java.lang.reflect.AnnotatedElement asAnnotatedElement() {
++ return null;
++ }
++
++ public org.kohsuke.args4j.spi.FieldSetter asFieldSetter() {
++ return null;
++ }
+ };
+ Option option = p.annotation(Option.class);
+ if (option!=null) {
+@@ -148,5 +156,9 @@
+ public Class<? extends Annotation> annotationType() {
+ return base.annotationType();
+ }
++
++ public boolean hidden() {
++ return base.hidden();
++ }
+ }
+ }
diff --git a/debian/patches/build/0001-build.patch b/debian/patches/build/0001-build.patch
index 3a60450..91b9776 100644
--- a/debian/patches/build/0001-build.patch
+++ b/debian/patches/build/0001-build.patch
@@ -9,7 +9,7 @@ Subject: build
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -330,6 +330,16 @@
+@@ -312,6 +312,16 @@
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
<version>1.0</version>
@@ -28,24 +28,23 @@ Subject: build
<groupId>commons-jelly</groupId>
--- a/pom.xml
+++ b/pom.xml
-@@ -48,10 +48,7 @@
+@@ -48,9 +48,7 @@
<modules>
<module>core</module>
-- <module>maven-plugin</module>
- <module>ui-samples-plugin</module>
<module>war</module>
- <module>test</module>
<module>cli</module>
<module>plugins</module>
</modules>
-@@ -618,9 +615,6 @@
+@@ -626,9 +624,6 @@
<requireJavaVersion>
<version>1.6.0-18</version>
</requireJavaVersion>
- <requireMavenVersion>
- <version>3.0</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>1.${java.level}</maxJdkVersion>
+ </enforceBytecodeVersion>
diff --git a/debian/patches/build/0002-openjdk6.patch b/debian/patches/build/0002-openjdk6.patch
index 27b12e6..423bf16 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
-@@ -1340,6 +1340,15 @@
+@@ -1341,6 +1341,15 @@
}
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 ac2418f..7529e83 100644
--- a/debian/patches/build/0003-remove-licensing-report.patch
+++ b/debian/patches/build/0003-remove-licensing-report.patch
@@ -7,15 +7,12 @@ Subject: remove-licensing-report
.../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 267ef11..21e3d00 100644
--- a/core/src/main/resources/hudson/AboutJenkins/index.jelly
+++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly
-@@ -31,21 +31,6 @@ THE SOFTWARE.
- <p>
+@@ -32,20 +32,6 @@
${%blurb}
</p>
--
+
- <p>
- ${%dependencies}
- </p>
@@ -30,11 +27,9 @@ index 267ef11..21e3d00 100644
- <p>${%No information recorded}</p>
- </j:otherwise>
- </j:choose>
- </l:main-panel>
- </l:layout>
- </j:jelly>
-diff --git a/core/src/main/resources/hudson/AboutJenkins/index.properties b/core/src/main/resources/hudson/AboutJenkins/index.properties
-index 08f9d8a..8b1e58d 100644
+ <p>${%plugin.dependencies}</p>
+ <ul>
+ <j:forEach var="p" items="${app.pluginManager.plugins}"> <!-- TODO sort -->
--- a/core/src/main/resources/hudson/AboutJenkins/index.properties
+++ b/core/src/main/resources/hudson/AboutJenkins/index.properties
@@ -20,7 +20,7 @@
@@ -45,6 +40,4 @@ index 08f9d8a..8b1e58d 100644
+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.
--dependencies=Jenkins depends on the following 3rd party libraries.
-\ No newline at end of file
-+dependencies=Jenkins depends on the following 3rd party libraries.
+ dependencies=Jenkins depends on the following 3rd party libraries.
diff --git a/debian/patches/build/0004-disable-plugins.patch b/debian/patches/build/0004-disable-plugins.patch
index 8ee4956..e365873 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
-@@ -174,6 +174,11 @@
+@@ -173,6 +173,11 @@
<scope>system</scope>
<systemPath>/usr/local/yjp/lib/yjp.jar</systemPath>
</dependency-->
@@ -20,7 +20,7 @@ Subject: disable-plugins
</dependencies>
<build>
-@@ -261,84 +266,6 @@
+@@ -260,84 +265,6 @@
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<destFileName>winstone.jar</destFileName>
</artifactItem>
@@ -33,43 +33,43 @@ Subject: disable-plugins
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>ssh-slaves</artifactId>
-- <version>0.25</version>
+- <version>1.5</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>credentials</artifactId>
-- <version>1.3.1</version>
+- <version>1.9.1</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>ssh-credentials</artifactId>
-- <version>0.3</version>
+- <version>1.5.1</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>subversion</artifactId>
-- <version>1.39</version>
+- <version>1.45</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>cvs</artifactId>
-- <version>1.6</version>
+- <version>2.8</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>ant</artifactId>
-- <version>1.1</version>
+- <version>1.2</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>javadoc</artifactId>
-- <version>1.0</version>
+- <version>1.1</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
@@ -87,7 +87,7 @@ Subject: disable-plugins
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>ldap</artifactId>
-- <version>1.1</version>
+- <version>1.2</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
@@ -99,7 +99,7 @@ Subject: disable-plugins
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>mailer</artifactId>
-- <version>1.4</version>
+- <version>1.5</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 d7daad4..352c816 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
-@@ -682,6 +682,24 @@
+@@ -654,6 +654,24 @@
</executions>
</plugin>
<plugin>
diff --git a/debian/patches/build/0007-remove-findbugs.patch b/debian/patches/build/0007-remove-findbugs.patch
index 9883469..450c70b 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;
-@@ -357,7 +356,6 @@
+@@ -355,7 +354,6 @@
return !fileInCanonicalParent.getCanonicalFile().equals( fileInCanonicalParent.getAbsoluteFile() );
}
@@ -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
-@@ -112,7 +112,6 @@
+@@ -125,7 +125,6 @@
/**
* Configure the logging level.
*/
@@ -113,7 +113,7 @@ Subject: remove-findbugs
@Initializer(after=JOB_LOADED)
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
-@@ -58,7 +58,6 @@
+@@ -59,7 +59,6 @@
public PluginServletFilter() {
}
@@ -131,7 +131,7 @@ Subject: remove-findbugs
import hudson.PluginManager;
import hudson.PluginWrapper;
import hudson.diagnosis.OldDataMonitor;
-@@ -388,7 +387,6 @@
+@@ -389,7 +388,6 @@
private PluginManager pm;
@@ -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
-@@ -731,10 +731,6 @@
+@@ -735,10 +735,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();
-@@ -2647,7 +2643,6 @@
+@@ -2650,7 +2646,6 @@
/**
* Called to shut down the system.
*/
@@ -160,7 +160,7 @@ Subject: remove-findbugs
public void cleanUp() {
for (ItemListener l : ItemListener.all())
l.onBeforeShutdown();
-@@ -3089,7 +3084,6 @@
+@@ -3094,7 +3089,6 @@
/**
* For debugging. Expose URL to perform GC.
*/
@@ -214,31 +214,3 @@ Subject: remove-findbugs
public void testSuiteStdioTrimmingSurefire() throws Exception {
File data = File.createTempFile("TEST-", ".xml");
try {
---- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
-+++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
-@@ -23,7 +23,6 @@
- */
- package hudson.maven;
-
--import edu.umd.cs.findbugs.annotations.SuppressWarnings;
- 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 mer) throws MavenEmbedderException, IOException {
-
-
---- 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 @@
- return true;
- }
-
-- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="It's okay to write to static fields here, as each Maven build is started in its own VM")
- private void markBuildAsSuccess(Throwable mojoError, MavenBuildInformation buildInfo) {
- if(mojoError == null // in the success case we don't get any exception in Maven 3.0.2+; Maven < 3.0.2 returns no exception anyway
- || mojoError instanceof MojoFailureException) {
diff --git a/debian/patches/build/0015-use-stock-asm3.patch b/debian/patches/build/0015-use-stock-asm3.patch
index a442ea1..972851b 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
-@@ -589,6 +589,13 @@
+@@ -561,6 +561,13 @@
</dependency>
<dependency>
diff --git a/debian/patches/build/0018-fileupload-compat.patch b/debian/patches/build/0018-fileupload-compat.patch
index 58150c6..03f1442 100644
--- a/debian/patches/build/0018-fileupload-compat.patch
+++ b/debian/patches/build/0018-fileupload-compat.patch
@@ -6,11 +6,9 @@ Subject: fileupload-compat
core/src/main/java/hudson/model/FileParameterValue.java | 8 ++++++++
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 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;
+@@ -40,6 +40,7 @@
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItem;
@@ -18,7 +16,7 @@ index 2251ea5..afcfcaf 100644
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-@@ -284,5 +285,12 @@ public class FileParameterValue extends ParameterValue {
+@@ -292,5 +293,12 @@
public OutputStream getOutputStream() throws IOException {
return new FileOutputStream(file);
}
diff --git a/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch b/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
index c67613d..90cc945 100644
--- a/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
+++ b/debian/patches/dependency-upgrades/0012-jnr-posix-upgrade.patch
@@ -10,8 +10,8 @@ Subject: jnr-posix-upgrade
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -123,6 +123,11 @@
- <version>3.0.0</version>
+@@ -105,6 +105,11 @@
+ <version>3.0.1</version>
</dependency>
<dependency>
+ <groupId>org.jruby.extras</groupId>
@@ -161,7 +161,7 @@ Subject: jnr-posix-upgrade
/**
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
-@@ -41,8 +41,8 @@
+@@ -40,8 +40,8 @@
import org.apache.tools.ant.taskdefs.Chmod;
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.types.FileSet;
@@ -170,5 +170,5 @@ Subject: jnr-posix-upgrade
+import org.jruby.ext.posix.FileStat;
+import org.jruby.ext.posix.POSIX;
import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
- import org.kohsuke.stapler.Stapler;
+ import javax.crypto.SecretKey;
diff --git a/debian/patches/native-integration/0008-windows-service-disable.patch b/debian/patches/native-integration/0008-windows-service-disable.patch
index 85a5e0a..088fcfd 100644
--- a/debian/patches/native-integration/0008-windows-service-disable.patch
+++ b/debian/patches/native-integration/0008-windows-service-disable.patch
@@ -8,11 +8,10 @@ Subject: windows-service-disable
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -763,32 +763,6 @@
- </execution>
+@@ -736,32 +736,6 @@
</executions>
</plugin>
-- <plugin>
+ <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
@@ -27,7 +26,7 @@ Subject: windows-service-disable
- <artifactItem>
- <groupId>com.sun.winsw</groupId>
- <artifactId>winsw</artifactId>
-- <version>1.10</version>
+- <version>1.13</version>
- <classifier>bin</classifier>
- <type>exe</type>
- <outputDirectory>${project.build.outputDirectory}/windows-service</outputDirectory>
@@ -38,6 +37,7 @@ Subject: windows-service-disable
- </execution>
- </executions>
- </plugin>
- <plugin><!-- set main class -->
- <artifactId>maven-jar-plugin</artifactId>
- <!-- version specified in grandparent pom -->
+- <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>0.5C</forkCount>
diff --git a/debian/patches/native-integration/0009-filter-native-integrations.patch b/debian/patches/native-integration/0009-filter-native-integrations.patch
index e26c029..8485ff1 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
-@@ -706,6 +706,17 @@
+@@ -678,6 +678,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/0011-purge-winp.patch b/debian/patches/native-integration/0011-purge-winp.patch
index 361ab86..6202f1b 100644
--- a/debian/patches/native-integration/0011-purge-winp.patch
+++ b/debian/patches/native-integration/0011-purge-winp.patch
@@ -6,11 +6,9 @@ Subject: purge-winp
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 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;
+@@ -37,8 +37,6 @@
import hudson.util.ProcessTreeRemoting.IOSProcess;
import hudson.util.ProcessTreeRemoting.IProcessTree;
import org.apache.commons.io.FileUtils;
@@ -19,7 +17,7 @@ index 392e73c..da06757 100644
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
-@@ -331,9 +329,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
+@@ -332,9 +330,6 @@
return DEFAULT;
try {
@@ -29,11 +27,10 @@ index 392e73c..da06757 100644
String os = Util.fixNull(System.getProperty("os.name"));
if(os.equals("Linux"))
return new Linux();
-@@ -390,82 +385,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
- }
+@@ -392,92 +387,6 @@
};
--
+
- private static final class Windows extends Local {
- Windows() {
- for (final WinProcess p : WinProcess.all()) {
@@ -48,9 +45,10 @@ index 392e73c..da06757 100644
- return null;
- }
-
-- public void killRecursively() {
+- public void killRecursively() throws InterruptedException {
- LOGGER.finer("Killing recursively "+getPid());
- p.killRecursively();
+- killByKiller();
- }
-
- public void kill() throws InterruptedException {
@@ -67,7 +65,17 @@ index 392e73c..da06757 100644
-
- @Override
- public synchronized EnvVars getEnvironmentVariables() {
-- if(env==null) env = new EnvVars(p.getEnvironmentVariables());
+- if(env !=null)
+- return env;
+- env = new EnvVars();
+-
+- try
+- {
+- env.putAll(p.getEnvironmentVariables());
+- } catch (WinpException e)
+- {
+- LOGGER.log(FINE, "Failed to get environment variable ", e);
+- }
- return env;
- }
- });
diff --git a/debian/patches/series b/debian/patches/series
index 22f2901..0baf16e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ build/0019-io-compat.pach.patch
0021-Compatibility-patch-for-guava-0.14.patch
0022-Exclude-asm-dependencies-from-jnr-posix.patch
0023-ignore-bytecode-compatibility-transformer.patch
+0024-args4j-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