This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new ee88055 Fix #550 Update formatter/impsort plugins
ee88055 is described below
commit ee88055f8fc3674f045ae648a24443f1ca535723
Author: Christopher Tubbs <[email protected]>
AuthorDate: Thu Jul 5 17:06:32 2018 -0400
Fix #550 Update formatter/impsort plugins
* Configure impsort to automatically remove unused imports
---
.../org/apache/accumulo/core/util/AddressUtil.java | 2 --
.../org/apache/accumulo/core/util/ServerServices.java | 2 --
pom.xml | 18 +++---------------
.../accumulo/server/rpc/CustomNonBlockingServer.java | 1 -
4 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
b/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
index 024ec16..ab79f09 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
@@ -16,8 +16,6 @@
*/
package org.apache.accumulo.core.util;
-import org.apache.accumulo.core.util.HostAndPort;
-
public class AddressUtil extends org.apache.accumulo.fate.util.AddressUtil {
static public HostAndPort parseAddress(String address, boolean
ignoreMissingPort)
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
index 19cdbbf..16277dc 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
@@ -18,8 +18,6 @@ package org.apache.accumulo.core.util;
import java.util.EnumMap;
-import org.apache.accumulo.core.util.HostAndPort;
-
public class ServerServices implements Comparable<ServerServices> {
public static enum Service {
TSERV_CLIENT, GC_CLIENT;
diff --git a/pom.xml b/pom.xml
index e175327..cddbc98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -826,7 +826,7 @@
<!-- this plugin requires java 1.8 and should only be used in a jdk8
profile -->
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.7.3</version>
+ <version>2.7.4</version>
<configuration>
<configFile>${eclipseFormatterStyle}</configFile>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
@@ -849,8 +849,9 @@
<!-- this plugin requires java 1.8 and should only be used in a jdk8
profile -->
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.2.0</version>
<configuration>
+ <removeUnused>true</removeUnused>
<groups>java.,javax.,org.,com.</groups>
<excludes>
<exclude>**/thrift/*.java</exclude>
@@ -1147,19 +1148,6 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>net.revelc.code</groupId>
- <artifactId>impsort-maven-plugin</artifactId>
- <versionRange>[0,)</versionRange>
- <goals>
- <goal>sort</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<versionRange>[0,)</versionRange>
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/rpc/CustomNonBlockingServer.java
b/server/base/src/main/java/org/apache/accumulo/server/rpc/CustomNonBlockingServer.java
index cf896cb..4abb53a 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/rpc/CustomNonBlockingServer.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/rpc/CustomNonBlockingServer.java
@@ -21,7 +21,6 @@ import java.lang.reflect.Field;
import java.net.Socket;
import java.nio.channels.SelectionKey;
-import org.apache.accumulo.server.rpc.TServerUtils;
import org.apache.thrift.server.THsHaServer;
import org.apache.thrift.server.TNonblockingServer;
import org.apache.thrift.transport.TNonblockingServerTransport;
