Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merged dependabot changes #2622

Open
wants to merge 1 commit into
base: integration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,28 @@
<version.arquillian>1.4.1.Final</version.arquillian>
<version.arquillian-weld-ee-embedded>1.0.0.Final</version.arquillian-weld-ee-embedded>
<version.assertj>3.20.2</version.assertj>
<version.avro>1.11.3</version.avro>
<version.avro>1.11.4</version.avro>
<version.caffeine>3.1.0</version.caffeine>
<version.commons-beanutils>1.9.4</version.commons-beanutils>
<version.commons-cli>1.4</version.commons-cli>
<version.commons-codec>1.12</version.commons-codec>
<version.commons-collections>3.2.2</version.commons-collections>
<version.commons-collections4>4.3</version.commons-collections4>
<version.commons-configuration>1.10</version.commons-configuration>
<version.commons-configuration2>2.8.0</version.commons-configuration2>
<version.commons-configuration2>2.10.1</version.commons-configuration2>
<version.commons-io>2.6</version.commons-io>
<version.commons-jexl3>3.3</version.commons-jexl3>
<version.commons-lang>2.6</version.commons-lang>
<version.commons-logging>1.2</version.commons-logging>
<version.commons-net>3.9.0</version.commons-net>
<version.commons-pool>1.6</version.commons-pool>
<version.commons-text>1.11.0</version.commons-text>
<version.curator>5.2.0</version.curator>
<version.curator.test>5.2.0</version.curator.test>
<version.deltaspike>1.9.0</version.deltaspike>
<version.easymock>5.2.0</version.easymock>
<version.eclipse.emf>2.15.0</version.eclipse.emf>
<version.geoserver>2.22.5</version.geoserver>
<version.geoserver>2.23.6</version.geoserver>
<version.geotools>28.1</version.geotools>
<version.geowave>1.2.0</version.geowave>
<version.google-guava>31.1-jre</version.google-guava>
Expand Down Expand Up @@ -136,7 +137,7 @@
<version.woodstox-core>5.4.0</version.woodstox-core>
<version.woodstox-stax2>3.1.4</version.woodstox-stax2>
<version.xerces>2.12.2</version.xerces>
<version.zookeeper>3.8.3</version.zookeeper>
<version.zookeeper>3.8.4</version.zookeeper>
<!-- Unless a version is duplicated multiple times, just place the version on the dependency in dependencyManagement. -->
</properties>
<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -589,13 +589,13 @@ protected void createContentRecord(RawRecordContainer event, ContextWriter<KEYOU
this.ingestHelper.getDeleteMode());

ByteArrayOutputStream baos = null;
Base64.OutputStream b64os = null;
Base64OutputStream b64os = null;
GZIPOutputStream gzos = null;
Value value = null;
try {
baos = new ByteArrayOutputStream(Math.max(rawValue.length / 2, 1024));
if (useBase64Encoding) {
b64os = new Base64.OutputStream(baos, Base64.ENCODE);
b64os = new Base64OutputStream(baos, true);
}
gzos = new GZIPOutputStream(useBase64Encoding ? b64os : baos);

Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-csv/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
<version>${version.commons-net}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave</groupId>
Expand Down
2 changes: 1 addition & 1 deletion web-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<version.asm>4.0</version.asm>
<version.axiom>1.2.14</version.axiom>
<version.bcprov>1.46</version.bcprov>
<version.commons-compress>1.21</version.commons-compress>
<version.commons-compress>1.26.0</version.commons-compress>
<version.commons-dbutils>1.7</version.commons-dbutils>
<version.commons-digester>3.2</version.commons-digester>
<version.commons-net>3.9.0</version.commons-net>
Expand Down
4 changes: 4 additions & 0 deletions web-services/security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-commons</artifactId>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
Expand Down
Loading