accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/02: Fix #626 Update to apache-21 parent POM
Date Mon, 10 Sep 2018 01:16:06 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

commit 1776808298178a2a30225857e0abc16b3c7a746c
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Thu Sep 6 19:06:49 2018 -0400

    Fix #626 Update to apache-21 parent POM
    
    * Update parent POM to apache-21
    * Update build plugin configuration obsoleted by POM update
    * Update other build plugins
    * Build with JDK8 to use plugins which aren't out-of-date
    
    This change requires Java 8 for building the project, because the
    updates to Maven plugins are getting harder
---
 pom.xml                                            | 248 ++++++---------------
 server/native/pom.xml                              |  18 --
 server/native/src/main/assemblies/component.xml    |   2 +-
 server/tserver/pom.xml                             |  11 +
 .../apache/accumulo/tserver/CompactionQueue.java   |   2 +-
 5 files changed, 84 insertions(+), 197 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2cc1a8e..a088f85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>19</version>
+    <version>21</version>
   </parent>
   <groupId>org.apache.accumulo</groupId>
   <artifactId>accumulo-project</artifactId>
@@ -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.59</bouncycastle.version>
+    <bouncycastle.version>1.60</bouncycastle.version>
     <!-- Curator version -->
     <curator.version>2.11.0</curator.version>
     <!-- relative path for Eclipse format; should override in child modules if necessary
-->
@@ -140,10 +140,10 @@
     <maven.plugin-version>3.0.5</maven.plugin-version>
     <!-- surefire/failsafe plugin option -->
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
-    <powermock.version>1.6.6</powermock.version>
+    <powermock.version>1.7.4</powermock.version>
     <!-- surefire/failsafe plugin option -->
     <reuseForks>false</reuseForks>
-    <slf4j.version>1.7.21</slf4j.version>
+    <slf4j.version>1.7.25</slf4j.version>
     <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
     <surefire.excludedGroups />
     <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
@@ -163,18 +163,18 @@
       <dependency>
         <groupId>com.google.auto.service</groupId>
         <artifactId>auto-service</artifactId>
-        <version>1.0-rc2</version>
+        <!-- rc4 and higher require Java 8 -->
+        <version>1.0-rc3</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
         <version>2.7</version>
       </dependency>
-      <!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <!-- Hadoop-2.4.0 MiniDFSCluster uses classes from <Guava-15.0; fixed in 2.6.0
and later -->
+        <!-- version known to work on at least some Hadoop versions -->
         <version>14.0.1</version>
       </dependency>
       <dependency>
