Move rest of JDK17 tests into main test dir (#4831)

Author: cowtowncoder

pom.xml

@@ -185,19 +185,27 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <inherited>true</inherited>
+        <configuration>
+          <compilerArgs>
+            <!-- Must ensure parameter names compiled (for tests) -->
+            <arg>-parameters</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+
+      <plugin> <!-- default settings are fine, just need to enable here -->
+        <!-- Inherited from oss-base. Generate PackageVersion.java.-->
+        <groupId>com.google.code.maven-replacer-plugin</groupId>
+        <artifactId>replacer</artifactId>
         <executions>
           <execution>
+            <id>generate-package-version-java</id>
+            <phase>prepare-package</phase>
             <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>report</id>
-            <phase>test</phase>
-            <goals>
-              <goal>report</goal>
+              <goal>replace</goal>
             </goals>
           </execution>
         </executions>
@@ -208,6 +216,8 @@
         <version>${version.plugin.surefire}</version>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <!-- Needed by some of the tests -->
+          <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
           <classpathDependencyExcludes>
             <exclude>javax.measure:jsr-275</exclude>
           </classpathDependencyExcludes>
@@ -233,34 +243,25 @@
         </configuration>
       </plugin>
 
-      <plugin> <!-- default settings are fine, just need to enable here -->
-        <!-- Inherited from oss-base. Generate PackageVersion.java.-->
-        <groupId>com.google.code.maven-replacer-plugin</groupId>
-        <artifactId>replacer</artifactId>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>generate-package-version-java</id>
-            <phase>prepare-package</phase>
             <goals>
-              <goal>replace</goal>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
 
-      <!-- 17-Sep-2017, tatu: With 3.0 need to ensure parameter names compiled in
-        -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <compilerArgs>
-            <arg>-parameters</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
@@ -332,35 +333,12 @@
                 </goals>
                 <configuration>
                   <sources>  
-                    <source>src/test-jdk11/java</source>
                     <source>src/test-jdk17/java</source>
                 </sources>
                 </configuration>
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <inherited>true</inherited>
-            <configuration>
-              <!-- Enable Java 17 for all sources so that Intellij picks the right language level -->
-              <source>17</source>
-              <release>17</release>
-              <compilerArgs>
-                <arg>-parameters</arg>
-                <arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>
-                <arg>--add-opens=java.base/java.util=ALL-UNNAMED</arg>
-              </compilerArgs>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -384,8 +362,6 @@
                 </goals>
                 <configuration>
                   <sources>
-                    <source>src/test-jdk11/java</source>
-                    <source>src/test-jdk17/java</source>
                     <source>src/test-jdk21/java</source>
                   </sources>
                 </configuration>
@@ -402,8 +378,6 @@
               <release>21</release>
               <compilerArgs>
                 <arg>-parameters</arg>
-                <arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>
-                <arg>--add-opens=java.base/java.util=ALL-UNNAMED</arg>
               </compilerArgs>
             </configuration>
           </plugin>
@@ -508,7 +482,7 @@
                 <path>
                   <groupId>com.google.errorprone</groupId>
                   <artifactId>error_prone_core</artifactId>
-                  <version>2.4.0</version>
+                  <version>2.36.0</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>