accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch 1.9 updated: Fix #1236 Require Java 11 for building
Date Tue, 30 Jul 2019 00:20:22 GMT
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 1704d79  Fix #1236 Require Java 11 for building
1704d79 is described below

commit 1704d79d6fc3d661ca680c49c8b2e8f0d257a7c7
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Mon Jul 29 19:35:22 2019 -0400

    Fix #1236 Require Java 11 for building
    
    * Stop building with openjdk8
    * Require Java 11 or later for building
      (still targeting 7 for the 1.9 branch)
    * Update some plugin versions
    * Update bouncycastle test dependency
    * Fix javadoc to resolve checkstyle issue in randomwalk Environment
    * Remove unnecessary exclusion of bouncycastle from minikdc
    * Add exclusion from later branch for nimbus-jose-jwt
---
 .travis.yml                                        |  1 -
 pom.xml                                            | 84 ++++++----------------
 test/pom.xml                                       |  6 +-
 .../accumulo/test/randomwalk/Environment.java      |  4 +-
 4 files changed, 26 insertions(+), 69 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ae5f09..ba92404 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ cache:
     - $HOME/.m2
 install: echo NOOP Skipping pre-fetch of Maven dependencies
 jdk:
-  - openjdk8
   - openjdk11
 before_script:
   - unset _JAVA_OPTIONS
diff --git a/pom.xml b/pom.xml
index ff3f20b..bc548a8 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.60</bouncycastle.version>
+    <bouncycastle.version>1.62</bouncycastle.version>
     <!-- Curator version -->
     <curator.version>2.11.0</curator.version>
     <!-- relative path for Eclipse format; should override in child modules if necessary
-->
@@ -127,12 +127,13 @@
     <failsafe.groups />
     <!-- surefire/failsafe plugin option -->
     <forkCount>1</forkCount>
-    <hadoop.version>2.6.4</hadoop.version>
+    <hadoop.version>2.6.5</hadoop.version>
     <htrace.hadoop.version>4.1.0-incubating</htrace.hadoop.version>
     <htrace.version>3.1.0-incubating</htrace.version>
     <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
     <!-- jetty 9.2 is the last version to support jdk less than 1.8 -->
     <jetty.version>9.2.26.v20180806</jetty.version>
+    <maven.compiler.release>7</maven.compiler.release>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
     <maven.plugin-version>3.0.5</maven.plugin-version>
@@ -555,12 +556,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>
@@ -580,17 +581,17 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.2.0</version>
         </plugin>
         <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>
@@ -605,7 +606,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>
@@ -656,7 +657,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.1.1</version>
           <configuration>
             <quiet>true</quiet>
             <additionalJOption>-J-Xmx512m</additionalJOption>
@@ -713,7 +714,7 @@
         <plugin>
           <groupId>org.asciidoctor</groupId>
           <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>1.5.6</version>
+          <version>1.6.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -727,28 +728,10 @@
           <version>1.5.0</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <configuration>
-            <rules>
-              <requireJavaVersion>
-                <version>[1.8,)</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>
+          <version>4.2.0</version>
         </plugin>
         <plugin>
           <groupId>net.revelc.code</groupId>
@@ -797,7 +780,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>
@@ -840,31 +823,21 @@
         <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>java17</artifactId>
-                    <version>1.0</version>
-                  </signature>
-                  <ignores>
-                    <ignore>org.apache.hadoop.conf.Configuration</ignore>
-                    <ignore>org.apache.hadoop.fs.FileSystem</ignore>
-                  </ignores>
-                </checkSignatureRule>
+                <requireMavenVersion>
+                  <!-- org.apache.felix:maven-bundle-plugin declares that it needs 3.5.0
-->
+                  <version>[3.5.0,)</version>
+                </requireMavenVersion>
+                <requireJavaVersion>
+                  <version>[11,)</version>
+                </requireJavaVersion>
               </rules>
             </configuration>
           </execution>
@@ -1100,10 +1073,6 @@
           <name>m2e.version</name>
         </property>
       </activation>
-      <properties>
-        <!-- enforces Java 7 compiler compliance, even when Eclipse uses JDK 9 or later
-->
-        <maven.compiler.release>7</maven.compiler.release>
-      </properties>
       <build>
         <pluginManagement>
           <plugins>
@@ -1431,14 +1400,5 @@
         <hadoop.version>3.0.0</hadoop.version>
       </properties>
     </profile>
-    <profile>
-      <id>jdk-release-flag</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <properties>
-        <maven.compiler.release>7</maven.compiler.release>
-      </properties>
-    </profile>
   </profiles>
 </project>
diff --git a/test/pom.xml b/test/pom.xml
index d776407..fa16455 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,10 +147,10 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minikdc</artifactId>
       <exclusions>
-        <!-- Pulls in an older bouncycastle version -->
+        <!-- avoid vuln in JOSE library see https://nvd.nist.gov/vuln/detail/CVE-2017-12974
-->
         <exclusion>
-          <groupId>bouncycastle</groupId>
-          <artifactId>bcprov-jdk15</artifactId>
+          <groupId>com.nimbusds</groupId>
+          <artifactId>nimbus-jose-jwt</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
index 14cdc36..ab5c977 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
@@ -216,11 +216,9 @@ public class Environment {
    * @return multitable batch writer
    * @throws NumberFormatException
    *           if any of the numeric batch writer configuration properties cannot be parsed
-   * @throws NumberFormatException
-   *           if any configuration property cannot be parsed
    */
   public MultiTableBatchWriter getMultiTableBatchWriter()
-      throws AccumuloException, AccumuloSecurityException {
+      throws AccumuloException, AccumuloSecurityException, NumberFormatException {
     if (mtbw == null) {
       long maxMem = Long.parseLong(p.getProperty(KEY_MAX_MEM));
       long maxLatency = Long.parseLong(p.getProperty(KEY_MAX_LATENCY));


Mime
View raw message