@@ -419,12 +419,7 @@
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-minikdc</artifactId>
-        <!-- Specifically depend on this version of minikdc to avoid having
-           to increase out normal hadoop dependency; minikdc not available prior
-           to 2.3.0 -->
-        <?SORTPOM IGNORE?>
-        <version>2.3.0</version><!--$NO-MVN-MAN-VER$-->
-        <?SORTPOM RESUME?>
+        <version>${hadoop.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -469,7 +464,7 @@
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-annotations</artifactId>
-        <version>3.2</version>
+        <version>3.5.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>
@@ -504,7 +499,7 @@
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
@@ -631,25 +626,6 @@
           </configuration>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>native-maven-plugin</artifactId>
-          <version>1.0-alpha-8</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-changes-plugin</artifactId>
-          <version>2.12.1</version>
-          <configuration>
-            <issueManagementSystems>
-              <issueManagementSystem>JIRA</issueManagementSystem>
-            </issueManagementSystems>
-            <onlyCurrentVersion>true</onlyCurrentVersion>
-            <statusIds>Closed,Resolved</statusIds>
-            <maxEntries>10000</maxEntries>
-            <useJql>true</useJql>
-          </configuration>
-        </plugin>
-        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
           <configuration>
@@ -696,8 +672,9 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <configuration>
             <quiet>true</quiet>
-            <javadocVersion>${maven.compiler.target}</javadocVersion>
+            <javadocVersion>1.8</javadocVersion>
             <additionalJOption>-J-Xmx512m</additionalJOption>
+            <additionalparam>-Xdoclint:all,-Xdoclint:-missing</additionalparam>
           </configuration>
         </plugin>
         <plugin>
@@ -756,23 +733,6 @@
           <version>3.0.0</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>cobertura-maven-plugin</artifactId>
-          <version>2.7</version>
-          <configuration>
-            <aggregate>true</aggregate>
-            <formats>
-              <format>xml</format>
-              <format>html</format>
-            </formats>
-            <instrumentation>
-              <excludes>
-                <exclude>**/thrift/*.class</exclude>
-              </excludes>
-            </instrumentation>
-          </configuration>
-        </plugin>
-        <plugin>
           <!-- version 1.6.0 is broken; see https://github.com/mojohaus/exec-maven-plugin/issues/75
-->
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
@@ -784,18 +744,15 @@
           <configuration>
             <rules>
               <requireJavaVersion>
-                <version>[${maven.compiler.target},)</version>
+                <version>[1.8,)</version>
               </requireJavaVersion>
-              <requireMavenVersion>
-                <version>[3.0.5,)</version>
-              </requireMavenVersion>
             </rules>
           </configuration>
           <dependencies>
             <dependency>
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>animal-sniffer-enforcer-rule</artifactId>
-              <version>1.16</version>
+              <version>1.17</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -811,19 +768,6 @@
           <version>1.2.0</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes combine.children="append">
-              <exclude>src/main/resources/META-INF/services/*</exclude>
-              <exclude>nbproject/**</exclude>
-              <exclude>nb-configuration.xml</exclude>
-              <exclude>nbactions.xml</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-        <plugin>
-          <!-- 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.4</version>
@@ -846,7 +790,23 @@
           </configuration>
         </plugin>
         <plugin>
-          <!-- this plugin requires java 1.8 and should only be used in a jdk8 profile
-->
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludes combine.children="append">
+              <exclude>src/main/resources/META-INF/services/*</exclude>
+              <exclude>nbproject/**</exclude>
+              <exclude>nb-configuration.xml</exclude>
+              <exclude>nbactions.xml</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>net.revelc.code</groupId>
+          <artifactId>warbucks-maven-plugin</artifactId>
+          <version>1.1.2</version>
+        </plugin>
+        <plugin>
           <groupId>net.revelc.code</groupId>
           <artifactId>impsort-maven-plugin</artifactId>
           <version>1.2.0</version>
@@ -858,12 +818,6 @@
             </excludes>
           </configuration>
         </plugin>
-        <plugin>
-          <!-- this plugin requires java 1.8 and should only be used in a jdk8 profile
-->
-          <groupId>net.revelc.code</groupId>
-          <artifactId>warbucks-maven-plugin</artifactId>
-          <version>1.0.0</version>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -880,6 +834,20 @@
         </executions>
       </plugin>
       <plugin>
+        <!-- verify before compile; should be sorted already -->
+        <groupId>com.github.ekryd.sortpom</groupId>
+        <artifactId>sortpom-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>verify-sorted-pom</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+            <phase>process-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
@@ -984,20 +952,17 @@
                 <module name="OuterTypeFilename" />
                 <module name="LineLength">
                   <property name="max" value="100" />
-                  <property name="ignorePattern" value="^[ ]*[*].*@(link|see) |Map.* =
new .*Map|a href=|http://|https://|ftp://" />
+                  <property name="ignorePattern" value="^[ ]*[*].*@(link|see) |Map.* =
new .*Map|org[.]apache[.]accumulo[.]|a href=|http://|https://|ftp://" />
                 </module>
                 <module name="AvoidStarImport" />
                 <module name="UnusedImports">
                   <property name="processJavadoc" value="true" />
                 </module>
                 <module name="NoLineWrap" />
-                <module name="LeftCurly">
-                  <property name="maxLineLength" value="160" />
-                </module>
-                <module name="RightCurly" />
+                <module name="LeftCurly" />
                 <module name="RightCurly">
                   <property name="option" value="alone" />
-                  <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR,
LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT" />
+                  <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR,
LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT" />
                 </module>
                 <module name="SeparatorWrap">
                   <property name="tokens" value="DOT" />
@@ -1047,10 +1012,9 @@
         </configuration>
         <dependencies>
           <dependency>
-            <!-- this is the last version which supports java 7 -->
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>6.19</version>
+            <version>8.12</version>
           </dependency>
         </dependencies>
         <executions>
@@ -1113,6 +1077,28 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>net.revelc.code</groupId>
+        <artifactId>warbucks-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>check-junit-categories-on-its</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <rule>
+                  <includeMainClasses>true</includeMainClasses>
+                  <includeTestClasses>true</includeTestClasses>
+                  <classPattern>.*IT</classPattern>
+                  <classAnnotationPattern>org[.]junit[.]experimental[.]categories[.]Category</classAnnotationPattern>
+                </rule>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <!-- Allows us to get the apache-ds bundle artifacts -->
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -1222,23 +1208,6 @@
                     <pluginExecution>
                       <pluginExecutionFilter>
                         <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>native-maven-plugin</artifactId>
-                        <versionRange>[0,)</versionRange>
-                        <goals>
-                          <goal>compile</goal>
-                          <goal>initialize</goal>
-                          <goal>javah</goal>
-                          <goal>link</goal>
-                          <goal>unzipinc</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore />
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
                         <versionRange>[0,)</versionRange>
                         <goals>
@@ -1302,19 +1271,6 @@
                         <ignore />
                       </action>
                     </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>net.revelc.code</groupId>
-                        <artifactId>warbucks-maven-plugin</artifactId>
-                        <versionRange>[0,)</versionRange>
-                        <goals>
-                          <goal>check</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore />
-                      </action>
-                    </pluginExecution>
                   </pluginExecutions>
                 </lifecycleMappingMetadata>
               </configuration>
@@ -1354,11 +1310,9 @@
       </build>
     </profile>
     <profile>
-      <!-- this profile requires jdk8 -->
       <!-- on by default, but disable with '-P !autoformat' or '-DskipFormat' -->
       <id>autoformat</id>
       <activation>
-        <jdk>[1.8,1.9)</jdk>
         <property>
           <name>!skipFormat</name>
         </property>
@@ -1413,66 +1367,6 @@
       </properties>
     </profile>
     <profile>
-      <id>jdk8</id>
-      <activation>
-        <jdk>[1.8,1.9)</jdk>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-javadoc-plugin</artifactId>
-              <configuration>
-                <quiet>true</quiet>
-                <javadocVersion>1.8</javadocVersion>
-                <additionalJOption>-J-Xmx512m</additionalJOption>
-                <additionalparam>-Xdoclint:all,-Xdoclint:-missing</additionalparam>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-        <plugins>
-          <plugin>
-            <!-- verify before compile; should be sorted already -->
-            <groupId>com.github.ekryd.sortpom</groupId>
-            <artifactId>sortpom-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>verify-sorted-pom</id>
-                <goals>
-                  <goal>verify</goal>
-                </goals>
-                <phase>process-resources</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>net.revelc.code</groupId>
-            <artifactId>warbucks-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>check-junit-categories-on-its</id>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <rule>
-                      <includeMainClasses>true</includeMainClasses>
-                      <includeTestClasses>true</includeTestClasses>
-                      <classPattern>.*IT</classPattern>
-                      <classAnnotationPattern>org[.]junit[.]experimental[.]categories[.]Category</classAnnotationPattern>
-                    </rule>
-                  </rules>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
       <id>aggregate-javadocs</id>
       <build>
         <pluginManagement>
diff --git a/server/native/pom.xml b/server/native/pom.xml
index 59f3ffb..c9cbc5c 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -55,24 +55,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>native-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-javah-includes</id>
-            <goals>
-              <goal>javah</goal>
-            </goals>
-            <phase>compile</phase>
-            <configuration>
-              <javahClassNames>
-                <javahClassName>org.apache.accumulo.tserver.NativeMap</javahClassName>
-              </javahClassNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
diff --git a/server/native/src/main/assemblies/component.xml b/server/native/src/main/assemblies/component.xml
index 8baa7c8..1243a39 100644
--- a/server/native/src/main/assemblies/component.xml
+++ b/server/native/src/main/assemblies/component.xml
@@ -37,7 +37,7 @@
       <fileMode>0644</fileMode>
     </fileSet>
     <fileSet>
-      <directory>${project.build.directory}/native/javah</directory>
+      <directory>../tserver/target/native/javah</directory>
       <outputDirectory>javah</outputDirectory>
       <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index bee7445..83a7461 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -126,6 +126,17 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <!-- add flags to generate native headers -->
+            <compilerArgs combine.children="append">
+              <arg>-h</arg>
+              <arg>${project.build.directory}/native/javah/</arg>
+            </compilerArgs>
+          </configuration>
+        </plugin>
+        <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index e8caaf1..99cb99b 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.htrace.wrappers.TraceRunnable;
 
 /**
- * {@link TraceRunnable} objects placed in this queue <b>must</a> wrap a {@link
Runnable} which is
+ * {@link TraceRunnable} objects placed in this queue <b>must</b> wrap a {@link
Runnable} which is
  * also {@link Comparable}
  */
 class CompactionQueue extends AbstractQueue<TraceRunnable> implements BlockingQueue<TraceRunnable>
{


Mime
View raw message