Fix build on JDK 21, use default Maven matrix on Jenkins

apache · Feb 18, 2024 · b2104eb · b2104eb
1 parent 2c0dd18
commit b2104eb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-asfMavenTlpPlgnBuild(maven: ['3.6.x','3.8.x'])
+asfMavenTlpPlgnBuild()
diff --git a/src/it/resources/it-parent/pom.xml b/src/it/resources/it-parent/pom.xml
@@ -66,7 +66,7 @@ under the License.
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>${version.maven-compiler-plugin}</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/it/resources/supplemental-artifact/resource-projects/pom.xml b/src/it/resources/supplemental-artifact/resource-projects/pom.xml
@@ -34,7 +34,7 @@ under the License.
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>${version.maven-compiler-plugin}</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java
@@ -51,13 +51,6 @@ public static File getBaseDir() {
     public static Verifier newVerifier(File dir) throws VerificationException {
         Verifier verifier = new Verifier(dir.getAbsolutePath());
         verifier.setLocalRepo(System.getProperty("localRepositoryPath"));
-        verifier.getSystemProperties().setProperty("https.protocols", System.getProperty("https.protocols", "TLSv1.2"));
-
-        int javaVersion = Integer.getInteger("java.specification.version", 7);
-        if (javaVersion >= 12) {
-            verifier.setSystemProperty("maven.compiler.source", "7");
-            verifier.setSystemProperty("maven.compiler.target", "7");
-        }
         return verifier;
     }
 }