[jenkins] 01/01: Fixed a compilation error related to stapler

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins.

commit ba3c474457ec700bcb014fa036c1607c1a20e097
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 2 12:03:23 2014 +0200

    Fixed a compilation error related to stapler
---
 debian/changelog                                      |  2 ++
 debian/patches/build/0023-stapler-compatibility.patch | 16 ++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3c95da7..8fc68f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ jenkins (1.509.2+dfsg-3) UNRELEASED; urgency=medium
   * Team upload.
   * 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)
   * debian/watch: Fixed to match only the LTS releases (Closes: #731204)
   * Switch to debhelper level 9
   * debian/control:
diff --git a/debian/patches/build/0023-stapler-compatibility.patch b/debian/patches/build/0023-stapler-compatibility.patch
new file mode 100644
index 0000000..5baceaa
--- /dev/null
+++ b/debian/patches/build/0023-stapler-compatibility.patch
@@ -0,0 +1,16 @@
+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/series b/debian/patches/series
index 2c5e474..6c9ddf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ 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