diff --git a/pom.xml b/pom.xml index 9d606d5cc50..8a26d36fe6f 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 1.4.1.Final 1.0.0.Final 3.20.2 - 1.11.3 + 1.11.4 3.1.0 1.9.4 1.4 @@ -50,11 +50,12 @@ 3.2.2 4.3 1.10 - 2.8.0 + 2.10.1 2.6 3.3 2.6 1.2 + 3.9.0 1.6 1.11.0 5.2.0 @@ -62,7 +63,7 @@ 1.9.0 5.2.0 2.15.0 - 2.22.5 + 2.23.6 28.1 1.2.0 31.1-jre @@ -136,7 +137,7 @@ 5.4.0 3.1.4 2.12.2 - 3.8.3 + 3.8.4 diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/tokenize/ExtendedContentIndexingColumnBasedHandler.java b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/tokenize/ExtendedContentIndexingColumnBasedHandler.java index 8141959ae98..844ff214fa3 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/tokenize/ExtendedContentIndexingColumnBasedHandler.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/tokenize/ExtendedContentIndexingColumnBasedHandler.java @@ -22,6 +22,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.ColumnVisibility; +import org.apache.commons.codec.binary.Base64OutputStream; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; @@ -32,7 +33,6 @@ import org.apache.hadoop.util.bloom.BloomFilter; import org.apache.log4j.Logger; import org.apache.lucene.analysis.CharArraySet; -import org.infinispan.commons.util.Base64; import com.google.common.collect.Multimap; @@ -589,13 +589,13 @@ protected void createContentRecord(RawRecordContainer event, ContextWriter commons-net commons-net - 3.6 + ${version.commons-net} gov.nsa.datawave diff --git a/web-services/pom.xml b/web-services/pom.xml index cc6bb48fb09..efc03836c65 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -42,7 +42,7 @@ 4.0 1.2.14 1.46 - 1.21 + 1.26.0 1.7 3.2 3.9.0 diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index 271a10b5303..db9cd32f43d 100644 --- a/web-services/security/pom.xml +++ b/web-services/security/pom.xml @@ -88,6 +88,10 @@ org.easymock easymock + + org.infinispan + infinispan-commons + org.infinispan infinispan-core