Skip to content

Commit c728ac8

Browse files
committed
Manual merge of #55
1 parent 5c14818 commit c728ac8

File tree

6 files changed

+34
-19
lines changed

6 files changed

+34
-19
lines changed

jakarta-jsonp/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ working with JSON-P (JSON Processing) node types (new Jakarta flavor) via data-b
4949
<groupId>com.google.code.maven-replacer-plugin</groupId>
5050
<artifactId>replacer</artifactId>
5151
</plugin>
52+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
53+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
54+
<plugin>
55+
<groupId>org.gradlex</groupId>
56+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
57+
</plugin>
5258
</plugins>
5359
</build>
5460

jakarta-mail/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ working with Jakarta Mail types
3838
<groupId>com.google.code.maven-replacer-plugin</groupId>
3939
<artifactId>replacer</artifactId>
4040
</plugin>
41+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
42+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
43+
<plugin>
44+
<groupId>org.gradlex</groupId>
45+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
46+
</plugin>
4147
</plugins>
4248
</build>
4349
</project>

joda-money/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
<groupId>com.google.code.maven-replacer-plugin</groupId>
4545
<artifactId>replacer</artifactId>
4646
</plugin>
47+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
48+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
49+
<plugin>
50+
<groupId>org.gradlex</groupId>
51+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
52+
</plugin>
4753
</plugins>
4854
</build>
4955

json-org/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ mainly to make it easier to upgrade code to Jackson, using automated conversions
3939
<groupId>com.google.code.maven-replacer-plugin</groupId>
4040
<artifactId>replacer</artifactId>
4141
</plugin>
42+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
43+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
44+
<plugin>
45+
<groupId>org.gradlex</groupId>
46+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
47+
</plugin>
4248
</plugins>
4349
</build>
4450

jsr-353/pom.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ working with JSR-353 (JSON-P) node types via data-binding
5252

5353
<build>
5454
<plugins>
55-
<plugin>
56-
<groupId>com.google.code.maven-replacer-plugin</groupId>
57-
<artifactId>replacer</artifactId>
58-
</plugin>
5955
<!-- 18-Jan-2025, tatu: As per above, we cannot really run tests with JPMS.
6056
So. Disable surefire plug-in altogether
6157
-->
@@ -66,6 +62,16 @@ working with JSR-353 (JSON-P) node types via data-binding
6662
<skipTests>true</skipTests>
6763
</configuration>
6864
</plugin>
65+
<plugin>
66+
<groupId>com.google.code.maven-replacer-plugin</groupId>
67+
<artifactId>replacer</artifactId>
68+
</plugin>
69+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
70+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
71+
<plugin>
72+
<groupId>org.gradlex</groupId>
73+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
74+
</plugin>
6975
</plugins>
7076
</build>
7177

pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,8 @@
9191
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
9292
<groupId>com.google.code.maven-replacer-plugin</groupId>
9393
<artifactId>replacer</artifactId>
94-
<executions>
95-
<execution>
96-
<id>process-packageVersion</id>
97-
<phase>generate-sources</phase>
98-
</execution>
99-
</executions>
10094
</plugin>
10195
</plugins>
10296
</pluginManagement>
103-
104-
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
105-
<plugins>
106-
<plugin>
107-
<groupId>de.jjohannes</groupId>
108-
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
109-
</plugin>
110-
</plugins>
11197
</build>
112-
11398
</project>

0 commit comments

Comments
 (0)