ARTEMIS-3296: get things building on Java 16 (and 17EA+21)

Updates parent pom, various plugins or deps, tidies up inconsistent versions and consolidates to inherited version where possible, define properties for some versions where not. Disables some problematic tests on JDK16+ for now. Drops DS test dep back 1 version to remove a specific breakage affecting multiple tests/modules, introduced after its upgrade in commit 9e70b26368.
2021-05-17 09:18:19 +01:00 · 2021-05-17 09:18:19 +01:00 · 2e2cd1f073
parent fe361d3fae
commit 2e2cd1f073
7 changed files with 127 additions and 61 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -8,7 +8,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java: [ 8, 11, 14 ]
+        java: [ 8, 11, 16 ]

    steps:
      - uses: actions/checkout@v2
@ -31,7 +31,7 @@ jobs:
      # By setting anything to org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED we are disabling libaio loading on the testsuite
      - name: Build Main
        run: |
-          mvn -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Djdk8-errorprone -Pfast-tests -Pextra-tests -Ptests-CI -Pjmh install
+          mvn -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Derrorprone -Pfast-tests -Pextra-tests -Ptests-CI -Pjmh install

      - name: Build Examples (JDK8 / -Prelease)
        if: matrix.java == '8'
--- a/.travis.yml
+++ b/.travis.yml
@ -11,7 +11,7 @@ matrix:
      env:
        - EXAMPLES_PROFILE="noRun"
    - os: linux
-      jdk: openjdk14
+      jdk: openjdk16
      env:
        - EXAMPLES_PROFILE="noRun"

@ -24,7 +24,7 @@ before_install:
 # By setting anything to org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED we are disabling libaio loading on the testsuite
 script: 
 - set -e
- mvn -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Djdk8-errorprone -Pfast-tests -Pextra-tests -Ptests-CI -Pjmh -B install -q
+- mvn -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Derrorprone -Pfast-tests -Pextra-tests -Ptests-CI -Pjmh -B install -q
 - cd examples
 - mvn install -P${EXAMPLES_PROFILE} -B -q

--- a/artemis-cdi-client/pom.xml
+++ b/artemis-cdi-client/pom.xml
@ -159,5 +159,23 @@
            </dependency>
         </dependencies>
      </profile>
+      <profile>
+         <!-- TODO: Changes so these tests can work? -->
+         <id>jdk16on</id>
+         <activation>
+            <jdk>[16,)</jdk>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <skip>true</skip>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
   </profiles>
 </project>
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@ -263,12 +263,13 @@
         </plugin>
         <plugin>
            <artifactId>maven-assembly-plugin</artifactId>
-            <version>${maven.assembly.plugin.version}</version>
            <executions>
              <execution>
                  <id>source</id>
                  <configuration>
-                     <descriptor>src/main/assembly/source-assembly.xml</descriptor>
+                     <descriptors>
+                       <descriptor>src/main/assembly/source-assembly.xml</descriptor>
+                     </descriptors>
                     <tarLongFileMode>gnu</tarLongFileMode>
                  </configuration>
                  <phase>package</phase>
@ -279,7 +280,9 @@
               <execution>
                  <id>bin</id>
                  <configuration>
-                     <descriptor>src/main/assembly/dep.xml</descriptor>
+                     <descriptors>
+                       <descriptor>src/main/assembly/dep.xml</descriptor>
+                     </descriptors>
                     <tarLongFileMode>gnu</tarLongFileMode>
                  </configuration>
                  <phase>package</phase>
--- a/pom.xml
+++ b/pom.xml
@ -25,7 +25,7 @@
   <parent>
      <groupId>org.apache</groupId>
      <artifactId>apache</artifactId>
-      <version>18</version>
+      <version>23</version>
      <relativePath>org.apache:apache</relativePath>
   </parent>

@ -95,8 +95,10 @@
      <jboss.logging.version>3.4.0.Final</jboss.logging.version>
      <jetty.version>9.4.40.v20210413</jetty.version>
      <jgroups.version>3.6.13.Final</jgroups.version>
-      <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
-      <mockito.version>3.3.3</mockito.version>
+      <errorprone.version>2.6.0</errorprone.version>
+      <maven.enforcer.plugin.version>3.0.0-M3</maven.enforcer.plugin.version>
+      <maven.bundle.plugin.version>5.1.2</maven.bundle.plugin.version>
+      <mockito.version>3.9.0</mockito.version>
      <jctools.version>2.1.2</jctools.version>
      <netty.version>4.1.63.Final</netty.version>

@ -130,11 +132,11 @@
      <owb.version>1.7.0</owb.version>
      <arquillian.version>1.1.11.Final</arquillian.version>
      <servicemix.json-1.1.spec.version>2.9.0</servicemix.json-1.1.spec.version>
-      <version.org.jacoco>0.7.9</version.org.jacoco>
-      <version.org.jacoco.plugin>0.7.9</version.org.jacoco.plugin>
-      <version.maven.jar.plugin>2.4</version.maven.jar.plugin>
+      <version.org.jacoco>0.8.6</version.org.jacoco>
+      <version.org.jacoco.plugin>0.8.6</version.org.jacoco.plugin>
      <version.micrometer>1.6.3</version.micrometer>
      <hamcrest.version>2.1</hamcrest.version>
