[jenkins] 02/02: Refreshed the patches Depend on libannotation-indexer-java >= 1.7
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Sep 3 15:17:59 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 9b892113683c14ee0fa1b9b0f769a463f4115845
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Sep 3 17:17:33 2014 +0200
Refreshed the patches
Depend on libannotation-indexer-java >= 1.7
---
debian/changelog | 4 +++-
debian/control | 2 +-
debian/libjenkins-java.poms | 16 ++++++++-------
...ignore-bytecode-compatibility-transformer.patch | 2 +-
debian/patches/build/0002-openjdk6.patch | 2 +-
.../build/0005-apt-stapler-processing.patch | 2 +-
debian/patches/build/0007-remove-findbugs.patch | 24 +++++++++++-----------
.../0008-windows-service-disable.patch | 2 +-
.../0009-filter-native-integrations.patch | 2 +-
9 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 72fc5b6..d3e5535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-jenkins (1.532.1-1) UNRELEASED; urgency=medium
+jenkins (1.532.2-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
+ - Fixes multiple security vulnerabilities (Closes: #732708, #739067)
- Refreshed the patches
- Ignore the dependency on bytecode-compatibility-transformer
- Added a dependency on libguice-java
- Depend on libjenkins-remoting-java >= 2.32
+ - Depend on libannotation-indexer-java >= 1.7
* 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 c2ecc66..298dcaa 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends-Indep:
libacegi-security-java,
libakuma-java (>= 1.8),
libanimal-sniffer-java,
- libannotation-indexer-java,
+ libannotation-indexer-java (>= 1.7),
libantlr-java,
libantlr-maven-plugin-java,
libaopalliance-java,
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index 9d68efa..862f53e 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -2,7 +2,9 @@
# Format of this file is:
# <path to pom file> [option]*
# where option can be:
-# --ignore: ignore this POM or
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
# --no-parent: remove the <parent> tag from the POM
# --package=<package>: an alternative package to use when installing this POM
# and its artifact
@@ -11,19 +13,19 @@
# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
# during a clean operation with mh_cleanpom or mh_installpom
# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install
+# it will be installed when using the command mh_install. [mh_install]
# --java-lib: install the jar into /usr/share/java to comply with Debian
# packaging guidelines
# --usj-name=<name>: name to use when installing the library in /usr/share/java
# --usj-version=<version>: version to use when installing the library in /usr/share/java
# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar
-# it will be installed with mh_install.
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-# temporarily for certain artifacts such as Javadoc jars.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
#
-pom.xml --has-package-version --no-parent
+pom.xml --no-parent --has-package-version
core/pom.xml --has-package-version --java-lib
war/pom.xml --has-package-version
cli/pom.xml --has-package-version
diff --git a/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch b/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
index 4f941e6..4e5dd45 100644
--- a/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
+++ b/debian/patches/0023-ignore-bytecode-compatibility-transformer.patch
@@ -30,7 +30,7 @@ Forwarded: not-needed
}
@Override
-@@ -2003,7 +2001,7 @@
+@@ -2010,7 +2008,7 @@
for (Trigger t : triggers())
t.stop();
diff --git a/debian/patches/build/0002-openjdk6.patch b/debian/patches/build/0002-openjdk6.patch
index 423bf16..c0f0471 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
-@@ -1341,6 +1341,15 @@
+@@ -1345,6 +1345,15 @@
}
private static final Logger LOGGER = Logger.getLogger(AbstractBuild.class.getName());
diff --git a/debian/patches/build/0005-apt-stapler-processing.patch b/debian/patches/build/0005-apt-stapler-processing.patch
index 352c816..3c6096c 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
-@@ -654,6 +654,24 @@
+@@ -660,6 +660,24 @@
</executions>
</plugin>
<plugin>
diff --git a/debian/patches/build/0007-remove-findbugs.patch b/debian/patches/build/0007-remove-findbugs.patch
index 450c70b..9df4f2c 100644
--- a/debian/patches/build/0007-remove-findbugs.patch
+++ b/debian/patches/build/0007-remove-findbugs.patch
@@ -67,7 +67,7 @@ Subject: remove-findbugs
Logger.getLogger("").addHandler(handler);
--- a/core/src/main/java/hudson/cli/GroovyshCommand.java
+++ b/core/src/main/java/hudson/cli/GroovyshCommand.java
-@@ -87,7 +87,6 @@
+@@ -88,7 +88,6 @@
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
@@ -75,7 +75,7 @@ Subject: remove-findbugs
public Object doCall(Object[] args) {
assert(args.length == 1);
assert(args[0] instanceof Shell);
-@@ -110,7 +109,6 @@
+@@ -111,7 +110,6 @@
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
@@ -95,7 +95,7 @@ Subject: remove-findbugs
Level lv;
--- a/core/src/main/java/hudson/triggers/Trigger.java
+++ b/core/src/main/java/hudson/triggers/Trigger.java
-@@ -63,7 +63,6 @@
+@@ -57,7 +57,6 @@
import antlr.ANTLRException;
import javax.annotation.CheckForNull;
@@ -103,14 +103,14 @@ Subject: remove-findbugs
/**
* Triggers a {@link Build}.
-@@ -280,7 +279,6 @@
+@@ -276,7 +275,6 @@
*
- * If plugins want to run periodic jobs, they should implement {@link PeriodicWork}.
+ * @deprecated Use {@link jenkins.util.Timer#get()} instead.
*/
- @SuppressWarnings("MS_SHOULD_BE_FINAL")
- public static @CheckForNull Timer timer;
+ @Deprecated
+ public static @CheckForNull java.util.Timer timer;
- @Initializer(after=JOB_LOADED)
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
@@ -59,7 +59,6 @@
@@ -123,7 +123,7 @@ Subject: remove-findbugs
synchronized (LIST) {
--- a/core/src/main/java/hudson/util/XStream2.java
+++ b/core/src/main/java/hudson/util/XStream2.java
-@@ -41,7 +41,6 @@
+@@ -43,7 +43,6 @@
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.mapper.CannotResolveClassException;
@@ -131,7 +131,7 @@ Subject: remove-findbugs
import hudson.PluginManager;
import hudson.PluginWrapper;
import hudson.diagnosis.OldDataMonitor;
-@@ -389,7 +388,6 @@
+@@ -412,7 +411,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
-@@ -735,10 +735,6 @@
+@@ -741,10 +741,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();
-@@ -2650,7 +2646,6 @@
+@@ -2661,7 +2657,6 @@
/**
* Called to shut down the system.
*/
@@ -160,7 +160,7 @@ Subject: remove-findbugs
public void cleanUp() {
for (ItemListener l : ItemListener.all())
l.onBeforeShutdown();
-@@ -3094,7 +3089,6 @@
+@@ -3109,7 +3104,6 @@
/**
* For debugging. Expose URL to perform GC.
*/
diff --git a/debian/patches/native-integration/0008-windows-service-disable.patch b/debian/patches/native-integration/0008-windows-service-disable.patch
index 088fcfd..a1a4f9a 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
-@@ -736,32 +736,6 @@
+@@ -742,32 +742,6 @@
</executions>
</plugin>
<plugin>
diff --git a/debian/patches/native-integration/0009-filter-native-integrations.patch b/debian/patches/native-integration/0009-filter-native-integrations.patch
index 8485ff1..1fdb9bf 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
-@@ -678,6 +678,17 @@
+@@ -684,6 +684,17 @@
<configuration>
<fork>${staplerFork}</fork><!-- the source code is big enough now that otherwise it fails with OutOfMemoryError -->
<maxmem>128m</maxmem>
--
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