cleanup for the pom tests

Author: rbri

pom.xml

@@ -53,7 +53,7 @@
 
         <!-- selenium -->
         <htmlunitdriver.version>4.40.0-SNAPSHOT</htmlunitdriver.version>
-        <selenium.version>4.39.0</selenium.version>
+        <selenium.version>4.40.0</selenium.version>
         <selenium.devtools.artifactId>selenium-devtools-v143</selenium.devtools.artifactId>
 
         <!-- test dependencies -->
@@ -69,6 +69,7 @@
         <imageio-batik.version>3.13.0</imageio-batik.version>
         <jfreechart.version>1.5.6</jfreechart.version>
         <maven-model.version>3.9.12</maven-model.version>
+        <maven-artifact.version>3.9.12</maven-artifact.version>
 
         <!-- quality -->
         <checkstyle.version>12.3.1</checkstyle.version>
@@ -1559,6 +1560,11 @@
             <artifactId>maven-model</artifactId>
             <version>${maven-model.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>${maven-artifact.version}</version>
+        </dependency>
         <!-- Jetty -->
         <dependency>
             <groupId>org.eclipse.jetty.ee10</groupId>

src/test/java/org/htmlunit/ExternalTest.java

@@ -27,6 +27,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.htmlunit.html.DomNode;
@@ -85,14 +86,16 @@ public void pom() throws Exception {
         try (FileReader fileReader = new FileReader(pomFile)) {
             final Model model = reader.read(fileReader);
 
+            final Pattern ignorePattern = Pattern.compile("" + model.getProperties().get("maven.version.ignore"));
+
             final List<String> wrongVersions = new LinkedList<>();
             for (var dep : model.getDependencies()) {
                 String version = dep.getVersion();
                 if (version.startsWith("${")) {
                     version = "" + model.getProperties().get(version.substring(2, version.length() - 1));
                 }
                 try {
-                    assertVersion(dep.getGroupId(), dep.getArtifactId(), version);
+                    assertVersion(dep.getGroupId(), dep.getArtifactId(), version, ignorePattern);
                 }
                 catch (final AssertionError e) {
                     wrongVersions.add(e.getMessage());
@@ -102,8 +105,6 @@ public void pom() throws Exception {
                 Assertions.fail(String.join("\n ", wrongVersions));
             }
         }
-
-        assertVersion("org.sonatype.oss", "oss-parent", "9");
     }
 
     /**
@@ -215,7 +216,8 @@ public void snapshot() throws Exception {
         }
     }
 
-    private static void assertVersion(final String groupId, final String artifactId, final String pomVersion)
+    private static void assertVersion(final String groupId, final String artifactId,
+                            final String pomVersion, final Pattern ignorePattern)
             throws Exception {
         String latestMavenCentralVersion = null;
         String url = MAVEN_REPO_URL_
@@ -232,7 +234,7 @@ private static void assertVersion(final String groupId, final String artifactId,
                 for (final HtmlAnchor anchor : page.getAnchors()) {
                     String mavenCentralVersion = anchor.getTextContent();
                     mavenCentralVersion = mavenCentralVersion.substring(0, mavenCentralVersion.length() - 1);
-                    if (!isIgnored(groupId, artifactId, mavenCentralVersion)) {
+                    if (!isIgnored(groupId, artifactId, mavenCentralVersion, ignorePattern)) {
                         if (isVersionAfter(mavenCentralVersion, latestMavenCentralVersion)) {
                             latestMavenCentralVersion = mavenCentralVersion;
                         }
@@ -243,6 +245,7 @@ private static void assertVersion(final String groupId, final String artifactId,
                 // ignore because our ci machine sometimes fails
             }
         }
+
         if (!pomVersion.endsWith("-SNAPSHOT")
                 || !isVersionAfter(
                         pomVersion.substring(0, pomVersion.length() - "-SNAPSHOT".length()),
@@ -259,81 +262,18 @@ private static boolean isVersionAfter(final String pomVersion, final String cent
         if (centralVersion == null) {
             return true;
         }
-        final String[] pomValues = pomVersion.split("\\.");
-        final String[] centralValues = centralVersion.split("\\.");
-        for (int i = 0; i < pomValues.length; i++) {
-            if (pomValues[i].startsWith("v")) {
-                pomValues[i] = pomValues[i].substring(1);
-            }
-            try {
-                Integer.parseInt(pomValues[i]);
-            }
-            catch (final NumberFormatException e) {
-                return false;
-            }
-        }
-        for (int i = 0; i < centralValues.length; i++) {
-            if (centralValues[i].startsWith("v")) {
-                centralValues[i] = centralValues[i].substring(1);
-            }
-            try {
-                Integer.parseInt(centralValues[i]);
-            }
-            catch (final NumberFormatException e) {
-                return true;
-            }
-        }
-        for (int i = 0; i < pomValues.length; i++) {
-            if (i == centralValues.length) {
-                return true;
-            }
-            final int pomValuePart = Integer.parseInt(pomValues[i]);
-            final int centralValuePart = Integer.parseInt(centralValues[i]);
-            if (pomValuePart < centralValuePart) {
-                return false;
-            }
-            if (pomValuePart > centralValuePart) {
-                return true;
-            }
-        }
-        return false;
-    }
 
-    private static boolean isIgnored(@SuppressWarnings("unused") final String groupId,
-            @SuppressWarnings("unused") final String artifactId, @SuppressWarnings("unused") final String version) {
-        if (groupId.startsWith("org.eclipse.jetty")
-                && (version.startsWith("11.") || version.startsWith("10."))) {
-            return true;
-        }
+        return new ComparableVersion(pomVersion).compareTo(new ComparableVersion(centralVersion)) > 0;
+    }
 
+    private static boolean isIgnored(final String groupId, final String artifactId,
+            final String version, final Pattern ignorePattern) {
         // version > 3.12.0 does not work with our site.xml and also not with a refactored one
         if ("maven-site-plugin".equals(artifactId)
                 && (version.startsWith("3.12.1") || version.startsWith("3.20.") || version.startsWith("3.21."))) {
             return true;
         }
 
-        // >= 11.x requires java11
-        if ("org.owasp".equals(groupId)
-                && (version.startsWith("11.") || version.startsWith("12."))) {
-            return true;
-        }
-
-        // 6.x requires java11
-        if ("org.apache.felix".equals(groupId)
-                && version.startsWith("6.")) {
-            return true;
-        }
-
-        // 6.x requires java17
-        if ("org.junit.jupiter".equals(groupId)
-                && version.startsWith("6.")) {
-            return true;
-        }
-        if ("org.junit.platform".equals(groupId)
-                && version.startsWith("6.")) {
-            return true;
-        }
-
         // ancient common versions
         if ("commons-io".equals(artifactId) && (version.startsWith("2003"))) {
             return true;
@@ -342,6 +282,10 @@ private static boolean isIgnored(@SuppressWarnings("unused") final String groupI
             return true;
         }
 
+        if (ignorePattern.matcher(version).matches()) {
+            return true;
+        }
+
         return false;
     }
 }