+      <junit.version>4.13.2</junit.version>
      <surefire.version>2.22.2</surefire.version>
      <version.jaxb.runtime>2.3.3</version.jaxb.runtime>
      <paho.client.mqttv3.version>1.2.5</paho.client.mqttv3.version>
@ -199,7 +201,7 @@
      <skipStyleCheck>true</skipStyleCheck>
      <skipOWASP>true</skipOWASP>

-      <directory-version>2.0.0.AM26</directory-version>
+      <directory-version>2.0.0.AM25</directory-version>
      <directory-jdbm2-version>2.0.0-M1</directory-jdbm2-version>

      <netty-transport-native-epoll-classifier>linux-x86_64</netty-transport-native-epoll-classifier>
@ -267,10 +269,9 @@
         <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>${junit.version}</version>
            <scope>test</scope>
            <!-- License: CPL 1.0 -->
-            <!-- There are newer versions of the JUnit but they break our tests -->
         </dependency>
         <dependency>
            <groupId>org.easymock</groupId>
@ -280,7 +281,7 @@
         </dependency>

         <!-- ### For MQTT Tests && Examples -->
-    <dependency>
+         <dependency>
           <groupId>org.eclipse.paho</groupId>
           <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
           <version>${paho.client.mqttv3.version}</version>
@ -351,7 +352,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_core</artifactId>
-             <version>2.4.0</version>
+             <version>${errorprone.version}</version>
             <scope>provided</scope>
            <optional>true</optional>
         </dependency>
@ -907,7 +908,7 @@
          <activation>
              <jdk>1.8</jdk>
              <property>
-                  <name>jdk8-errorprone</name>
+                  <name>errorprone</name>
              </property>
          </activation>
          <build>
@ -937,6 +938,12 @@
              <maven.compiler.target>11</maven.compiler.target>
              <modular.jdk.surefire.arg>--add-modules java.sql,jdk.unsupported </modular.jdk.surefire.arg>
          </properties>
+      </profile>
+      <profile>
+          <id>jdk11to15-errorprone</id>
+          <activation>
+              <jdk>[11,16)</jdk>
+          </activation>
          <build>
              <plugins>
                  <plugin>
@ -954,6 +961,44 @@
              </plugins>
          </build>
      </profile>
+      <profile>
+          <id>jdk16-errorprone</id>
+          <!-- This is very slow due to all the compiler forking required, so made it opt-in with -Derrorprone -->
+          <!-- TODO: MissingOverride check only warns in this profile for now, as JDK15+ added a toString method to CharSequence -->
+          <activation>
+              <jdk>16</jdk>
+              <property>
+                  <name>errorprone</name>
+              </property>
+          </activation>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-compiler-plugin</artifactId>
+                      <configuration>
+                          <fork>true</fork>
+                          <compilerArgs>
+                              <arg>-Xdiags:verbose</arg>
+                              <arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg>
+                              <arg>-XDcompilePolicy=simple</arg>
+                              <arg>-Xplugin:ErrorProne -Xep:MissingOverride:WARN -Xep:NonAtomicVolatileUpdate:ERROR -Xep:SynchronizeOnNonFinalField:ERROR -Xep:StaticQualifiedUsingExpression:ERROR -Xep:WaitNotInLoop:ERROR -XepExcludedPaths:.*/generated-sources/.*</arg>
+                              <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+                              <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+                              <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+                              <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+                              <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+                              <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+                              <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+                              <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+                              <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+                              <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+                          </compilerArgs>
+                      </configuration>
+                  </plugin>
+              </plugins>
+          </build>
+      </profile>
      <profile>
         <id>owasp</id>
         <properties>
@ -1029,7 +1074,6 @@
               <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-enforcer-plugin</artifactId>
-                  <version>1.4</version>
                  <executions>
                     <execution>
                        <id>enforce-java</id>
@ -1391,7 +1435,7 @@
            <plugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-enforcer-plugin</artifactId>
-              <version>1.4.1</version>
+              <version>${maven.enforcer.plugin.version}</version>
              <executions>
                <execution>
                  <id>enforce-maven</id>
@ -1424,41 +1468,20 @@
            <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-compiler-plugin</artifactId>
-               <version>3.8.1</version>
               <configuration>
                   <showWarnings>true</showWarnings>
               </configuration>
            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-clean-plugin</artifactId>
-               <version>2.5</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-javadoc-plugin</artifactId>
-               <version>3.0.1</version>
-            </plugin>
            <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-rar-plugin</artifactId>
               <version>2.3</version>
            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <version>${version.maven.jar.plugin}</version>
-            </plugin>
            <plugin>
               <groupId>net.sf.maven-sar</groupId>
               <artifactId>maven-sar-plugin</artifactId>
               <version>1.0</version>
            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-site-plugin</artifactId>
-               <version>3.3</version>
-            </plugin>
            <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-shade-plugin</artifactId>
