From 9dc5e0d679d4db05be35e75855b9d1e01acf86e8 Mon Sep 17 00:00:00 2001
From: m-schutte-ohra-nl <122434759+m-schutte-ohra-nl@users.noreply.github.com>
Date: Tue, 27 Aug 2024 21:59:38 +0200
Subject: [PATCH] Improve speed of versions:resolve-ranges in case parents
 contain many version properties - fix #1121

---
 .../it-resolve-ranges-issue-1121-parent.pom   | 22 +++++++++++++++++++
 .../invoker.properties                        |  1 +
 .../it/it-resolve-ranges-issue-1121/pom.xml   | 19 ++++++++++++++++
 .../it-resolve-ranges-issue-1121/verify.bsh   | 21 ++++++++++++++++++
 .../mojo/versions/ResolveRangesMojo.java      |  7 ++++++
 5 files changed, 70 insertions(+)
 create mode 100644 versions-maven-plugin/src/it-repo/it-resolve-ranges-issue-1121-parent.pom
 create mode 100644 versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/invoker.properties
 create mode 100644 versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/pom.xml
 create mode 100644 versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/verify.bsh

diff --git a/versions-maven-plugin/src/it-repo/it-resolve-ranges-issue-1121-parent.pom b/versions-maven-plugin/src/it-repo/it-resolve-ranges-issue-1121-parent.pom
new file mode 100644
index 0000000000..da57e65cb0
--- /dev/null
+++ b/versions-maven-plugin/src/it-repo/it-resolve-ranges-issue-1121-parent.pom
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>localhost</groupId>
+  <artifactId>it-resolve-ranges-issue-1121-parent</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <dummy.api.version>1.1.1</dummy.api.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>localhost</groupId>
+      <artifactId>dummy-api</artifactId>
+      <version>${dummy.api.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/invoker.properties
new file mode 100644
index 0000000000..bdb73fc388
--- /dev/null
+++ b/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/invoker.properties
@@ -0,0 +1 @@
+invoker.goals=-X ${project.groupId}:${project.artifactId}:${project.version}:resolve-ranges
diff --git a/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/pom.xml
new file mode 100644
index 0000000000..38e70793cb
--- /dev/null
+++ b/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/pom.xml
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>localhost</groupId>
+    <artifactId>it-resolve-ranges-issue-1121-parent</artifactId>
+    <version>1.0</version>
+  </parent>
+  <artifactId>it-resolve-ranges-issues-1121</artifactId>
+  <packaging>pom</packaging>
+  <name>resolve-ranges IT issue 1121</name>
+
+  <description>Test that resolve-ranges recognizes a property that overrides a property in its parent that is used as a version itself</description>
+
+  <properties>
+    <dummy.api.version>[1,3.0)</dummy.api.version>
+  </properties>
+</project>
diff --git a/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/verify.bsh b/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/verify.bsh
new file mode 100644
index 0000000000..82ecabcd30
--- /dev/null
+++ b/versions-maven-plugin/src/it/it-resolve-ranges-issue-1121/verify.bsh
@@ -0,0 +1,21 @@
+import java.io.*;
+import org.codehaus.plexus.util.FileUtils;
+
+try
+{
+    File file = new File( basedir, "pom.xml" );
+    String buf = FileUtils.fileRead( file, "UTF-8" );
+
+    if ( buf.indexOf( "<dummy.api.version>2.1</dummy.api.version>" ) < 0 ) 
+    {
+        System.err.println( "Version of dummy-api not resolved" );
+        return false;
+    }
+}
+catch( Throwable t )
+{
+    t.printStackTrace();
+    return false;
+}
+
+return true;
diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java
index 8b12b5ca4f..4fba62e60e 100644
--- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java
@@ -25,8 +25,10 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.Artifact;
@@ -277,6 +279,11 @@ private void resolveRanges(ModifiedPomXMLEventReader pom, Collection<Dependency>
     private void resolvePropertyRanges(ModifiedPomXMLEventReader pom)
             throws XMLStreamException, MojoExecutionException {
 
+        if (includeProperties == null) {
+            Properties originalProperties = getProject().getOriginalModel().getProperties();
+            includeProperties =
+                    originalProperties.stringPropertyNames().stream().collect(Collectors.joining(","));
+        }
         Map<Property, PropertyVersions> propertyVersions = this.getHelper()
                 .getVersionPropertiesMap(VersionsHelper.VersionPropertiesMapRequest.builder()
                         .withMavenProject(getProject())