Merge pull request #123 from jglick/requireUpperBoundDeps-JENKINS-41631

[JENKINS-41631] Lower Guava dep to 11, which is what Jenkins still uses
jenkinsci · Aug 3, 2017 · 75268e8 · 75268e8
2 parents 2c35c62 + f3419f0
commit 75268e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>14.0</version>
+      <version>11.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.kohsuke</groupId>

diff --git a/core/src/main/java/org/kohsuke/stapler/export/Range.java b/core/src/main/java/org/kohsuke/stapler/export/Range.java
@@ -43,8 +43,11 @@ public <T> Iterable<T> apply(final Iterable<T> s) {
                 public Iterator<T> iterator() {
                     Iterator<T> itr = s.iterator();
                     itr = Iterators.limit(itr,max);
-                    if (min>0)
-                        Iterators.advance(itr,min);
+                    if (min > 0) {
+                        for (int i = 0; i < min && itr.hasNext(); i++) {
+                            itr.next();
+                        }
+                    }
                     return itr;
                 }
             };