You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2021/02/19 23:56:48 UTC
[accumulo] branch main updated: Update plugin/some dependency
versions (#1941)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 97ac5c4 Update plugin/some dependency versions (#1941)
97ac5c4 is described below
commit 97ac5c488217f5c17a7e5dfcf78fa4f73ec10c2d
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Feb 19 18:56:41 2021 -0500
Update plugin/some dependency versions (#1941)
Update plugins:
* Update code for formatter changes
* Update code for new modernizer detections
Update some dependencies:
* Update checkstyle build dependency for checkstyle plugin
* Update auto-service and related configuration
* Update build/test dependencies (junit, spotbugs, bouncycastle, powermock)
* Update jackson
---
.../core/client/lexicoder/SequenceLexicoder.java | 4 +--
.../file/streams/RateLimitedOutputStreamTest.java | 4 +--
pom.xml | 42 +++++++++++-----------
.../java/org/apache/accumulo/test/rpc/Mocket.java | 6 ++--
.../test/metrics/MetricsFileTailerTest.java | 7 ++--
5 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java
index 4c2577b..0e1fd2a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java
@@ -77,8 +77,8 @@ public class SequenceLexicoder<E> extends AbstractLexicoder<List<E>> {
@Override
protected List<E> decodeUnchecked(final byte[] b, final int offset, final int len) {
final byte[][] escapedElements = split(b, offset, len);
- assert escapedElements.length
- > 0 : "ByteUtils.split always returns a minimum of 1 element, even for empty input";
+ assert escapedElements.length > 0
+ : "ByteUtils.split always returns a minimum of 1 element, even for empty input";
// There should be no bytes after the final delimiter. Lack of delimiter indicates empty list.
final byte[] lastElement = escapedElements[escapedElements.length - 1];
if (lastElement.length > 0) {
diff --git a/core/src/test/java/org/apache/accumulo/core/file/streams/RateLimitedOutputStreamTest.java b/core/src/test/java/org/apache/accumulo/core/file/streams/RateLimitedOutputStreamTest.java
index 464d6271f..e009c8b 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/streams/RateLimitedOutputStreamTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/streams/RateLimitedOutputStreamTest.java
@@ -20,13 +20,13 @@ package org.apache.accumulo.core.file.streams;
import static org.junit.Assert.assertEquals;
+import java.io.OutputStream;
import java.security.SecureRandom;
import java.util.Random;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.junit.Test;
-import com.google.common.io.ByteStreams;
import com.google.common.io.CountingOutputStream;
public class RateLimitedOutputStreamTest {
@@ -50,7 +50,7 @@ public class RateLimitedOutputStreamTest {
public static class NullOutputStream extends FSDataOutputStream {
public NullOutputStream() {
- super(new CountingOutputStream(ByteStreams.nullOutputStream()), null);
+ super(new CountingOutputStream(OutputStream.nullOutputStream()), null);
}
}
diff --git a/pom.xml b/pom.xml
index ff6513a..0eb0c5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
<!-- used for filtering the java source with the current version -->
<accumulo.release.version>${project.version}</accumulo.release.version>
<!-- bouncycastle version for test dependencies -->
- <bouncycastle.version>1.66</bouncycastle.version>
+ <bouncycastle.version>1.68</bouncycastle.version>
<!-- Curator version -->
<curator.version>4.3.0</curator.version>
<!-- relative path for Eclipse format; should override in child modules if necessary -->
@@ -142,7 +142,7 @@
<maven.compiler.target>11</maven.compiler.target>
<!-- surefire/failsafe plugin option -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- <powermock.version>2.0.7</powermock.version>
+ <powermock.version>2.0.9</powermock.version>
<!-- timestamp for reproducible outputs, updated on release by the release plugin -->
<project.build.outputTimestamp>2020-12-17T22:06:50Z</project.build.outputTimestamp>
<rat.consoleOutput>true</rat.consoleOutput>
@@ -154,7 +154,7 @@
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<surefire.forkCount>1C</surefire.forkCount>
<surefire.groups />
- <surefire.version>3.0.0-M3</surefire.version>
+ <surefire.version>3.0.0-M5</surefire.version>
<!-- Thrift version -->
<thrift.version>0.12.0</thrift.version>
<unitTestMemSize>-Xmx1G</unitTestMemSize>
@@ -181,12 +181,12 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
- <version>4.0.1</version>
+ <version>4.2.1</version>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
- <version>1.0-rc6</version>
+ <version>1.0-rc7</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -292,7 +292,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -759,7 +759,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
- <version>2.11.0</version>
+ <version>2.12.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -786,12 +786,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8.1</version>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>3.0</version>
+ <version>4.0.rc2</version>
<configuration>
<header>${session.executionRootDirectory}/contrib/license-header.txt</header>
<excludes combine.children="append">
@@ -817,7 +817,7 @@
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>1.8.0</version>
+ <version>2.1.0</version>
<configuration>
<javaVersion>${maven.compiler.target}</javaVersion>
</configuration>
@@ -825,7 +825,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.0.0</version>
+ <version>4.0.4</version>
<configuration>
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
@@ -845,7 +845,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -856,7 +856,7 @@
<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0</version>
<configuration>
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<createBackupFile>false</createBackupFile>
@@ -871,7 +871,7 @@
<plugin>
<groupId>com.github.koraktor</groupId>
<artifactId>mavanagaiata</artifactId>
- <version>0.9.4</version>
+ <version>1.0.0</version>
<configuration>
<skipNoGit>true</skipNoGit>
</configuration>
@@ -953,7 +953,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.8.2</version>
+ <version>3.9.1</version>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
@@ -987,7 +987,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1002,7 +1002,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.12.2</version>
+ <version>2.14.0</version>
<configuration>
<configFile>${eclipseFormatterStyle}</configFile>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
@@ -1045,7 +1045,7 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0</version>
<configuration>
<removeUnused>true</removeUnused>
<groups>java.,javax.,org.,com.</groups>
@@ -1074,6 +1074,8 @@
<configuration>
<failOnWarning>true</failOnWarning>
<ignoredUsedUndeclaredDependencies>
+ <!-- auto-service-annotations is transitive via auto-service -->
+ <usedUndeclaredDependency>com.google.auto.service:auto-service-annotations:jar:*</usedUndeclaredDependency>
<!-- used/undeclared child jars brought in by parents below -->
<usedUndeclaredDependency>org.apache.curator:curator-client:jar:*</usedUndeclaredDependency>
<usedUndeclaredDependency>org.apache.hadoop:hadoop-common:jar:*</usedUndeclaredDependency>
@@ -1088,7 +1090,7 @@
<usedUndeclaredDependency>org.powermock:powermock-reflect:jar:*</usedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
<ignoredUnusedDeclaredDependencies>
- <!-- auto-service isn't detected as use since the annotation has retention of source -->
+ <!-- auto-service isn't used in every module -->
<unusedDeclaredDependency>com.google.auto.service:auto-service:jar:*</unusedDeclaredDependency>
<!-- unused/declared implementation jars or parent jars that bring in children -->
<unusedDeclaredDependency>com.sun.xml.bind</unusedDeclaredDependency>
@@ -1259,7 +1261,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.30</version>
+ <version>8.40</version>
</dependency>
</dependencies>
<executions>
diff --git a/test/src/main/java/org/apache/accumulo/test/rpc/Mocket.java b/test/src/main/java/org/apache/accumulo/test/rpc/Mocket.java
index efe5f03..4a79160 100644
--- a/test/src/main/java/org/apache/accumulo/test/rpc/Mocket.java
+++ b/test/src/main/java/org/apache/accumulo/test/rpc/Mocket.java
@@ -26,8 +26,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.thrift.transport.TServerTransport;
import org.apache.thrift.transport.TTransport;
-import com.google.common.base.Preconditions;
-
/**
* Mocket - a Mock Socket
* <p>
@@ -76,7 +74,7 @@ public class Mocket {
public void write(byte[] buf, int off, int len) {
Objects.requireNonNull(buf);
- Preconditions.checkPositionIndexes(off, off + len, buf.length);
+ Objects.checkFromToIndex(off, off + len, buf.length);
if (len == 0) {
return;
}
@@ -108,7 +106,7 @@ public class Mocket {
public int read(byte[] buf, int off, int len) {
Objects.requireNonNull(buf);
- Preconditions.checkPositionIndexes(off, off + len, buf.length);
+ Objects.checkFromToIndex(off, off + len, buf.length);
if (len == 0) {
return 0;
}
diff --git a/test/src/test/java/org/apache/accumulo/test/metrics/MetricsFileTailerTest.java b/test/src/test/java/org/apache/accumulo/test/metrics/MetricsFileTailerTest.java
index c2658e9..6288738 100644
--- a/test/src/test/java/org/apache/accumulo/test/metrics/MetricsFileTailerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/metrics/MetricsFileTailerTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.accumulo.test.metrics;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertTrue;
import java.io.FileWriter;
@@ -53,7 +54,7 @@ public class MetricsFileTailerTest {
@Test
public void fileUpdates() throws InterruptedException {
- boolean passed = Boolean.FALSE;
+ boolean passed = false;
try (MetricsFileTailer tailer = new MetricsFileTailer("foo", TEST_OUTFILE_NAME)) {
tailer.startDaemonThread();
@@ -69,7 +70,7 @@ public class MetricsFileTailerTest {
lastUpdate = tailer.getLastUpdate();
log.trace("{} - {}", tailer.getLastUpdate(), tailer.getLast());
if (SUCCESS.compareTo(tailer.getLast()) == 0) {
- passed = Boolean.TRUE;
+ passed = true;
break;
}
}
@@ -84,7 +85,7 @@ public class MetricsFileTailerTest {
* Simulate write record(s) to the file.
*/
private void writeToFile() {
- try (FileWriter writer = new FileWriter(TEST_OUTFILE_NAME, true);
+ try (FileWriter writer = new FileWriter(TEST_OUTFILE_NAME, UTF_8, true);
PrintWriter printWriter = new PrintWriter(writer)) {
printWriter.println("foo");
// needs to be last line for test to pass