From f3419f0fae64813ab6a2fa8d30cab98afcdd1072 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 31 Jul 2017 17:51:09 -0400 Subject: [PATCH] [JENKINS-41631] Lower Guava dep to 11, which is what Jenkins still uses. --- core/pom.xml | 2 +- core/src/main/java/org/kohsuke/stapler/export/Range.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 3d2a4d286a..3453fb7dff 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -80,7 +80,7 @@ com.google.guava guava - 14.0 + 11.0.1 org.kohsuke diff --git a/core/src/main/java/org/kohsuke/stapler/export/Range.java b/core/src/main/java/org/kohsuke/stapler/export/Range.java index ca5f6a294a..056a35a04a 100644 --- 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 Iterable apply(final Iterable s) { public Iterator iterator() { Iterator 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; } };