Skip to content

Commit 332705a

Browse files
cowtowncodercowtowncoder
committed
Manual merge of #566 
1 parent e851b81 commit 332705a

File tree

6 files changed

+42
-52
lines changed

6 files changed

+42
-52
lines changed

‎avro/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ abstractions.
7171
<plugin><!-- Inherited from oss-base. Generate PackageVersion.java.-->
7272
<groupId>com.google.code.maven-replacer-plugin</groupId>
7373
<artifactId>replacer</artifactId>
74-
<executions>
75-
<execution>
76-
<id>process-packageVersion</id>
77-
<phase>generate-sources</phase>
78-
</execution>
79-
</executions>
74+
</plugin>
75+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
76+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
77+
<plugin>
78+
<groupId>org.gradlex</groupId>
79+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
8080
</plugin>
8181
</plugins>
8282
</build>

‎cbor/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ encoded data using Jackson abstractions (streaming API, data binding, tree model
4646
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
4747
<groupId>com.google.code.maven-replacer-plugin</groupId>
4848
<artifactId>replacer</artifactId>
49-
<executions>
50-
<execution>
51-
<id>process-packageVersion</id>
52-
<phase>generate-sources</phase>
53-
</execution>
54-
</executions>
49+
</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>
5555
</plugin>
5656
</plugins>
5757
</build>

‎ion/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ tree model)
5757
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
5858
<groupId>com.google.code.maven-replacer-plugin</groupId>
5959
<artifactId>replacer</artifactId>
60-
<executions>
61-
<execution>
62-
<id>process-packageVersion</id>
63-
<phase>generate-sources</phase>
64-
</execution>
65-
</executions>
60+
</plugin>
61+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
62+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
63+
<plugin>
64+
<groupId>org.gradlex</groupId>
65+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
6666
</plugin>
6767
</plugins>
6868
</build>

‎pom.xml‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -104,29 +104,20 @@
104104

105105
<build>
106106
<pluginManagement>
107-
<plugins>
108-
<plugin>
109-
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
110-
<groupId>com.google.code.maven-replacer-plugin</groupId>
111-
<artifactId>replacer</artifactId>
112-
<executions>
113-
<execution>
114-
<id>process-packageVersion</id>
115-
<phase>generate-sources</phase>
116-
</execution>
117-
</executions>
118-
</plugin>
119-
107+
<plugins>
108+
<plugin>
109+
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
110+
<groupId>com.google.code.maven-replacer-plugin</groupId>
111+
<artifactId>replacer</artifactId>
112+
<executions>
113+
<execution>
114+
<id>process-packageVersion</id>
115+
<phase>generate-sources</phase>
116+
</execution>
117+
</executions>
118+
</plugin>
120119
</plugins>
121120
</pluginManagement>
122-
123-
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
124-
<plugins>
125-
<plugin>
126-
<groupId>de.jjohannes</groupId>
127-
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
128-
</plugin>
129-
</plugins>
130121
</build>
131122

132123
</project>

‎protobuf/pom.xml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,13 @@ abstractions.
5151
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
5252
<groupId>com.google.code.maven-replacer-plugin</groupId>
5353
<artifactId>replacer</artifactId>
54-
<executions>
55-
<execution>
56-
<id>process-packageVersion</id>
57-
<phase>generate-sources</phase>
58-
</execution>
59-
</executions>
6054
</plugin>
61-
55+
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
56+
<!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
57+
<plugin>
58+
<groupId>org.gradlex</groupId>
59+
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
60+
</plugin>
6261
</plugins>
6362
</build>
6463

‎smile/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ tree model)
6363
<!-- Inherited from oss-base. Generate PackageVersion.java.-->
6464
<groupId>com.google.code.maven-replacer-plugin</groupId>
6565
<artifactId>replacer</artifactId>
66-
<executions>
67-
<execution>
68-
<id>process-packageVersion</id>
69-
<phase>generate-sources</phase>
70-
</execution>
71-
</executions>
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>
7272
</plugin>
7373
</plugins>
7474
</build>

0 commit comments

Comments
 (0)