Clean up integration tests by removing redundant JRE annotations and comments (#11353)

This commit modernizes several integration tests by simplifying test logic and removing unnecessary checks.

Changes include:
- MavenITgh10312TerminallyDeprecatedMethodInGuiceTest: Simplified test logic and updated JRE annotations
- MavenITmng4747JavaAgentUsedByPluginTest: Removed redundant JRE check comments
- MavenITmng7045DropUselessAndOutdatedCdiApiTest: Removed redundant JRE check and comments
- MavenITmng7470ResolverTransportTest: Simplified test method structure, inlined redundant methods, removed unused constants
- AbstractMavenIntegrationTestCase: Remove utility method for JRE version checking

Author: gnodet

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java

@@ -21,6 +21,8 @@
 import java.io.File;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -33,8 +35,8 @@ class MavenITgh10312TerminallyDeprecatedMethodInGuiceTest extends AbstractMavenI
     MavenITgh10312TerminallyDeprecatedMethodInGuiceTest() {}
 
     @Test
+    @EnabledForJreRange(min = JRE.JAVA_24)
     void worryingShouldNotBePrinted() throws Exception {
-        requiresJavaVersion("[24,)");
         File testDir = extractResources("/gh-10312-terminally-deprecated-method-in-guice");
 
         Verifier verifier = new Verifier(testDir.getAbsolutePath());
@@ -52,8 +54,8 @@ void worryingShouldNotBePrinted() throws Exception {
     }
 
     @Test
+    @EnabledForJreRange(min = JRE.JAVA_24, max = JRE.JAVA_25)
     void allowOverwriteByUser() throws Exception {
-        requiresJavaVersion("[24,26)");
         File testDir = extractResources("/gh-10312-terminally-deprecated-method-in-guice");
 
         Verifier verifier = new Verifier(testDir.getAbsolutePath());

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java

@@ -41,8 +41,6 @@ public class MavenITmng4747JavaAgentUsedByPluginTest extends AbstractMavenIntegr
      */
     @Test
     public void testit() throws Exception {
-        requiresJavaVersion("[1.5,)");
-
         File testDir = extractResources("/mng-4747");
 
         Verifier verifier = newVerifier(testDir.getAbsolutePath());

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java

@@ -27,9 +27,6 @@ public class MavenITmng7045DropUselessAndOutdatedCdiApiTest extends AbstractMave
 
     @Test
     public void testShouldNotLeakCdiApi() throws IOException, VerificationException {
-        // in test Groovy 4.x is used which requires JDK 1.8, so simply skip it for older JDKs
-        requiresJavaVersion("[1.8,)");
-
         File testDir = extractResources("/mng-7045");
         Verifier verifier = newVerifier(testDir.getAbsolutePath());
 

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java

@@ -22,10 +22,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -40,11 +37,6 @@ public class MavenITmng7470ResolverTransportTest extends AbstractMavenIntegratio
 
     private int port;
 
-    private static final ArtifactVersion JDK_TRANSPORT_USABLE_ON_JDK_SINCE = new DefaultArtifactVersion("11");
-
-    private static final ArtifactVersion JDK_TRANSPORT_IN_MAVEN_SINCE =
-            new DefaultArtifactVersion("4.0.0-alpha-9-SNAPSHOT");
-
     @BeforeEach
     protected void setUp() throws Exception {
         File testDir = extractResources("/mng-7470-resolver-transport");
@@ -100,37 +92,13 @@ private void performTest(/* nullable */ final String transport, final String log
 
     private static final String WAGON_LOG_SNIPPET = "[DEBUG] Using transporter WagonTransporter";
 
-    private static final String APACHE_LOG_SNIPPET_OLD = "[DEBUG] Using transporter HttpTransporter";
-
     private static final String APACHE_LOG_SNIPPET = "[DEBUG] Using transporter ApacheTransporter";
 
     private static final String JDK_LOG_SNIPPET = "[DEBUG] Using transporter JdkTransporter";
 
-    /**
-     * Returns {@code true} if JDK HttpClient transport is usable (Java11 or better).
-     */
-    private boolean isJdkTransportUsable() {
-        return JDK_TRANSPORT_USABLE_ON_JDK_SINCE.compareTo(getJavaVersion()) < 1;
-    }
-
-    /**
-     * Returns {@code true} if JDK HttpClient transport is present in Maven (since 4.0.0-alpha-9, the Resolver 2.0.0
-     * upgrade).
-     */
-    private boolean isJdkTransportPresent() {
-        return true;
-    }
-
-    private String defaultLogSnippet() {
-        if (isJdkTransportUsable() && isJdkTransportPresent()) {
-            return JDK_LOG_SNIPPET;
-        }
-        return isJdkTransportPresent() ? APACHE_LOG_SNIPPET : APACHE_LOG_SNIPPET_OLD;
-    }
-
     @Test
     public void testResolverTransportDefault() throws Exception {
-        performTest(null, defaultLogSnippet());
+        performTest(null, JDK_LOG_SNIPPET);
     }
 
     @Test
@@ -140,14 +108,11 @@ public void testResolverTransportWagon() throws Exception {
 
     @Test
     public void testResolverTransportApache() throws Exception {
-        performTest(
-                isJdkTransportPresent() ? "apache" : "native",
-                isJdkTransportPresent() ? APACHE_LOG_SNIPPET : APACHE_LOG_SNIPPET_OLD);
+        performTest("apache", APACHE_LOG_SNIPPET);
     }
 
     @Test
     public void testResolverTransportJdk() throws Exception {
-        Assumptions.assumeTrue(isJdkTransportUsable() && isJdkTransportPresent());
         performTest("jdk", JDK_LOG_SNIPPET);
     }
 }

its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java

@@ -24,17 +24,9 @@
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.Arrays;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
-import org.opentest4j.TestAbortedException;
 
 /**
  * @author Jason van Zyl
@@ -46,8 +38,6 @@ public abstract class AbstractMavenIntegrationTestCase {
      */
     private static PrintStream out = System.out;
 
-    private static ArtifactVersion javaVersion;
-
     private String testName;
 
     protected AbstractMavenIntegrationTestCase() {}
@@ -68,46 +58,7 @@ protected String getName() {
         return testName;
     }
 
-    /**
-     * Gets the Java version used to run this test.
-     *
-     * @return The Java version, never <code>null</code>.
-     */
-    protected static ArtifactVersion getJavaVersion() {
-        if (javaVersion == null) {
-            String version = System.getProperty("java.version");
-            version = version.replaceAll("[_-]", ".");
-            Matcher matcher =
-                    Pattern.compile("(?s).*?(([0-9]+\\.[0-9]+)(\\.[0-9]+)?).*").matcher(version);
-            if (matcher.matches()) {
-                version = matcher.group(1);
-            }
-            javaVersion = new DefaultArtifactVersion(version);
-        }
-        return javaVersion;
-    }
-
-    /**
-     * Guards the execution of a test case by checking that the current Java version matches the specified version
-     * range. If the check fails, an exception will be thrown which aborts the current test and marks it as skipped. One
-     * would usually call this method right at the start of a test method.
-     *
-     * @param versionRange The version range that specifies the acceptable Java versions for the test, must not be
-     *                     <code>null</code>.
-     */
-    protected void requiresJavaVersion(String versionRange) {
-        VersionRange range;
-        try {
-            range = VersionRange.createFromVersionSpec(versionRange);
-        } catch (InvalidVersionSpecificationException e) {
-            throw new IllegalArgumentException("Invalid version range: " + versionRange, e);
-        }
 
-        ArtifactVersion version = getJavaVersion();
-        if (!range.containsVersion(version)) {
-            throw new UnsupportedJavaVersionException(version, range);
-        }
-    }
 
     private static class NonCloseableInputStream extends FilterInputStream {
         NonCloseableInputStream(InputStream delegate) {
@@ -118,11 +69,7 @@ private static class NonCloseableInputStream extends FilterInputStream {
         public void close() throws IOException {}
     }
 
-    private static class UnsupportedJavaVersionException extends TestAbortedException {
-        private UnsupportedJavaVersionException(ArtifactVersion javaVersion, VersionRange supportedRange) {
-            super("Java version " + javaVersion + " not in range " + supportedRange);
-        }
-    }
+
 
     protected File extractResources(String resourcePath) throws IOException {
         return new File(