Partially revert "Only bring down properties from the parent that are…

… referenced explicitly" This partially reverts commit 12c8f37
openrewrite · Sep 18, 2024 · b446840 · b446840
1 parent 010642d
commit b446840
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 33 deletions.
diff --git a/src/main/java/org/openrewrite/java/migrate/maven/UpdateMavenProjectPropertyJavaVersion.java b/src/main/java/org/openrewrite/java/migrate/maven/UpdateMavenProjectPropertyJavaVersion.java
@@ -79,7 +79,6 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new MavenIsoVisitor<ExecutionContext>() {
-            final Set<String> propertiesExplicitlyReferenced = new HashSet<>();
             boolean compilerPluginConfiguredExplicitly;
 
             @Override
@@ -99,7 +98,7 @@ public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
                 MavenResolutionResult mrr = getResolutionResult();
                 Map<String, String> currentProperties = mrr.getPom().getRequested().getProperties();
                 for (String property : JAVA_VERSION_PROPERTIES) {
-                    if (currentProperties.containsKey(property) || !propertiesExplicitlyReferenced.contains(property)) {
+                    if (currentProperties.containsKey(property)) {
                         continue;
                     }
                     d = (Xml.Document) new AddProperty(property, String.valueOf(version), null, false)
@@ -130,12 +129,8 @@ public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
             @Override
             public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
                 Xml.Tag t = super.visitTag(tag, ctx);
-                Optional<String> s = t.getValue()
-                        .map(it -> it.replace("${", "").replace("}", "").trim())
-                        .filter(JAVA_VERSION_PROPERTIES::contains);
-                if (s.isPresent()) {
-                    propertiesExplicitlyReferenced.add(s.get());
-                } else if (JAVA_VERSION_XPATH_MATCHERS.stream().anyMatch(matcher -> matcher.matches(getCursor()))) {
+
+                if (JAVA_VERSION_XPATH_MATCHERS.stream().anyMatch(matcher -> matcher.matches(getCursor()))) {
                     Optional<Float> maybeVersion = t.getValue().flatMap(
                             value -> {
                                 try {

diff --git a/...st/java/org/openrewrite/java/migrate/maven/UpdateMavenProjectPropertyJavaVersionTest.java b/...st/java/org/openrewrite/java/migrate/maven/UpdateMavenProjectPropertyJavaVersionTest.java
@@ -78,7 +78,7 @@ void basic() {
     }
 
     @Test
-    void bringsDownExplicitlyUsedPropertyFromRemoteParent() {
+    void overrideRemoteParent() {
         rewriteRun(
           //language=xml
           pomXml(
@@ -116,18 +116,6 @@ void bringsDownExplicitlyUsedPropertyFromRemoteParent() {
                     <artifactId>example-child</artifactId>
                     <version>1.0.0</version>
                     <modelVersion>4.0</modelVersion>
-                    <build>
-                      <plugins>
-                        <plugin>
-                          <groupId>org.apache.maven.plugins</groupId>
-                          <artifactId>maven-compiler-plugin</artifactId>
-                          <version>3.8.0</version>
-                          <configuration>
-                            <release>${java.version}</release>
-                          </configuration>
-                        </plugin>
-                      </plugins>
-                    </build>
                 </project>
                 """,
               """
@@ -145,19 +133,14 @@ void bringsDownExplicitlyUsedPropertyFromRemoteParent() {
                     <modelVersion>4.0</modelVersion>
                     <properties>
                         <java.version>17</java.version>
+                        <javaVersion>17</javaVersion>
+                        <jdk.version>17</jdk.version>
+                        <jdkVersion>17</jdkVersion>
+                        <maven.compiler.release>17</maven.compiler.release>
+                        <maven.compiler.source>17</maven.compiler.source>
+                        <maven.compiler.target>17</maven.compiler.target>
+                        <release.version>17</release.version>
                     </properties>
-                    <build>
-                      <plugins>
-                        <plugin>
-                          <groupId>org.apache.maven.plugins</groupId>
-                          <artifactId>maven-compiler-plugin</artifactId>
-                          <version>3.8.0</version>
-                          <configuration>
-                            <release>${java.version}</release>
-                          </configuration>
-                        </plugin>
-                      </plugins>
-                    </build>
                 </project>
                 """)
           )