[jenkins] 22/32: Add patch for compatibility with guava >= 0.14.

[James Downing Page]

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

jamespage pushed a commit to branch master
in repository jenkins.

commit a74fef9083771d0d7bf90357e95b45241652e022
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 14:53:30 2013 +0100

    Add patch for compatibility with guava >= 0.14.
---
 debian/changelog                                   |    1 +
 .../0021-Compatibility-patch-for-guava-0.14.patch  |   22 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 88ee49d..24038ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ jenkins (1.509.2+dfsg-1) UNRELEASED; urgency=low
       * libmaven-hpi-plugin-java >= 1.93.
       * libjenkins-xstream-java >= 1.4.4-jenkins-3.
     - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
+    - Add patch for compatibility with guava >= 0.14.
   * d/patches: Switch to using git patch-queue for managing patches.
 
  -- James Page <james.page at ubuntu.com>  Sun, 11 Aug 2013 10:44:19 +0100
diff --git a/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch b/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch
new file mode 100644
index 0000000..c0e61ea
--- /dev/null
+++ b/debian/patches/0021-Compatibility-patch-for-guava-0.14.patch
@@ -0,0 +1,22 @@
+From: James Page <james.page at ubuntu.com>
+Date: Mon, 12 Aug 2013 14:52:31 +0100
+Subject: Compatibility patch for guava >= 0.14
+
+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> {
+     public List<R> subList(int fromIndex, int toIndex) {
+         List<R> r = new ArrayList<R>();
+         Iterator<R> itr = iterator();
+-        Iterators.skip(itr,fromIndex);
++        Iterators.advance(itr,fromIndex);
+         for (int i=toIndex-fromIndex; i>0; i--) {
+             r.add(itr.next());
+         }
diff --git a/debian/patches/series b/debian/patches/series
index a6d1122..432ad8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ build/0017-ignore-plugin-pom.xml.patch
 build/0018-fileupload-compat.patch
 build/0019-io-compat.pach.patch
 0020-Drop-use-of-gitsite-extension.patch
+0021-Compatibility-patch-for-guava-0.14.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git