diff --git a/.gitignore b/.gitignore index c4d113884..84a3a1cff 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ target/ .classpath .project .settings/ + +dependency-reduced-pom.xml diff --git a/pom.xml b/pom.xml index 3a0f6dc3f..713319e3e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,17 +32,17 @@ 1.8 2.5 - 3.4 + 3.6 3.2 1.18-SNAPSHOT 2.3.25-incubating 0.38-SNAPSHOT 2.59 - 18.0 + 23.0 4.12 - 1.1.7 - 2.8.9 - 1.7.21 + 1.2.3 + 2.8.47 + 1.7.25 @@ -55,10 +55,31 @@ install - + + org.apache.maven.plugins + maven-shade-plugin + + + + com.google.guava:guava + + + + + com.google.common + org.gbif.dwcaio.shaded.com.google.common + + + + + + package + + shade + + + + maven-assembly-plugin diff --git a/src/main/java/org/gbif/dwca/record/RecordIterator.java b/src/main/java/org/gbif/dwca/record/RecordIterator.java index 45fb31b54..04ceaa8b4 100644 --- a/src/main/java/org/gbif/dwca/record/RecordIterator.java +++ b/src/main/java/org/gbif/dwca/record/RecordIterator.java @@ -24,6 +24,7 @@ import org.gbif.utils.file.csv.CSVReader; import java.io.IOException; +import java.util.Collections; import java.util.Iterator; import java.util.Map; @@ -58,7 +59,7 @@ public RecordIterator(ClosableIterator recordSource, ArchiveField id, this.replaceEntities = replaceEntities; closable = recordSource; if (closable == null) { - Iterator empty = Iterators.emptyIterator(); + Iterator empty = Collections.emptyIterator(); iter = Iterators.peekingIterator(empty); } else { iter = Iterators.peekingIterator(closable);