Skip to content

Commit 0dd986a

Browse files
committed
Manual merge of #181
1 parent 63b4343 commit 0dd986a

File tree

5 files changed

+24
-14
lines changed

5 files changed

+24
-14
lines changed

eclipse-collections/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@
7373
<groupId>org.codehaus.mojo</groupId>
7474
<artifactId>build-helper-maven-plugin</artifactId>
7575
</plugin>
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>
7682
</plugins>
7783
</build>
7884
</project>

guava/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ com.google.common.*;version="${version.guava.osgi}",
6060
<groupId>com.google.code.maven-replacer-plugin</groupId>
6161
<artifactId>replacer</artifactId>
6262
</plugin>
63+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
64+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
65+
<plugin>
66+
<groupId>org.gradlex</groupId>
67+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
68+
</plugin>
6369
</plugins>
6470
</build>
6571
</project>

hppc/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ High-Performance Primitive Collections (HPPC, see http://labs.carrotsearch.com/h
4141
<groupId>com.google.code.maven-replacer-plugin</groupId>
4242
<artifactId>replacer</artifactId>
4343
</plugin>
44+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
45+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
46+
<plugin>
47+
<groupId>org.gradlex</groupId>
48+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
49+
</plugin>
4450
</plugins>
4551
</build>
4652
</project>

pcollections/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ PCollections (http://pcollections.org/) types
4747
<groupId>com.google.code.maven-replacer-plugin</groupId>
4848
<artifactId>replacer</artifactId>
4949
</plugin>
50+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
51+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
52+
<plugin>
53+
<groupId>org.gradlex</groupId>
54+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
55+
</plugin>
5056
</plugins>
5157
</build>
5258
</project>

pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@
9090
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
9191
<groupId>com.google.code.maven-replacer-plugin</groupId>
9292
<artifactId>replacer</artifactId>
93-
<executions>
94-
<execution>
95-
<id>process-packageVersion</id>
96-
<phase>generate-sources</phase>
97-
</execution>
98-
</executions>
9993
</plugin>
10094

10195
<plugin>
@@ -152,13 +146,5 @@
152146
</plugin>
153147
</plugins>
154148
</pluginManagement>
155-
156-
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
157-
<plugins>
158-
<plugin>
159-
<groupId>de.jjohannes</groupId>
160-
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
161-
</plugin>
162-
</plugins>
163149
</build>
164150
</project>

0 commit comments

Comments
 (0)