Merge branch 'main' into feature/141-migrate-from-lombok-value-to-jav…

…a-records
kevin0x90 · Oct 19, 2023 · 8409899 · 8409899
2 parents b66f1cb + a99ae36
commit 8409899
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...n/java/org/openrewrite/java/migrate/maven/UseMavenCompilerPluginReleaseConfiguration.java b/...n/java/org/openrewrite/java/migrate/maven/UseMavenCompilerPluginReleaseConfiguration.java
@@ -65,8 +65,8 @@ public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
                 }
                 Optional<Xml.Tag> maybeCompilerPlugin = t.getChildren().stream()
                         .filter(plugin -> "plugin".equals(plugin.getName())
-                                && "org.apache.maven.plugins".equals(plugin.getChildValue("groupId").orElse(null))
-                                && "maven-compiler-plugin".equals(plugin.getChildValue("artifactId").orElse(null)))
+                                          && "org.apache.maven.plugins".equals(plugin.getChildValue("groupId").orElse("org.apache.maven.plugins"))
+                                          && "maven-compiler-plugin".equals(plugin.getChildValue("artifactId").orElse(null)))
                         .findAny();
                 Optional<Xml.Tag> maybeCompilerPluginConfig = maybeCompilerPlugin
                         .flatMap(it -> it.getChild("configuration"));

diff --git a/...va/org/openrewrite/java/migrate/maven/UseMavenCompilerPluginReleaseConfigurationTest.java b/...va/org/openrewrite/java/migrate/maven/UseMavenCompilerPluginReleaseConfigurationTest.java
@@ -212,7 +212,6 @@ void reusesJavaVersionVariableIfAvailable() {
               <build>
                 <plugins>
                   <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.0</version>
                     <configuration>
@@ -240,7 +239,6 @@ void reusesJavaVersionVariableIfAvailable() {
               <build>
                 <plugins>
                   <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.0</version>
                     <configuration>