[jenkins] 01/01: New upstream release (1.565.1) Refreshed the patches Depend on libjenkins-remoting-java >= 2.43 Depend on libstapler-java >= 1.224 Depend on libstapler-adjunct-codemirror-java >= 1.3 Depend on jenkins-test-annotations >= 1.1
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Sep 7 12:57:29 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 74a65790f545ebf54efff7c1d830fd26817956e6
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Sep 7 14:56:42 2014 +0200
New upstream release (1.565.1)
Refreshed the patches
Depend on libjenkins-remoting-java >= 2.43
Depend on libstapler-java >= 1.224
Depend on libstapler-adjunct-codemirror-java >= 1.3
Depend on jenkins-test-annotations >= 1.1
---
debian/changelog | 8 +++++---
debian/control | 10 ++++-----
debian/maven.rules | 3 ++-
...ignore-bytecode-compatibility-transformer.patch | 18 ++++++++--------
debian/patches/0025-specify-plugins-versions.patch | 2 +-
debian/patches/build/0001-build.patch | 2 +-
debian/patches/build/0002-openjdk6.patch | 2 +-
debian/patches/build/0004-disable-plugins.patch | 12 ++++++++---
.../build/0005-apt-stapler-processing.patch | 2 +-
.../build/0006-jenkins-version-number.patch | 3 ---
debian/patches/build/0007-remove-findbugs.patch | 24 +++++++++++++++-------
debian/patches/build/0015-use-stock-asm3.patch | 10 ++++-----
debian/patches/build/0018-fileupload-compat.patch | 2 +-
.../0008-windows-service-disable.patch | 4 ++--
.../0009-filter-native-integrations.patch | 2 +-
.../0010-purge-embedded-su4j.patch | 6 ++----
.../native-integration/0011-purge-winp.patch | 14 ++++++-------
17 files changed, 69 insertions(+), 55 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e5f1f9..003b11f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jenkins (1.554.3-1) UNRELEASED; urgency=medium
+jenkins (1.565.1-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
@@ -8,9 +8,11 @@ jenkins (1.554.3-1) UNRELEASED; urgency=medium
- 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 libjenkins-remoting-java >= 2.43
- Depend on libannotation-indexer-java >= 1.7
- - Depend on libstapler-java >= 1.223
+ - Depend on libstapler-java >= 1.224
+ - Depend on libstapler-adjunct-codemirror-java >= 1.3
+ - Depend on jenkins-test-annotations >= 1.1
* 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 b97361c..1aa36b0 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends-Indep:
jenkins-memory-monitor,
jenkins-ssh-cli-auth,
jenkins-task-reactor,
- jenkins-test-annotations,
+ jenkins-test-annotations (>= 1.1),
junit (>= 3.8.2),
junit4,
libaccess-modifier-checker-java,
@@ -55,7 +55,7 @@ Build-Depends-Indep:
libjenkins-htmlunit-java,
libjenkins-json-java (>= 2.4-jenkins-1),
libjenkins-plugin-parent-java,
- libjenkins-remoting-java (>= 2.32),
+ libjenkins-remoting-java (>= 2.43),
libjenkins-trilead-ssh2-java (>= 214-jenkins-1),
libjenkins-winstone-java (>= 0.9.10-jenkins-44),
libjenkins-xstream-java (>= 1.4.4-jenkins-3),
@@ -93,9 +93,9 @@ Build-Depends-Indep:
libspring-core-java,
libspring-ldap-java,
libspring-web-java,
- libstapler-adjunct-codemirror-java (>= 1.2),
+ libstapler-adjunct-codemirror-java (>= 1.3),
libstapler-adjunct-timeline-java (>= 1.4),
- libstapler-java (>= 1.223),
+ libstapler-java (>= 1.224),
libtrilead-putty-extension-java (>= 1.2),
libtxw2-java,
libxpp3-java,
@@ -166,7 +166,7 @@ Description: Jenkins Plugin Parent Maven POM
Package: jenkins-common
Architecture: all
Depends:
- libjenkins-remoting-java (>= 2.32),
+ libjenkins-remoting-java (>= 2.43),
libjffi-java,
libjna-java,
libjnr-posix-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 5fd13b7..0f25027 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.554.3/ * *
+org.jenkins-ci.main * * s/1\..*/1.565.1/ * *
# Handle plugin package
org.kohsuke access-modifier-annotation jar s/.*/1.4/ * *
org.kohsuke access-modifier-checker * s/.*/1.4/ * *
@@ -73,3 +73,4 @@ 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/ * *
+s/org.jvnet.hudson/org.jenkins-ci/ test-annotations * s/.*/debian/ * *
diff --git a/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch b/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
index c294649..7d02951 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
-@@ -127,7 +127,6 @@
+@@ -118,7 +118,6 @@
+ import jenkins.util.TimeDuration;
+ import net.sf.json.JSONObject;
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;
-@@ -248,8 +247,7 @@
+ import org.kohsuke.args4j.Argument;
+@@ -237,8 +236,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");
-@@ -351,7 +349,7 @@
+@@ -338,7 +336,7 @@
if (triggers == null) {
triggersUpdater.compareAndSet(this,null,new DescribableList<Trigger<?>,TriggerDescriptor>(this));
}
@@ -30,7 +30,7 @@ Forwarded: not-needed
}
@Override
-@@ -2020,7 +2018,7 @@
+@@ -1832,7 +1830,7 @@
for (Trigger t : triggers())
t.stop();
@@ -38,7 +38,7 @@ Forwarded: not-needed
+ ((DescribableList<Trigger<?>,TriggerDescriptor>) triggers).replaceBy(buildDescribable(req, Trigger.for_(this)));
for (Trigger t : triggers())
t.start(this,true);
-
+ }
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -58,7 +58,6 @@
@@ -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
-@@ -690,8 +690,6 @@
+@@ -750,8 +750,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
index 7149e7c..7c82028 100644
--- a/debian/patches/0025-specify-plugins-versions.patch
+++ b/debian/patches/0025-specify-plugins-versions.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
<dependency>
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -690,7 +690,7 @@
+@@ -700,7 +700,7 @@
<plugin>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
diff --git a/debian/patches/build/0001-build.patch b/debian/patches/build/0001-build.patch
index caa2daf..d4128d2 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
-@@ -312,6 +312,16 @@
+@@ -322,6 +322,16 @@
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
<version>1.0</version>
diff --git a/debian/patches/build/0002-openjdk6.patch b/debian/patches/build/0002-openjdk6.patch
index 7176760..91567f8 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
-@@ -1365,6 +1365,15 @@
+@@ -1317,6 +1317,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 62ce777..861a733 100644
--- a/debian/patches/build/0004-disable-plugins.patch
+++ b/debian/patches/build/0004-disable-plugins.patch
@@ -20,7 +20,7 @@ Subject: disable-plugins
</dependencies>
<build>
-@@ -265,102 +270,6 @@
+@@ -265,108 +270,6 @@
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<destFileName>winstone.jar</destFileName>
</artifactItem>
@@ -99,7 +99,7 @@ Subject: disable-plugins
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>mailer</artifactId>
-- <version>1.6</version>
+- <version>1.8</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
@@ -117,7 +117,13 @@ Subject: disable-plugins
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>antisamy-markup-formatter</artifactId>
-- <version>1.0</version>
+- <version>1.1</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>matrix-project</artifactId>
+- <version>1.2</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 6d27f26..771d29b 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
-@@ -648,6 +648,24 @@
+@@ -658,6 +658,24 @@
</executions>
</plugin>
<plugin>
diff --git a/debian/patches/build/0006-jenkins-version-number.patch b/debian/patches/build/0006-jenkins-version-number.patch
index 21856c6..79f4826 100644
--- a/debian/patches/build/0006-jenkins-version-number.patch
+++ b/debian/patches/build/0006-jenkins-version-number.patch
@@ -7,9 +7,6 @@ Subject: jenkins-version-number
1 file changed, 486 insertions(+)
create mode 100644 core/src/main/java/hudson/util/VersionNumber.java
-diff --git a/core/src/main/java/hudson/util/VersionNumber.java b/core/src/main/java/hudson/util/VersionNumber.java
-new file mode 100644
-index 0000000..afa8688
--- /dev/null
+++ b/core/src/main/java/hudson/util/VersionNumber.java
@@ -0,0 +1,486 @@
diff --git a/debian/patches/build/0007-remove-findbugs.patch b/debian/patches/build/0007-remove-findbugs.patch
index 445758a..fe57c0c 100644
--- a/debian/patches/build/0007-remove-findbugs.patch
+++ b/debian/patches/build/0007-remove-findbugs.patch
@@ -101,9 +101,9 @@ Subject: remove-findbugs
import javax.annotation.CheckForNull;
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
import hudson.model.Items;
+ import jenkins.model.ParameterizedJobMixIn;
- /**
-@@ -278,7 +277,6 @@
+@@ -289,7 +288,6 @@
*
* @deprecated Use {@link jenkins.util.Timer#get()} instead.
*/
@@ -131,7 +131,7 @@ Subject: remove-findbugs
import hudson.PluginManager;
import hudson.PluginWrapper;
import hudson.diagnosis.OldDataMonitor;
-@@ -412,7 +411,6 @@
+@@ -413,7 +412,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
-@@ -738,10 +738,6 @@
+@@ -743,10 +743,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();
-@@ -2677,7 +2673,6 @@
+@@ -2680,7 +2676,6 @@
/**
* Called to shut down the system.
*/
@@ -160,14 +160,14 @@ Subject: remove-findbugs
public void cleanUp() {
for (ItemListener l : ItemListener.all())
l.onBeforeShutdown();
-@@ -3161,7 +3156,6 @@
+@@ -3171,7 +3166,6 @@
/**
* For debugging. Expose URL to perform GC.
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings("DM_GC")
+ @RequirePOST
public void doGc(StaplerResponse rsp) throws IOException {
checkPermission(Jenkins.ADMINISTER);
- System.gc();
--- a/core/src/main/java/jenkins/util/ProgressiveRendering.java
+++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java
@@ -24,7 +24,6 @@
@@ -222,3 +222,13 @@ Subject: remove-findbugs
public void testSuiteStdioTrimmingSurefire() throws Exception {
File data = File.createTempFile("TEST-", ".xml");
try {
+--- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
++++ b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
+@@ -168,7 +168,6 @@
+ * Suitable for {@link SubTask#createExecutable}.
+ */
+ @SuppressWarnings("SleepWhileHoldingLock")
+- @edu.umd.cs.findbugs.annotations.SuppressWarnings("SWL_SLEEP_WITH_LOCK_HELD")
+ public final synchronized RunT newBuild() throws IOException {
+ // make sure we don't start two builds in the same second
+ // so the build directories will be different too
diff --git a/debian/patches/build/0015-use-stock-asm3.patch b/debian/patches/build/0015-use-stock-asm3.patch
index 9eaab65..12fc372 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
-@@ -556,6 +556,13 @@
+@@ -566,6 +566,13 @@
</dependency>
<dependency>
@@ -29,16 +29,16 @@ Subject: use-stock-asm3
import hudson.PluginManager.UberClassLoader;
import jenkins.model.Jenkins;
--import org.kohsuke.asm3.ClassWriter;
--import org.kohsuke.asm3.MethodVisitor;
--import org.kohsuke.asm3.Type;
+-import org.kohsuke.asm5.ClassWriter;
+-import org.kohsuke.asm5.MethodVisitor;
+-import org.kohsuke.asm5.Type;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Type;
import java.lang.reflect.Constructor;
--import static org.kohsuke.asm3.Opcodes.*;
+-import static org.kohsuke.asm5.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
/**
diff --git a/debian/patches/build/0018-fileupload-compat.patch b/debian/patches/build/0018-fileupload-compat.patch
index 03f1442..6d7f52e 100644
--- a/debian/patches/build/0018-fileupload-compat.patch
+++ b/debian/patches/build/0018-fileupload-compat.patch
@@ -16,7 +16,7 @@ Subject: fileupload-compat
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-@@ -292,5 +293,12 @@
+@@ -302,5 +303,12 @@
public OutputStream getOutputStream() throws IOException {
return new FileOutputStream(file);
}
diff --git a/debian/patches/native-integration/0008-windows-service-disable.patch b/debian/patches/native-integration/0008-windows-service-disable.patch
index be0fbac..2d171bb 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
-@@ -730,32 +730,6 @@
+@@ -740,32 +740,6 @@
</executions>
</plugin>
<plugin>
@@ -26,7 +26,7 @@ Subject: windows-service-disable
- <artifactItem>
- <groupId>com.sun.winsw</groupId>
- <artifactId>winsw</artifactId>
-- <version>1.13</version>
+- <version>1.16</version>
- <classifier>bin</classifier>
- <type>exe</type>
- <outputDirectory>${project.build.outputDirectory}/windows-service</outputDirectory>
diff --git a/debian/patches/native-integration/0009-filter-native-integrations.patch b/debian/patches/native-integration/0009-filter-native-integrations.patch
index 616a52e..a794e16 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
-@@ -672,6 +672,17 @@
+@@ -682,6 +682,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/0010-purge-embedded-su4j.patch b/debian/patches/native-integration/0010-purge-embedded-su4j.patch
index ace40e2..d1071cc 100644
--- a/debian/patches/native-integration/0010-purge-embedded-su4j.patch
+++ b/debian/patches/native-integration/0010-purge-embedded-su4j.patch
@@ -6,8 +6,6 @@ Subject: purge-embedded-su4j
core/src/main/java/hudson/os/SU.java | 16 ----------------
1 file changed, 16 deletions(-)
-diff --git a/core/src/main/java/hudson/os/SU.java b/core/src/main/java/hudson/os/SU.java
-index b254f54..929e7eb 100644
--- a/core/src/main/java/hudson/os/SU.java
+++ b/core/src/main/java/hudson/os/SU.java
@@ -23,7 +23,6 @@
@@ -15,10 +13,10 @@ index b254f54..929e7eb 100644
package hudson.os;
-import com.sun.solaris.EmbeddedSu;
+ import hudson.FilePath;
import hudson.Launcher.LocalLauncher;
import hudson.Util;
- import hudson.model.Computer;
-@@ -94,21 +93,6 @@ public abstract class SU {
+@@ -96,21 +95,6 @@
}
}.start(listener,rootPassword);
diff --git a/debian/patches/native-integration/0011-purge-winp.patch b/debian/patches/native-integration/0011-purge-winp.patch
index 6202f1b..27bdde1 100644
--- a/debian/patches/native-integration/0011-purge-winp.patch
+++ b/debian/patches/native-integration/0011-purge-winp.patch
@@ -8,7 +8,7 @@ Subject: purge-winp
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
-@@ -37,8 +37,6 @@
+@@ -38,8 +38,6 @@
import hudson.util.ProcessTreeRemoting.IOSProcess;
import hudson.util.ProcessTreeRemoting.IProcessTree;
import org.apache.commons.io.FileUtils;
@@ -17,7 +17,7 @@ Subject: purge-winp
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
-@@ -332,9 +330,6 @@
+@@ -333,9 +331,6 @@
return DEFAULT;
try {
@@ -27,7 +27,7 @@ Subject: purge-winp
String os = Util.fixNull(System.getProperty("os.name"));
if(os.equals("Linux"))
return new Linux();
-@@ -392,92 +387,6 @@
+@@ -393,92 +388,6 @@
};
@@ -67,15 +67,15 @@ Subject: purge-winp
- public synchronized EnvVars getEnvironmentVariables() {
- if(env !=null)
- return env;
-- env = new EnvVars();
--
-- try
+- env = new EnvVars();
+-
+- try
- {
- env.putAll(p.getEnvironmentVariables());
- } catch (WinpException e)
- {
- LOGGER.log(FINE, "Failed to get environment variable ", e);
-- }
+- }
- return env;
- }
- });
--
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