Update travis and build tooling
diff --git a/.travis.yml b/.travis.yml
index 49a24fa..75af0ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,10 +22,10 @@
- $HOME/.m2
install: echo NOOP Skipping pre-fetch of Maven dependencies
jdk:
- - openjdk8
+ - openjdk11
before_script:
- unset _JAVA_OPTIONS
env:
- - BUILD_ARGS="clean verify javadoc:jar" # main build of unit tests and javadoc
+ - BUILD_CMD="mvn clean verify javadoc:jar" # main build of unit tests and javadoc
script:
- - mvn $BUILD_ARGS
+ - $BUILD_CMD -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
diff --git a/pom.xml b/pom.xml
index 0e52270..bc9c8e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,18 +85,19 @@
<url>https://travis-ci.org/apache/accumulo-proxy</url>
</ciManagement>
<properties>
- <accumulo.version>2.0.0-SNAPSHOT</accumulo.version>
+ <accumulo.version>2.0.0</accumulo.version>
<eclipseFormatterStyle>contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
<!-- extra release args for testing -->
<extraReleaseArguments />
<hadoop.version>3.1.1</hadoop.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
+ <maven.compiler.release>8</maven.compiler.release>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<slf4j.version>1.7.26</slf4j.version>
<sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
<spotbugs.excludeFilterFile>src/main/spotbugs/exclude-filter.xml</spotbugs.excludeFilterFile>
- <spotbugs.version>3.1.7</spotbugs.version>
+ <spotbugs.version>3.1.12</spotbugs.version>
<thrift.version>0.12.0</thrift.version>
</properties>
<dependencies>
@@ -214,12 +215,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.8.0</version>
<configuration>
<javaVersion>${maven.compiler.target}</javaVersion>
</configuration>
@@ -227,7 +228,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>${spotbugs.version}</version>
+ <version>${spotbugs.version}.1</version>
<configuration>
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
@@ -246,12 +247,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
- <version>2.8.0</version>
+ <version>2.10.0</version>
<configuration>
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<createBackupFile>false</createBackupFile>
@@ -266,7 +267,7 @@
<plugin>
<groupId>com.github.koraktor</groupId>
<artifactId>mavanagaiata</artifactId>
- <version>0.8.2</version>
+ <version>0.9.4</version>
<configuration>
<skipNoGit>true</skipNoGit>
</configuration>
@@ -289,6 +290,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
<optimize>true</optimize>
<showDeprecation>true</showDeprecation>
@@ -304,6 +306,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.2</version>
<configuration>
<archive>
<manifestEntries>
@@ -340,13 +343,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>${surefire.excludedGroups}</excludedGroups>
@@ -380,30 +376,6 @@
<version>1.5.0</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[${maven.compiler.target},)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-enforcer-rule</artifactId>
- <version>1.17</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <!-- Allows us to get the apache-ds bundle artifacts -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.0</version>
- </plugin>
- <plugin>
<groupId>net.revelc.code</groupId>
<artifactId>apilyzer-maven-plugin</artifactId>
<version>1.2.0</version>
@@ -411,7 +383,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.7.5</version>
+ <version>2.10.0</version>
<configuration>
<configFile>${eclipseFormatterStyle}</configFile>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
@@ -442,7 +414,7 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0</version>
<configuration>
<removeUnused>true</removeUnused>
<groups>java.,javax.,org.,com.</groups>
@@ -495,27 +467,20 @@
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <id>enforce-basic-rules</id>
+ <!-- must be same id as in the apache parent pom, to override the version -->
+ <id>enforce-maven-version</id>
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
- </execution>
- <execution>
- <id>enforce-java-signatures</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>process-test-classes</phase>
<configuration>
<rules>
- <checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </checkSignatureRule>
+ <requireMavenVersion>
+ <version>[3.5.0,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[11,)</version>
+ </requireJavaVersion>
</rules>
</configuration>
</execution>
diff --git a/src/main/spotbugs/exclude-filter.xml b/src/main/spotbugs/exclude-filter.xml
index 8d66ccf..3f53670 100644
--- a/src/main/spotbugs/exclude-filter.xml
+++ b/src/main/spotbugs/exclude-filter.xml
@@ -23,4 +23,9 @@
<!-- ignore thrift-generated classes -->
<Package name="org.apache.accumulo.proxy.thrift" />
</Match>
+ <Match>
+ <!-- Must ignore these everywhere, because of a javac byte code generation bug -->
+ <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
+ <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+ </Match>
</FindBugsFilter>
