Skip to content

Commit b4a8d2a

Browse files
committed
apply pr feedback
1 parent c07d7b3 commit b4a8d2a

File tree

2 files changed

+33
-8
lines changed

2 files changed

+33
-8
lines changed

src/main/resources/META-INF/rewrite/jaxb-plugins.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 the original author or authors.
2+
# Copyright 2025 the original author or authors.
33
# <p>
44
# Licensed under the Moderne Source Available License (the "License");
55
# you may not use this file except in compliance with the License.
@@ -26,11 +26,10 @@ recipeList:
2626
oldGroupId: org.jvnet.jax-ws-commons
2727
oldArtifactId: jaxws-maven-plugin
2828
newGroupId: com.sun.xml.ws
29-
newVersion: 2.3.5
30-
- org.openrewrite.maven.ChangePluginExecutions:
31-
groupId: org.jvnet.jax-ws-commons
32-
artifactId: jaxws-maven-plugin
33-
executions: "<id>wsimport-from-jdk</id><phase>generate-sources</phase><goals><goal>wsimport</goal></goals>"
29+
newVersion: 2.3.7
30+
- org.openrewrite.xml.AddOrUpdateChildTag:
31+
parentXPath: //plugin[artifactId='jaxws-maven-plugin']/executions/execution
32+
newChildTag: <phase>generate-sources</phase>
3433
- org.openrewrite.xml.ChangeTagName:
35-
elementName: '/project/build/plugins/plugin/executions/execution/configuration/nocompile'
34+
elementName: //plugin[artifactId='jaxws-maven-plugin']/executions/execution/configuration/nocompile
3635
newName: xnocompile

src/test/java/org/openrewrite/java/migrate/maven/MigrateJaxwsMavenPluginTest.java

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.openrewrite.test.RecipeSpec;
2121
import org.openrewrite.test.RewriteTest;
2222

23+
import static org.assertj.core.api.Assertions.assertThat;
2324
import static org.openrewrite.maven.Assertions.pomXml;
2425

2526
class MigrateJaxwsMavenPluginTest implements RewriteTest {
@@ -67,6 +68,18 @@ void migrateJaxwsPluginFromJvnetToSunXmlWs() {
6768
</execution>
6869
</executions>
6970
</plugin>
71+
<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-compiler-plugin</artifactId>
74+
<version>3.14.1</version>
75+
<executions>
76+
<execution>
77+
<configuration>
78+
<nocompile>true</nocompile>
79+
</configuration>
80+
</execution>
81+
</executions>
82+
</plugin>
7083
</plugins>
7184
</build>
7285
</project>
@@ -82,7 +95,7 @@ void migrateJaxwsPluginFromJvnetToSunXmlWs() {
8295
<plugin>
8396
<groupId>com.sun.xml.ws</groupId>
8497
<artifactId>jaxws-maven-plugin</artifactId>
85-
<version>2.3.5</version>
98+
<version>2.3.7</version>
8699
<executions>
87100
<execution>
88101
<id>wsimport-from-jdk</id>
@@ -100,6 +113,19 @@ void migrateJaxwsPluginFromJvnetToSunXmlWs() {
100113
<xnocompile>true</xnocompile>
101114
<verbose>true</verbose>
102115
</configuration>
116+
<phase>generate-sources</phase>
117+
</execution>
118+
</executions>
119+
</plugin>
120+
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
122+
<artifactId>maven-compiler-plugin</artifactId>
123+
<version>3.14.1</version>
124+
<executions>
125+
<execution>
126+
<configuration>
127+
<nocompile>true</nocompile>
128+
</configuration>
103129
</execution>
104130
</executions>
105131
</plugin>

0 commit comments

Comments
 (0)