From 714cd964fd76d0d916ca7cdb04a1c54b5ce34dff Mon Sep 17 00:00:00 2001
From: Doug Hoard <dhoard@users.noreply.github.com>
Date: Thu, 12 Dec 2024 09:27:48 -0500
Subject: [PATCH] Cleaned up version results to skip non-release dependencies
 (#1096)

Signed-off-by: dhoard <doug.hoard@gmail.com>
---
 collector/pom.xml                                    |  8 ++++++++
 collector/version-rules.xml                          |  5 +++--
 integration_test_suite/integration_tests/pom.xml     |  8 ++++++++
 .../jmx_example_application/pom.xml                  |  8 ++++++++
 .../jmx_example_application/version-rules.xml        |  5 +++--
 integration_test_suite/pom.xml                       |  8 ++++++++
 integration_test_suite/version-rules.xml             |  5 +++--
 jmx_prometheus_javaagent/version-rules.xml           |  5 +++--
 jmx_prometheus_standalone/version-rules.xml          |  5 +++--
 pom.xml                                              | 12 +++++++++++-
 version-rules.xml                                    |  5 +++--
 11 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/collector/pom.xml b/collector/pom.xml
index dc896264..189ae203 100644
--- a/collector/pom.xml
+++ b/collector/pom.xml
@@ -173,6 +173,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.18.0</version>
+                <configuration>
+                    <rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/collector/version-rules.xml b/collector/version-rules.xml
index 76f8da4f..8a3cc61d 100644
--- a/collector/version-rules.xml
+++ b/collector/version-rules.xml
@@ -1,6 +1,7 @@
 <ruleset comparisonMethod="maven"
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
-    <rules>
-    </rules>
+    <ignoreVersions>
+        <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|b|beta|Dev|Beta|BETA|rc|RC|M|EA|SNAPSHOT)[-_\.]?[0-9]*</ignoreVersion>
+    </ignoreVersions>
 </ruleset>
\ No newline at end of file
diff --git a/integration_test_suite/integration_tests/pom.xml b/integration_test_suite/integration_tests/pom.xml
index 618ca4f9..8399674f 100644
--- a/integration_test_suite/integration_tests/pom.xml
+++ b/integration_test_suite/integration_tests/pom.xml
@@ -197,6 +197,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.18.0</version>
+                <configuration>
+                    <rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/integration_test_suite/jmx_example_application/pom.xml b/integration_test_suite/jmx_example_application/pom.xml
index 55fdc4f7..62f02179 100644
--- a/integration_test_suite/jmx_example_application/pom.xml
+++ b/integration_test_suite/jmx_example_application/pom.xml
@@ -135,6 +135,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.18.0</version>
+                <configuration>
+                    <rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/integration_test_suite/jmx_example_application/version-rules.xml b/integration_test_suite/jmx_example_application/version-rules.xml
index 5c6d3959..86d349fa 100644
--- a/integration_test_suite/jmx_example_application/version-rules.xml
+++ b/integration_test_suite/jmx_example_application/version-rules.xml
@@ -1,6 +1,7 @@
 <ruleset comparisonMethod="maven"
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
-    <rules>
-    </rules>
+    <ignoreVersions>
+        <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|b|beta|Dev|Beta|BETA|rc|RC|M|EA|SNAPSHOT)[-_\.]?[0-9]*</ignoreVersion>
+    </ignoreVersions>
 </ruleset>
diff --git a/integration_test_suite/pom.xml b/integration_test_suite/pom.xml
index 5ceeeb34..6bc71e33 100644
--- a/integration_test_suite/pom.xml
+++ b/integration_test_suite/pom.xml
@@ -98,6 +98,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.18.0</version>
+                <configuration>
+                    <rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/integration_test_suite/version-rules.xml b/integration_test_suite/version-rules.xml
index 76f8da4f..8a3cc61d 100644
--- a/integration_test_suite/version-rules.xml
+++ b/integration_test_suite/version-rules.xml
@@ -1,6 +1,7 @@
 <ruleset comparisonMethod="maven"
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
-    <rules>
-    </rules>
+    <ignoreVersions>
+        <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|b|beta|Dev|Beta|BETA|rc|RC|M|EA|SNAPSHOT)[-_\.]?[0-9]*</ignoreVersion>
+    </ignoreVersions>
 </ruleset>
\ No newline at end of file
diff --git a/jmx_prometheus_javaagent/version-rules.xml b/jmx_prometheus_javaagent/version-rules.xml
index 76f8da4f..8a3cc61d 100644
--- a/jmx_prometheus_javaagent/version-rules.xml
+++ b/jmx_prometheus_javaagent/version-rules.xml
@@ -1,6 +1,7 @@
 <ruleset comparisonMethod="maven"
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
-    <rules>
-    </rules>
+    <ignoreVersions>
+        <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|b|beta|Dev|Beta|BETA|rc|RC|M|EA|SNAPSHOT)[-_\.]?[0-9]*</ignoreVersion>
+    </ignoreVersions>
 </ruleset>
\ No newline at end of file
diff --git a/jmx_prometheus_standalone/version-rules.xml b/jmx_prometheus_standalone/version-rules.xml
index 76f8da4f..8a3cc61d 100644
--- a/jmx_prometheus_standalone/version-rules.xml
+++ b/jmx_prometheus_standalone/version-rules.xml
@@ -1,6 +1,7 @@
 <ruleset comparisonMethod="maven"
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
-    <rules>
-    </rules>
+    <ignoreVersions>
+        <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|b|beta|Dev|Beta|BETA|rc|RC|M|EA|SNAPSHOT)[-_\.]?[0-9]*</ignoreVersion>
+    </ignoreVersions>
 </ruleset>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4083a7db..a64cfb88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,9 @@
                         </goals>
                         <configuration>
                             <rules>
-                                <requirePluginVersions />
+                                <requireMavenVersion>
+                                    <version>3.9.6</version>
+                                </requireMavenVersion>
                             </rules>
                         </configuration>
                     </execution>
@@ -233,6 +235,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.18.0</version>
+                <configuration>
+                    <rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/version-rules.xml b/version-rules.xml
index 76f8da4f..8a3cc61d 100644
--- a/version-rules.xml
+++ b/version-rules.xml
@@ -1,6 +1,7 @@
 <ruleset comparisonMethod="maven"
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
-    <rules>
-    </rules>
+    <ignoreVersions>
+        <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|b|beta|Dev|Beta|BETA|rc|RC|M|EA|SNAPSHOT)[-_\.]?[0-9]*</ignoreVersion>
+    </ignoreVersions>
 </ruleset>
\ No newline at end of file