Skip to content

Commit 608b13b

Browse files
jjohannescowtowncoder
jjohannes
authored and
cowtowncoder
committed
[gradle-module-metadata-maven-plugin] update to version 1.0 (#287)
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
1 parent d23e7f1 commit 608b13b

File tree

11 files changed

+73
-87
lines changed

11 files changed

+73
-87
lines changed

‎afterburner/pom.xml

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -77,40 +77,14 @@ field access and method calls
7777
<artifactId>replacer</artifactId>
7878
</plugin>
7979

80-
<plugin>
81-
<groupId>de.jjohannes</groupId>
82-
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
83-
</plugin>
84-
8580
<!-- 03-Feb-2025, tatu: No more shading of ByteBuddy
8681
(see [modules-base#284])
8782
-->
83+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
84+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
8885
<plugin>
89-
<groupId>io.github.floverfelt</groupId>
90-
<artifactId>find-and-replace-maven-plugin</artifactId>
91-
<version>1.1.0</version>
92-
<executions>
93-
<execution>
94-
<id>exec</id>
95-
<phase>package</phase>
96-
<goals>
97-
<goal>find-and-replace</goal>
98-
</goals>
99-
<configuration>
100-
<replacementType>file-contents</replacementType>
101-
<baseDir>${basedir}</baseDir>
102-
<findRegex><![CDATA[<modelVersion>4.0.0</modelVersion>]]></findRegex>
103-
<fileMask>dependency-reduced-pom.xml</fileMask>
104-
<replaceValue><![CDATA[ <!-- This module was also published with a richer model, Gradle metadata, -->
105-
<!-- which should be used instead. Do not delete the following line which -->
106-
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
107-
<!-- that they should prefer consuming it instead. -->
108-
<!-- do_not_remove: published-with-gradle-metadata -->
109-
<modelVersion>4.0.0</modelVersion>]]></replaceValue>
110-
<recursive>false</recursive>
111-
</configuration>
112-
</execution>
113-
</executions>
86+
<groupId>org.gradlex</groupId>
87+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
11488
</plugin>
11589
</plugins>
11690
</build>

‎android-record/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,13 @@
7373
</executions>
7474
</plugin>
7575

76+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
77+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
78+
<plugin>
79+
<groupId>org.gradlex</groupId>
80+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
81+
</plugin>
82+
7683
<plugin>
7784
<groupId>org.codehaus.mojo</groupId>
7885
<artifactId>animal-sniffer-maven-plugin</artifactId>

‎blackbird/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ that uses LambdaMetafactory based code generation to replace reflection calls.
5050
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
5151
<groupId>com.google.code.maven-replacer-plugin</groupId>
5252
<artifactId>replacer</artifactId>
53-
<executions>
54-
<execution>
55-
<id>process-packageVersion</id>
56-
<phase>generate-sources</phase>
57-
</execution>
58-
</executions>
53+
</plugin>
54+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
55+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
56+
<plugin>
57+
<groupId>org.gradlex</groupId>
58+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
5959
</plugin>
6060
</plugins>
6161
</build>

‎guice/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,14 @@
6161
<build>
6262
<plugins>
6363
<plugin>
64-
<groupId>com.google.code.maven-replacer-plugin</groupId>
65-
<artifactId>replacer</artifactId>
64+
<groupId>com.google.code.maven-replacer-plugin</groupId>
65+
<artifactId>replacer</artifactId>
66+
</plugin>
67+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
68+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
69+
<plugin>
70+
<groupId>org.gradlex</groupId>
71+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
6672
</plugin>
6773
</plugins>
6874
</build>

‎guice7/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,14 @@
6161
<build>
6262
<plugins>
6363
<plugin>
64-
<groupId>com.google.code.maven-replacer-plugin</groupId>
65-
<artifactId>replacer</artifactId>
64+
<groupId>com.google.code.maven-replacer-plugin</groupId>
65+
<artifactId>replacer</artifactId>
66+
</plugin>
67+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
68+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
69+
<plugin>
70+
<groupId>org.gradlex</groupId>
71+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
6672
</plugin>
6773
</plugins>
6874
</build>

‎jakarta-xmlbind/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@
104104
<groupId>com.google.code.maven-replacer-plugin</groupId>
105105
<artifactId>replacer</artifactId>
106106
</plugin>
107+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
108+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
109+
<plugin>
110+
<groupId>org.gradlex</groupId>
111+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
112+
</plugin>
107113
</plugins>
108114
</build>
109115
</project>

‎jaxb/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@
8686
<groupId>com.google.code.maven-replacer-plugin</groupId>
8787
<artifactId>replacer</artifactId>
8888
</plugin>
89+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
90+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
91+
<plugin>
92+
<groupId>org.gradlex</groupId>
93+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
94+
</plugin>
8995
</plugins>
9096
</build>
9197
</project>

‎mrbean/pom.xml

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,6 @@ ${project.groupId}.mrbean.*;version=${project.version}
7474
<artifactId>replacer</artifactId>
7575
</plugin>
7676

77-
<!-- 27-Apr-2023, tatu: [modules-base#204] GMM plugin needs help -->
78-
<plugin>
79-
<groupId>de.jjohannes</groupId>
80-
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
81-
<configuration>
82-
<removedDependencies>
83-
<dependency>
84-
<groupId>net.bytebuddy</groupId>
85-
<artifactId>byte-buddy</artifactId>
86-
</dependency>
87-
</removedDependencies>
88-
</configuration>
89-
</plugin>
90-
9177
<plugin>
9278
<!-- We will shade ByteBuddy, to simplify deployment, avoid version conflicts -->
9379
<groupId>org.apache.maven.plugins</groupId>
@@ -114,32 +100,21 @@ ${project.groupId}.mrbean.*;version=${project.version}
114100
</execution>
115101
</executions>
116102
</plugin>
117-
<plugin>
118-
<groupId>io.github.floverfelt</groupId>
119-
<artifactId>find-and-replace-maven-plugin</artifactId>
120-
<version>1.1.0</version>
121-
<executions>
122-
<execution>
123-
<id>exec</id>
124-
<phase>package</phase>
125-
<goals>
126-
<goal>find-and-replace</goal>
127-
</goals>
128-
<configuration>
129-
<replacementType>file-contents</replacementType>
130-
<baseDir>${basedir}</baseDir>
131-
<findRegex><![CDATA[<modelVersion>4.0.0</modelVersion>]]></findRegex>
132-
<fileMask>dependency-reduced-pom.xml</fileMask>
133-
<replaceValue><![CDATA[ <!-- This module was also published with a richer model, Gradle metadata, -->
134-
<!-- which should be used instead. Do not delete the following line which -->
135-
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
136-
<!-- that they should prefer consuming it instead. -->
137-
<!-- do_not_remove: published-with-gradle-metadata -->
138-
<modelVersion>4.0.0</modelVersion>]]></replaceValue>
139-
<recursive>false</recursive>
140-
</configuration>
141-
</execution>
142-
</executions>
103+
104+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
105+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
106+
<plugin>
107+
<groupId>org.gradlex</groupId>
108+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
109+
<configuration>
110+
<!-- 28-Feb-2025, jjohannes: remove shaded dependency-->
111+
<removedDependencies>
112+
<dependency>
113+
<groupId>net.bytebuddy</groupId>
114+
<artifactId>byte-buddy</artifactId>
115+
</dependency>
116+
</removedDependencies>
117+
</configuration>
143118
</plugin>
144119
</plugins>
145120
</build>

‎no-ctor-deser/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<groupId>com.google.code.maven-replacer-plugin</groupId>
5454
<artifactId>replacer</artifactId>
5555
</plugin>
56+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
57+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
58+
<plugin>
59+
<groupId>org.gradlex</groupId>
60+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
61+
</plugin>
5662
</plugins>
5763
</build>
5864
</project>

‎osgi/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,14 @@
6161
<groupId>com.google.code.maven-replacer-plugin</groupId>
6262
<artifactId>replacer</artifactId>
6363
</plugin>
64+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
65+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
66+
<plugin>
67+
<groupId>org.gradlex</groupId>
68+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
69+
</plugin>
6470
</plugins>
71+
6572
</build>
6673

6774
<profiles>

‎pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ not datatype, data format, or JAX-RS provider modules.
140140
</plugin>
141141
</plugins>
142142
</pluginManagement>
143-
144-
<plugins>
145-
<plugin>
146-
<groupId>de.jjohannes</groupId>
147-
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
148-
</plugin>
149-
</plugins>
150143
</build>
151144

152145
</project>

0 commit comments

Comments
 (0)