From 86ae0f10e668b825fb1379258c3924f55980df97 Mon Sep 17 00:00:00 2001
From: hoanamzn <hoanamzn@amazon.com>
Date: Tue, 16 Jul 2024 14:35:02 -0700
Subject: [PATCH 1/4] Exclude Maven built-in property from circular placeholder
 reference check.

---
 .../internal/PropertyPlaceholderHelper.java   | 21 +++++++++++++++-
 .../PropertyPlaceholderHelperTest.java        | 25 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java b/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
index 3c6ebdd1132..d8ce11c314e 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
@@ -15,6 +15,7 @@
  */
 package org.openrewrite.internal;
 
+import org.openrewrite.internal.lang.NonNull;
 import org.openrewrite.internal.lang.Nullable;
 
 import java.util.*;
@@ -27,12 +28,21 @@
  * @author Rob Harrop
  */
 public class PropertyPlaceholderHelper {
+
     private static final Map<String, String> wellKnownSimplePrefixes = new HashMap<>(4);
 
+    private static final List<String> MAVEN_BUILT_IN_PROPERTY_PREFIXES = new ArrayList<>();
+
     static {
         wellKnownSimplePrefixes.put("}", "{");
         wellKnownSimplePrefixes.put("]", "[");
         wellKnownSimplePrefixes.put(")", "(");
+
+        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("project.");
+        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("pom.");
+        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("maven.");
+        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("env.");
+        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("settings.");
     }
 
     private final String placeholderPrefix;
@@ -88,7 +98,7 @@ protected String parseStringValue(String value, Function<String, String> placeho
                 if (visitedPlaceholders == null) {
                     visitedPlaceholders = new HashSet<>(4);
                 }
-                if (!visitedPlaceholders.add(originalPlaceholder)) {
+                if (!visitedPlaceholders.add(originalPlaceholder) && !isMavenBuiltInProperty(originalPlaceholder)) {
                     throw new IllegalArgumentException(
                             "Circular placeholder reference '" + originalPlaceholder + "' in property definitions");
                 }
@@ -160,4 +170,13 @@ private static boolean substringMatch(CharSequence str, int index, CharSequence
         }
         return true;
     }
+
+    private static boolean isMavenBuiltInProperty(@NonNull final String originalPlaceholder) {
+        for (final String prefix : MAVEN_BUILT_IN_PROPERTY_PREFIXES) {
+            if (originalPlaceholder.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java b/rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java
index 532bdd46c93..1377b6ebefe 100644
--- a/rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java
@@ -17,6 +17,10 @@
 
 import org.junit.jupiter.api.Test;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Function;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 class PropertyPlaceholderHelperTest {
@@ -31,4 +35,25 @@ void dashed() {
         });
         assertThat(s).isEqualTo("hi jon");
     }
+
+    @Test
+    void testMavenBuiltInProperty() {
+        var helper = new PropertyPlaceholderHelper("${", "}", null);
+        final Set<String> visitedPlaceholders = new HashSet<>();
+        visitedPlaceholders.add("project.version");
+        visitedPlaceholders.add("pom.basedir");
+        visitedPlaceholders.add("maven.home");
+        visitedPlaceholders.add("env.PATH");
+        visitedPlaceholders.add("settings.localRepository");
+        assertThat(helper.parseStringValue("${project.version}", Function.identity(), visitedPlaceholders))
+          .isEqualTo("project.version");
+        assertThat(helper.parseStringValue("${pom.basedir}", Function.identity(), visitedPlaceholders))
+          .isEqualTo("pom.basedir");
+        assertThat(helper.parseStringValue("${maven.home}", Function.identity(), visitedPlaceholders))
+          .isEqualTo("maven.home");
+        assertThat(helper.parseStringValue("${env.PATH}", Function.identity(), visitedPlaceholders))
+          .isEqualTo("env.PATH");
+        assertThat(helper.parseStringValue("${settings.localRepository}", Function.identity(), visitedPlaceholders))
+          .isEqualTo("settings.localRepository");
+    }
 }

From 34decaf7cb11be0af0c2ec8d608295d27789faea Mon Sep 17 00:00:00 2001
From: hoanamzn <hoanamzn@amazon.com>
Date: Tue, 16 Jul 2024 22:57:11 -0700
Subject: [PATCH 2/4] Revert "Exclude Maven built-in property from circular
 placeholder reference check."

This reverts commit 86ae0f10e668b825fb1379258c3924f55980df97.
---
 .../internal/PropertyPlaceholderHelper.java   | 21 +---------------
 .../PropertyPlaceholderHelperTest.java        | 25 -------------------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java b/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
index d8ce11c314e..3c6ebdd1132 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
@@ -15,7 +15,6 @@
  */
 package org.openrewrite.internal;
 
-import org.openrewrite.internal.lang.NonNull;
 import org.openrewrite.internal.lang.Nullable;
 
 import java.util.*;
@@ -28,21 +27,12 @@
  * @author Rob Harrop
  */
 public class PropertyPlaceholderHelper {
-
     private static final Map<String, String> wellKnownSimplePrefixes = new HashMap<>(4);
 
-    private static final List<String> MAVEN_BUILT_IN_PROPERTY_PREFIXES = new ArrayList<>();
-
     static {
         wellKnownSimplePrefixes.put("}", "{");
         wellKnownSimplePrefixes.put("]", "[");
         wellKnownSimplePrefixes.put(")", "(");
-
-        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("project.");
-        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("pom.");
-        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("maven.");
-        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("env.");
-        MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("settings.");
     }
 
     private final String placeholderPrefix;
@@ -98,7 +88,7 @@ protected String parseStringValue(String value, Function<String, String> placeho
                 if (visitedPlaceholders == null) {
                     visitedPlaceholders = new HashSet<>(4);
                 }
-                if (!visitedPlaceholders.add(originalPlaceholder) && !isMavenBuiltInProperty(originalPlaceholder)) {
+                if (!visitedPlaceholders.add(originalPlaceholder)) {
                     throw new IllegalArgumentException(
                             "Circular placeholder reference '" + originalPlaceholder + "' in property definitions");
                 }
@@ -170,13 +160,4 @@ private static boolean substringMatch(CharSequence str, int index, CharSequence
         }
         return true;
     }
-
-    private static boolean isMavenBuiltInProperty(@NonNull final String originalPlaceholder) {
-        for (final String prefix : MAVEN_BUILT_IN_PROPERTY_PREFIXES) {
-            if (originalPlaceholder.startsWith(prefix)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java b/rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java
index 1377b6ebefe..532bdd46c93 100644
--- a/rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java
@@ -17,10 +17,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Function;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 class PropertyPlaceholderHelperTest {
@@ -35,25 +31,4 @@ void dashed() {
         });
         assertThat(s).isEqualTo("hi jon");
     }
-
-    @Test
-    void testMavenBuiltInProperty() {
-        var helper = new PropertyPlaceholderHelper("${", "}", null);
-        final Set<String> visitedPlaceholders = new HashSet<>();
-        visitedPlaceholders.add("project.version");
-        visitedPlaceholders.add("pom.basedir");
-        visitedPlaceholders.add("maven.home");
-        visitedPlaceholders.add("env.PATH");
-        visitedPlaceholders.add("settings.localRepository");
-        assertThat(helper.parseStringValue("${project.version}", Function.identity(), visitedPlaceholders))
-          .isEqualTo("project.version");
-        assertThat(helper.parseStringValue("${pom.basedir}", Function.identity(), visitedPlaceholders))
-          .isEqualTo("pom.basedir");
-        assertThat(helper.parseStringValue("${maven.home}", Function.identity(), visitedPlaceholders))
-          .isEqualTo("maven.home");
-        assertThat(helper.parseStringValue("${env.PATH}", Function.identity(), visitedPlaceholders))
-          .isEqualTo("env.PATH");
-        assertThat(helper.parseStringValue("${settings.localRepository}", Function.identity(), visitedPlaceholders))
-          .isEqualTo("settings.localRepository");
-    }
 }

From 5034df072474f0e67c888be90a22227e6630211a Mon Sep 17 00:00:00 2001
From: hoanamzn <hoanamzn@amazon.com>
Date: Tue, 16 Jul 2024 23:06:11 -0700
Subject: [PATCH 3/4] Give explicit property definitions higher precedence than
 Maven's implicit ones.

---
 .../openrewrite/maven/tree/ResolvedPom.java   |  6 ++-
 .../openrewrite/maven/MavenParserTest.java    | 50 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
index e970abd798f..8790900a5fb 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
@@ -278,6 +278,10 @@ private String getProperty(@Nullable String property) {
         if (property == null) {
             return null;
         }
+        final String propVal = properties.get(property);
+        if (propVal != null) {
+            return propVal;
+        }
         switch (property) {
             case "groupId":
             case "project.groupId":
@@ -302,7 +306,7 @@ private String getProperty(@Nullable String property) {
                 return requested.getParent() != null ? requested.getParent().getVersion() : null;
         }
 
-        return System.getProperty(property, properties.get(property));
+        return System.getProperty(property);
     }
 
     @Nullable
diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java
index 05d37789d11..e2580a456c5 100644
--- a/rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java
+++ b/rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java
@@ -3107,4 +3107,54 @@ void circularImportDependency() {
           )
         );
     }
+
+    @Test
+    void circularMavenProperty() {
+        rewriteRun(
+          mavenProject("root",
+            pomXml(
+              """
+                <project>
+                            <groupId>example</groupId>
+                            <artifactId>example-root</artifactId>
+                            <packaging>pom</packaging>
+                            <version>1.0.0</version>
+                          
+                            <properties>
+                              <project.version>1.0.1</project.version>
+                            </properties>
+                          
+                            <modules>
+                              <module>example-child</module>
+                            </modules>
+                </project>
+                """,
+              spec -> spec.afterRecipe(pomXml -> assertThat(
+                pomXml.getMarkers().findFirst(MavenResolutionResult.class).orElseThrow()
+                  .getPom().getProperties().get("project.version"))
+                .isEqualTo("1.0.1"))
+            ),
+            mavenProject("circular-example-child",
+              pomXml(
+                """
+                  <project>
+                              <parent>
+                                <groupId>example</groupId>
+                                <artifactId>example-root</artifactId>
+                                <version>1.0.0</version>
+                              </parent>
+                            
+                              <artifactId>example-child</artifactId>
+                              <version>${project.version}</version>
+                  </project>
+                  """,
+                spec -> spec.afterRecipe(pomXml -> {
+                    MavenResolutionResult resolution = pomXml.getMarkers().findFirst(MavenResolutionResult.class).orElseThrow();
+                    assertThat(resolution.getPom().getVersion()).isEqualTo("1.0.1");
+                })
+              )
+            )
+          )
+        );
+    }
 }

From 18b434c57d309895a349e1f40bfbd0017b96fbab Mon Sep 17 00:00:00 2001
From: Tim te Beek <tim@moderne.io>
Date: Wed, 17 Jul 2024 10:45:27 +0200
Subject: [PATCH 4/4] Reformat test

---
 .../openrewrite/maven/tree/ResolvedPom.java   |   2 +-
 .../openrewrite/maven/MavenParserTest.java    | 238 +++++++++---------
 2 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
index 8790900a5fb..a900ba4a057 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
@@ -278,7 +278,7 @@ private String getProperty(@Nullable String property) {
         if (property == null) {
             return null;
         }
-        final String propVal = properties.get(property);
+        String propVal = properties.get(property);
         if (propVal != null) {
             return propVal;
         }
diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java
index e2580a456c5..791f5d3208e 100644
--- a/rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java
+++ b/rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java
@@ -55,7 +55,7 @@ void rangeVersion() {
                 <groupId>com.mycompany.app</groupId>
                 <artifactId>my-app</artifactId>
                 <version>1</version>
-              
+
                 <dependencies>
                   <dependency>
                     <groupId>junit</groupId>
@@ -79,7 +79,7 @@ void skipDependencyResolution() {
                 <groupId>com.mycompany.app</groupId>
                 <artifactId>my-app</artifactId>
                 <version>1</version>
-              
+
                 <dependencies>
                   <dependency>
                     <groupId>foo</groupId>
@@ -128,7 +128,7 @@ void invalidRange() {
                   <groupId>com.mycompany.app</groupId>
                   <artifactId>my-app</artifactId>
                   <version>1</version>
-                
+
                   <dependencies>
                     <dependency>
                       <groupId>junit</groupId>
@@ -517,7 +517,7 @@ void parse() {
             """
               <project>
                   <modelVersion>4.0.0</modelVersion>
-              
+
                   <groupId>com.mycompany.app</groupId>
                   <artifactId>my-app</artifactId>
                   <version>1</version>
@@ -527,7 +527,7 @@ void parse() {
                           <name>Trygve Laugst&oslash;l</name>
                       </developer>
                   </developers>
-              
+
                   <dependencies>
                     <dependency>
                       <groupId>org.junit.jupiter</groupId>
@@ -583,11 +583,11 @@ void handlesRepositories() {
             """
               <project>
                   <modelVersion>4.0.0</modelVersion>
-              
+
                   <groupId>org.openrewrite.maven</groupId>
                   <artifactId>single-project</artifactId>
                   <version>0.1.0-SNAPSHOT</version>
-              
+
                   <dependencies>
                       <dependency>
                           <groupId>com.google.guava</groupId>
@@ -595,7 +595,7 @@ void handlesRepositories() {
                           <version>29.0-jre</version>
                       </dependency>
                   </dependencies>
-              
+
                   <repositories>
                       <repository>
                           <id>jcenter</id>
@@ -617,15 +617,15 @@ void handlesPropertiesInDependencyScope() {
             """
               <project>
                   <modelVersion>4.0.0</modelVersion>
-              
+
                   <groupId>org.openrewrite.maven</groupId>
                   <artifactId>single-project</artifactId>
                   <version>0.1.0-SNAPSHOT</version>
-              
+
                   <properties>
                       <dependency.scope>compile</dependency.scope>
                   </properties>
-              
+
                   <dependencies>
                       <dependency>
                           <groupId>com.google.guava</groupId>
@@ -677,11 +677,11 @@ void selfRecursiveParent() {
             """
               <project>
                   <modelVersion>4.0.0</modelVersion>
-              
+
                   <groupId>com.mycompany.app</groupId>
                   <artifactId>my-app</artifactId>
                   <version>1</version>
-              
+
                   <parent>
                       <groupId>com.mycompany.app</groupId>
                       <artifactId>my-app</artifactId>
@@ -701,11 +701,11 @@ void selfRecursiveDependency() {
             """
               <project>
                   <modelVersion>4.0.0</modelVersion>
-              
+
                   <groupId>com.mycompany.app</groupId>
                   <artifactId>my-app</artifactId>
                   <version>1</version>
-              
+
                   <dependencies>
                       <dependency>
                           <groupId>com.mycompany.app</groupId>
@@ -893,11 +893,11 @@ public MockResponse dispatch(RecordedRequest request) {
                         resp.setBody("""
                           <project>
                             <modelVersion>4.0.0</modelVersion>
-                          
+                                                    
                             <groupId>com.foo</groupId>
                             <artifactId>bar</artifactId>
                             <version>1.0.0</version>
-                          
+                                                    
                           </project>
                           """
                         );
@@ -940,11 +940,11 @@ public MockResponse dispatch(RecordedRequest request) {
               """
                     <project>
                         <modelVersion>4.0.0</modelVersion>
-                
+
                         <groupId>org.openrewrite.test</groupId>
                         <artifactId>foo</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <dependencies>
                             <dependency>
                                 <groupId>com.foo</groupId>
@@ -1130,17 +1130,17 @@ void indirectBomImportedFromParent() {
               """
                     <project>
                         <modelVersion>4.0.0</modelVersion>
-                
+
                         <artifactId>b</artifactId>
                         <groupId>org.openrewrite.maven</groupId>
                         <version>0.1.0-SNAPSHOT</version>
                         <packaging>pom</packaging>
-                
+
                         <properties>
                             <maven.compiler.source>1.8</maven.compiler.source>
                             <maven.compiler.target>1.8</maven.compiler.target>
                         </properties>
-                
+
                         <dependencyManagement>
                             <dependencies>
                                 <dependency>
@@ -1161,12 +1161,12 @@ void indirectBomImportedFromParent() {
               """
                     <project>
                         <modelVersion>4.0.0</modelVersion>
-                
+
                         <artifactId>c</artifactId>
                         <groupId>org.openrewrite.maven</groupId>
                         <version>0.1.0-SNAPSHOT</version>
                         <packaging>pom</packaging>
-                
+
                         <dependencyManagement>
                             <dependencies>
                                 <dependency>
@@ -1185,11 +1185,11 @@ void indirectBomImportedFromParent() {
               """
                     <project>
                         <modelVersion>4.0.0</modelVersion>
-                
+
                         <groupId>org.openrewrite.maven</groupId>
                         <artifactId>d</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <properties>
                             <maven.compiler.source>1.8</maven.compiler.source>
                             <maven.compiler.target>1.8</maven.compiler.target>
@@ -1406,7 +1406,7 @@ void dependencyManagementPropagatesToDependencies() {
                         <artifactId>a-parent</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
                         <packaging>pom</packaging>
-                
+
                         <dependencyManagement>
                             <dependencies>
                                 <dependency>
@@ -1429,9 +1429,9 @@ void dependencyManagementPropagatesToDependencies() {
                               <version>0.1.0-SNAPSHOT</version>
                               <relativePath />
                           </parent>
-                  
+
                           <artifactId>a</artifactId>
-                  
+
                           <dependencies>
                               <dependency>
                                   <groupId>org.openrewrite.maven</groupId>
@@ -1490,9 +1490,9 @@ void dependencyManagementPropagatesToDependencies() {
                                   <version>0.1.0-SNAPSHOT</version>
                                   <relativePath />
                               </parent>
-                      
+                                            
                               <artifactId>b</artifactId>
-                      
+                                            
                               <dependencies>
                                   <dependency>
                                       <groupId>org.openrewrite.maven</groupId>
@@ -1532,7 +1532,7 @@ void managedDependencyInTransitiveAndPom() {
                         <artifactId>a</artifactId>
                         <version>1.0.0</version>
                         <packaging>jar</packaging>
-                
+
                         <dependencyManagement>
                             <dependencies>
                                 <dependency>
@@ -1542,7 +1542,7 @@ void managedDependencyInTransitiveAndPom() {
                                 </dependency>
                             </dependencies>
                         </dependencyManagement>
-                
+
                         <dependencies>
                             <dependency>
                                 <groupId>junit</groupId>
@@ -1606,7 +1606,7 @@ void profileNoJdkActivation() {
                   <groupId>com.mycompany.app</groupId>
                   <artifactId>my-app</artifactId>
                   <version>1</version>
-              
+
                   <profiles>
                       <profile>
                           <id>old-jdk</id>
@@ -1812,11 +1812,11 @@ void ciFriendlyVersionWithParent() {
                 <artifactId>sample</artifactId>
                 <version>${revision}</version>
                 <packaging>pom</packaging>
-              
+
                 <modules>
                   <module>sample-rest</module>
                 </modules>
-              
+
               </project>
               """, spec -> spec.path("pom.xml")),
           pomXml(
@@ -1824,11 +1824,11 @@ void ciFriendlyVersionWithParent() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-              
+
                 <modelVersion>4.0.0</modelVersion>
                 <artifactId>sample-rest</artifactId>
                 <packaging>jar</packaging>
-              
+
                 <parent>
                   <groupId>net.sample</groupId>
                   <artifactId>sample</artifactId>
@@ -1854,14 +1854,14 @@ void canConnectProjectPomsWhenUsingCiFriendlyVersions() {
                 <artifactId>sample</artifactId>
                 <version>${revision}</version>
                 <packaging>pom</packaging>
-              
+
                 <modules>
                   <module>sample-parent</module>
                   <module>sample-app</module>
                   <module>sample-rest</module>
                   <module>sample-web</module>
                 </modules>
-              
+
                 <properties>
                   <revision>0.0.0-SNAPSHOT</revision>
                 </properties>
@@ -1877,11 +1877,11 @@ void canConnectProjectPomsWhenUsingCiFriendlyVersions() {
                 <groupId>net.sample</groupId>
                 <version>${revision}</version>
                 <packaging>pom</packaging>
-              
+
                 <properties>
                   <revision>0.0.0-SNAPSHOT</revision>
                 </properties>
-              
+
                 <dependencyManagement>
                   <dependencies>
                     <dependency>
@@ -1903,24 +1903,24 @@ void canConnectProjectPomsWhenUsingCiFriendlyVersions() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-              
+
                 <modelVersion>4.0.0</modelVersion>
                 <artifactId>sample-app</artifactId>
                 <packaging>jar</packaging>
-              
+
                 <parent>
                   <groupId>net.sample</groupId>
                   <artifactId>sample-parent</artifactId>
                   <version>${revision}</version>
                   <relativePath>../parent/pom.xml</relativePath>
                 </parent>
-              
+
                 <dependencies>
                   <dependency>
                     <groupId>net.sample</groupId>
                     <artifactId>sample-rest</artifactId>
                   </dependency>
-              
+
                   <dependency>
                     <groupId>net.sample</groupId>
                     <artifactId>sample-web</artifactId>
@@ -1933,11 +1933,11 @@ void canConnectProjectPomsWhenUsingCiFriendlyVersions() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-              
+
                 <modelVersion>4.0.0</modelVersion>
                 <artifactId>sample-rest</artifactId>
                 <packaging>jar</packaging>
-              
+
                 <parent>
                   <groupId>net.sample</groupId>
                   <artifactId>sample-parent</artifactId>
@@ -1951,11 +1951,11 @@ void canConnectProjectPomsWhenUsingCiFriendlyVersions() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-              
+
                 <modelVersion>4.0.0</modelVersion>
                 <artifactId>sample-web</artifactId>
                 <packaging>jar</packaging>
-              
+
                 <parent>
                   <groupId>net.sample</groupId>
                   <artifactId>sample-parent</artifactId>
@@ -1982,14 +1982,14 @@ void ciFriendlyVersionsStillWorkAfterUpdateMavenModel() {
                 <artifactId>sample</artifactId>
                 <version>${revision}</version>
                 <packaging>pom</packaging>
-              
+
                 <modules>
                   <module>sample-parent</module>
                   <module>sample-app</module>
                   <module>sample-rest</module>
                   <module>sample-web</module>
                 </modules>
-              
+
                 <properties>
                   <revision>0.0.0-SNAPSHOT</revision>
                 </properties>
@@ -2005,11 +2005,11 @@ void ciFriendlyVersionsStillWorkAfterUpdateMavenModel() {
                 <groupId>net.sample</groupId>
                 <version>${revision}</version>
                 <packaging>pom</packaging>
-              
+
                 <properties>
                   <revision>0.0.0-SNAPSHOT</revision>
                 </properties>
-              
+
                 <dependencyManagement>
                   <dependencies>
                     <dependency>
@@ -2031,29 +2031,29 @@ void ciFriendlyVersionsStillWorkAfterUpdateMavenModel() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-              
+
                 <modelVersion>4.0.0</modelVersion>
                 <artifactId>sample-app</artifactId>
                 <packaging>jar</packaging>
-              
+
                 <parent>
                   <groupId>net.sample</groupId>
                   <artifactId>sample-parent</artifactId>
                   <version>${revision}</version>
                   <relativePath>../parent/pom.xml</relativePath>
                 </parent>
-              
+
                 <dependencies>
                   <dependency>
                     <groupId>net.sample</groupId>
                     <artifactId>sample-rest</artifactId>
                   </dependency>
-              
+
                   <dependency>
                     <groupId>net.sample</groupId>
                     <artifactId>sample-web</artifactId>
                   </dependency>
-              
+
                   <dependency>
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
@@ -2065,29 +2065,29 @@ void ciFriendlyVersionsStillWorkAfterUpdateMavenModel() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-              
+
                 <modelVersion>4.0.0</modelVersion>
                 <artifactId>sample-app</artifactId>
                 <packaging>jar</packaging>
-              
+
                 <parent>
                   <groupId>net.sample</groupId>
                   <artifactId>sample-parent</artifactId>
                   <version>${revision}</version>
                   <relativePath>../parent/pom.xml</relativePath>
                 </parent>
-              
+
                 <dependencies>
                   <dependency>
                     <groupId>net.sample</groupId>
                     <artifactId>sample-rest</artifactId>
                   </dependency>
-              
+
                   <dependency>
                     <groupId>net.sample</groupId>
                     <artifactId>sample-web</artifactId>
                   </dependency>
-              
+
                   <dependency>
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
@@ -2101,11 +2101,11 @@ void ciFriendlyVersionsStillWorkAfterUpdateMavenModel() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-              
+
                 <modelVersion>4.0.0</modelVersion>
                 <artifactId>sample-rest</artifactId>
                 <packaging>jar</packaging>
-              
+
                 <parent>
                   <groupId>net.sample</groupId>
                   <artifactId>sample-parent</artifactId>
@@ -2119,11 +2119,11 @@ void ciFriendlyVersionsStillWorkAfterUpdateMavenModel() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-              
+
                 <modelVersion>4.0.0</modelVersion>
                 <artifactId>sample-web</artifactId>
                 <packaging>jar</packaging>
-              
+
                 <parent>
                   <groupId>net.sample</groupId>
                   <artifactId>sample-parent</artifactId>
@@ -2144,16 +2144,16 @@ void multipleCiFriendlyVersionPlaceholders() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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>bogus.example</groupId>
                 <artifactId>parent</artifactId>
                 <version>${revision}${changelist}</version>
                 <packaging>pom</packaging>
-              
+
                 <modules>
                   <module>sub</module>
                 </modules>
-              
+
                 <properties>
                   <revision>99999.0</revision>
                   <changelist>-SNAPSHOT</changelist>
@@ -2166,13 +2166,13 @@ void multipleCiFriendlyVersionPlaceholders() {
               <?xml version="1.0" encoding="UTF-8"?>
               <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>bogus.example</groupId>
                   <artifactId>parent</artifactId>
                   <version>${revision}${changelist}</version>
                 </parent>
-              
+
                 <artifactId>sub</artifactId>
               </project>
               """, spec -> spec.path("sub/pom.xml"))
@@ -2337,7 +2337,7 @@ void malformedPom() {
             <groupId>com.mycompany.app</groupId>
             <artifactId>my-app</artifactId>
             <version>1</version>
-          
+
             <dependencies>
               <dependency>
                 <groupId>junit</groupId>
@@ -2360,7 +2360,7 @@ void plugins() {
                   <groupId>org.openrewrite.maven</groupId>
                   <artifactId>a</artifactId>
                   <version>0.1.0-SNAPSHOT</version>
-              
+
                   <build>
                       <plugins>
                           <plugin>
@@ -2393,7 +2393,7 @@ void pluginWithoutConfig() {
                   <groupId>org.openrewrite.maven</groupId>
                   <artifactId>a</artifactId>
                   <version>0.1.0-SNAPSHOT</version>
-              
+
                   <build>
                       <plugins>
                           <plugin>
@@ -2444,9 +2444,9 @@ void pluginsFromParent() {
                         <groupId>org.openrewrite.maven</groupId>
                         <artifactId>b</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <packaging>pom</packaging>
-                
+
                         <build>
                           <plugins>
                               <plugin>
@@ -2474,7 +2474,7 @@ void pluginManagement() {
                   <groupId>org.openrewrite.maven</groupId>
                   <artifactId>a</artifactId>
                   <version>0.1.0-SNAPSHOT</version>
-              
+
                   <build>
                     <pluginManagement>
                       <plugins>
@@ -2529,9 +2529,9 @@ void pluginManagementFromParent() {
                         <groupId>org.openrewrite.maven</groupId>
                         <artifactId>b</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <packaging>pom</packaging>
-                
+
                         <build>
                         <pluginManagement>
                             <plugins>
@@ -2581,9 +2581,9 @@ void notInheritedPluginFromParent() {
                         <groupId>org.openrewrite.maven</groupId>
                         <artifactId>b</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <packaging>pom</packaging>
-                
+
                         <build>
                           <plugins>
                               <plugin>
@@ -2613,9 +2613,9 @@ void mergePluginConfig() {
                         <groupId>org.openrewrite.maven</groupId>
                         <artifactId>b</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <packaging>pom</packaging>
-                
+
                         <build>
                           <plugins>
                               <plugin>
@@ -2643,7 +2643,7 @@ void mergePluginConfig() {
                           <relativePath />
                       </parent>
                       <artifactId>a</artifactId>
-                
+
                       <build>
                           <plugins>
                               <plugin>
@@ -2678,9 +2678,9 @@ void mergePluginConfigListOverride() {
                         <groupId>org.openrewrite.maven</groupId>
                         <artifactId>b</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <packaging>pom</packaging>
-                
+
                         <build>
                           <plugins>
                             <plugin>
@@ -2710,7 +2710,7 @@ void mergePluginConfigListOverride() {
                           <relativePath />
                       </parent>
                       <artifactId>a</artifactId>
-                
+
                       <build>
                           <plugins>
                             <plugin>
@@ -2750,9 +2750,9 @@ void mergePluginConfigListAppend() {
                         <groupId>org.openrewrite.maven</groupId>
                         <artifactId>b</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <packaging>pom</packaging>
-                
+
                         <build>
                           <plugins>
                             <plugin>
@@ -2782,7 +2782,7 @@ void mergePluginConfigListAppend() {
                           <relativePath />
                       </parent>
                       <artifactId>a</artifactId>
-                
+
                       <build>
                           <plugins>
                             <plugin>
@@ -2825,9 +2825,9 @@ void mergePluginConfigListAppendOverride() {
                         <groupId>org.openrewrite.maven</groupId>
                         <artifactId>b</artifactId>
                         <version>0.1.0-SNAPSHOT</version>
-                
+
                         <packaging>pom</packaging>
-                
+
                         <build>
                           <plugins>
                             <plugin>
@@ -2857,7 +2857,7 @@ void mergePluginConfigListAppendOverride() {
                           <relativePath />
                       </parent>
                       <artifactId>a</artifactId>
-                
+
                       <build>
                           <plugins>
                             <plugin>
@@ -3115,18 +3115,18 @@ void circularMavenProperty() {
             pomXml(
               """
                 <project>
-                            <groupId>example</groupId>
-                            <artifactId>example-root</artifactId>
-                            <packaging>pom</packaging>
-                            <version>1.0.0</version>
-                          
-                            <properties>
-                              <project.version>1.0.1</project.version>
-                            </properties>
-                          
-                            <modules>
-                              <module>example-child</module>
-                            </modules>
+                    <groupId>example</groupId>
+                    <artifactId>example-root</artifactId>
+                    <packaging>pom</packaging>
+                    <version>1.0.0</version>
+
+                    <properties>
+                        <project.version>1.0.1</project.version>
+                    </properties>
+
+                    <modules>
+                        <module>example-child</module>
+                    </modules>
                 </project>
                 """,
               spec -> spec.afterRecipe(pomXml -> assertThat(
@@ -3138,20 +3138,20 @@ void circularMavenProperty() {
               pomXml(
                 """
                   <project>
-                              <parent>
-                                <groupId>example</groupId>
-                                <artifactId>example-root</artifactId>
-                                <version>1.0.0</version>
-                              </parent>
-                            
-                              <artifactId>example-child</artifactId>
-                              <version>${project.version}</version>
+                      <parent>
+                          <groupId>example</groupId>
+                          <artifactId>example-root</artifactId>
+                          <version>1.0.0</version>
+                      </parent>
+
+                      <artifactId>example-child</artifactId>
+                      <version>${project.version}</version>
                   </project>
                   """,
-                spec -> spec.afterRecipe(pomXml -> {
-                    MavenResolutionResult resolution = pomXml.getMarkers().findFirst(MavenResolutionResult.class).orElseThrow();
-                    assertThat(resolution.getPom().getVersion()).isEqualTo("1.0.1");
-                })
+                spec -> spec.afterRecipe(pomXml -> assertThat(
+                  pomXml.getMarkers().findFirst(MavenResolutionResult.class).orElseThrow()
+                    .getPom().getVersion())
+                  .isEqualTo("1.0.1"))
               )
             )
           )