@ -1469,11 +1492,6 @@
               <artifactId>jetty-maven-plugin</artifactId>
               <version>${jetty.version}</version>
            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-deploy-plugin</artifactId>
-               <version>2.7</version>
-            </plugin>
            <plugin>
              <groupId>org.wildfly.extras.batavia</groupId>
              <artifactId>transformer-tools-mvn</artifactId>
@ -1484,7 +1502,6 @@
               <inherited>true</inherited>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-source-plugin</artifactId>
-               <version>2.2.1</version>
               <executions>
                  <execution>
                     <id>attach-sources</id>
@ -1513,7 +1530,6 @@
            <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-install-plugin</artifactId>
-               <version>2.4</version>
               <configuration>
                  <createChecksum>true</createChecksum>
               </configuration>
@ -1549,11 +1565,6 @@
                  </execution>
               </executions>
            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-resources-plugin</artifactId>
-               <version>2.6</version>
-            </plugin>
            <!-- Many examples use it -->
            <plugin>
               <groupId>org.apache.activemq</groupId>
@ -1572,7 +1583,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-           <version>1.4</version>
           <executions>
             <execution>
               <id>enforce-java</id>
@ -1659,7 +1669,6 @@
         <plugin>
            <groupId>org.apache.rat</groupId>
            <artifactId>apache-rat-plugin</artifactId>
-            <version>0.12</version>
            <configuration>
               <reportFile>${activemq.basedir}/ratReport.txt</reportFile>
               <skip>${skipLicenseCheck}</skip>
@ -1700,6 +1709,7 @@
                  <exclude>**/*.data</exclude>
                  <exclude>**/*.bin</exclude>
                  <exclude>**/src/test/resources/keystore</exclude>
+                  <exclude>**/src/test/java/org/apache/activemq/security/*.ts</exclude>
                  <exclude>**/*.log</exclude>
                  <exclude>**/*.redo</exclude>

@ -1741,7 +1751,7 @@
         <plugin>
            <groupId>org.apache.felix</groupId>
            <artifactId>maven-bundle-plugin</artifactId>
-            <version>4.2.1</version>
+            <version>${maven.bundle.plugin.version}</version>
            <extensions>true</extensions>
         </plugin>
         <plugin>
@ -1768,7 +1778,6 @@
         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-dependency-plugin</artifactId>
-            <version>3.1.1</version>
            <executions>
               <execution>
                  <id>copy</id>
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@ -732,5 +732,25 @@
      </snapshotRepository>
   </distributionManagement>

+   <profiles>
+      <profile>
+         <!-- TODO: Changes so these tests can work? -->
+         <id>jdk16on</id>
+         <activation>
+            <jdk>[16,)</jdk>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <skip>true</skip>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>

 </project>
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@ -29,6 +29,7 @@

   <properties>
      <activemq.basedir>${project.basedir}/../..</activemq.basedir>
+      <its-surefire-extra-args/>
   </properties>

   <dependencies>
@ -481,7 +482,9 @@
                     <goal>single</goal>
                  </goals>
                  <configuration>
-                     <descriptor>src/test/resources/rest/bwlist-rest-test-asm.xml</descriptor>
+                     <descriptors>
+                        <descriptor>src/test/resources/rest/bwlist-rest-test-asm.xml</descriptor>
+                     </descriptors>
                     <finalName>rest-test-bwlist</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                     <outputDirectory>target/test-classes/rest/</outputDirectory>
@ -494,7 +497,9 @@
                     <goal>single</goal>
                  </goals>
                  <configuration>
-                     <descriptor>src/test/resources/rest/rest-test-asm.xml</descriptor>
+                     <descriptors>
+                        <descriptor>src/test/resources/rest/rest-test-asm.xml</descriptor>
+                     </descriptors>
                     <finalName>rest-test</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                     <outputDirectory>target/test-classes/rest/</outputDirectory>
@ -523,7 +528,7 @@
                  <exclude>**/ReplicatedJMSFailoverTest.java</exclude>
                  <exclude>org.apache.activemq/tests/util/*.java</exclude>
               </excludes>
-               <argLine>-Djgroups.bind_addr=::1 ${activemq-surefire-argline} -Dorg.apache.activemq.SERIALIZABLE_PACKAGES="java.lang,javax.security,java.util,org.apache.activemq,org.fusesource.hawtbuf"</argLine>
+               <argLine>-Djgroups.bind_addr=::1 ${activemq-surefire-argline} ${its-surefire-extra-args} -Dorg.apache.activemq.SERIALIZABLE_PACKAGES="java.lang,javax.security,java.util,org.apache.activemq,org.fusesource.hawtbuf"</argLine>
            </configuration>
         </plugin>
         <plugin>
@ -550,5 +555,16 @@
         </plugin>
      </plugins>
   </build>
+   <profiles>
+      <profile>
+         <id>jdk16on</id>
+            <activation>
+         <jdk>[16,)</jdk>
+         </activation>
+         <properties>
+            <its-surefire-extra-args>--add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED</its-surefire-extra-args>
+         </properties>
+      </profile>
+   </profiles>
 </project>