Skip to content

Commit 1b79aa3

Browse files
committed
chore: clean up Maven POM files
- Add missing version for maven-source-plugin (3.4.0) - Extract hardcoded os-maven-plugin and maven-failsafe-plugin versions into properties - Remove duplicate jackson-dataformat-yaml.version property - Move jacoco-maven-plugin.version to root POM to eliminate duplication - Standardize property naming: protoc-version -> protoc.version, protoc-gen-grpc-java -> protoc-gen-grpc-java.version, palantir-format-version.version -> palantir-java-format.version - Add maven-failsafe-plugin and maven-source-plugin to pluginManagement - Reorganize properties: plugin versions grouped separately from dependency versions
1 parent 77e90b1 commit 1b79aa3

File tree

4 files changed

+24
-14
lines changed
  • capabilities-exchange
  • capabilities-parent
  • capabilities-runtimes/capabilities-runtimes-camel/capabilities-runtimes-camel-plugin

4 files changed

+24
-14
lines changed

capabilities-exchange/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<extension>
4848
<groupId>kr.motd.maven</groupId>
4949
<artifactId>os-maven-plugin</artifactId>
50-
<version>1.7.1</version>
50+
<version>${os-maven-plugin.version}</version>
5151
</extension>
5252
</extensions>
5353

@@ -57,9 +57,9 @@
5757
<artifactId>protobuf-maven-plugin</artifactId>
5858
<version>${protobuf-maven-plugin.version}</version>
5959
<configuration>
60-
<protocArtifact>com.google.protobuf:protoc:${protoc-version}:exe:${os.detected.classifier}</protocArtifact>
60+
<protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
6161
<pluginId>grpc-java</pluginId>
62-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java}:exe:${os.detected.classifier}
62+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.version}:exe:${os.detected.classifier}
6363
</pluginArtifact>
6464
</configuration>
6565
<executions>
@@ -74,6 +74,7 @@
7474
<plugin>
7575
<groupId>org.apache.maven.plugins</groupId>
7676
<artifactId>maven-source-plugin</artifactId>
77+
<version>${maven-source-plugin.version}</version>
7778
<executions>
7879
<execution>
7980
<id>attach-sources</id>

capabilities-parent/pom.xml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@
1515

1616
<properties>
1717
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
18+
<maven-failsafe-plugin.version>3.5.5</maven-failsafe-plugin.version>
19+
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
1820
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
21+
<spotless-maven-plugin.version>3.2.1</spotless-maven-plugin.version>
1922

2023
<camel.version>4.18.0</camel.version>
2124
<jgit.version>7.5.0.202512021534-r</jgit.version>
2225
<jackson-dataformat-yaml.version>2.21.0</jackson-dataformat-yaml.version>
2326
<jackson-databind.version>2.21.0</jackson-databind.version>
2427
<jackson-annotations.version>2.21</jackson-annotations.version>
25-
<jackson-dataformat-yaml.version>2.21.0</jackson-dataformat-yaml.version>
2628
<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
2729
<slf4j.version>2.0.17</slf4j.version>
2830
<log4j.version>2.25.3</log4j.version>
29-
<protoc-version>3.25.5</protoc-version>
31+
<protoc.version>3.25.5</protoc.version>
3032
<grpc.version>1.79.0</grpc.version>
31-
<protoc-gen-grpc-java>1.72.0</protoc-gen-grpc-java>
33+
<protoc-gen-grpc-java.version>1.72.0</protoc-gen-grpc-java.version>
3234
<annotations-api.version>6.0.53</annotations-api.version>
3335
<junit-jupiter.version>5.13.4</junit-jupiter.version>
3436
<oauth2-oidc-sdk.version>11.33</oauth2-oidc-sdk.version>
3537
<langchain4j.version>1.11.0</langchain4j.version>
3638
<mockito.version>5.21.0</mockito.version>
37-
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
38-
<spotless-maven-plugin.version>3.2.1</spotless-maven-plugin.version>
39-
<palantir-format-version.version>2.71.0</palantir-format-version.version>
39+
<palantir-java-format.version>2.71.0</palantir-java-format.version>
4040
</properties>
4141

4242
<dependencyManagement>
@@ -112,6 +112,16 @@
112112
<build>
113113
<pluginManagement>
114114
<plugins>
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-failsafe-plugin</artifactId>
118+
<version>${maven-failsafe-plugin.version}</version>
119+
</plugin>
120+
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
122+
<artifactId>maven-source-plugin</artifactId>
123+
<version>${maven-source-plugin.version}</version>
124+
</plugin>
115125
<plugin>
116126
<groupId>org.jacoco</groupId>
117127
<artifactId>jacoco-maven-plugin</artifactId>
@@ -124,7 +134,7 @@
124134
<configuration>
125135
<java>
126136
<palantirJavaFormat>
127-
<version>${palantir-format-version.version}</version>
137+
<version>${palantir-java-format.version}</version>
128138
</palantirJavaFormat>
129139
<removeUnusedImports />
130140
<formatAnnotations />

capabilities-runtimes/capabilities-runtimes-camel/capabilities-runtimes-camel-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
<plugin>
8383
<groupId>org.apache.maven.plugins</groupId>
8484
<artifactId>maven-failsafe-plugin</artifactId>
85-
<version>3.5.5</version>
8685
<executions>
8786
<execution>
8887
<goals>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
<maven.compiler.target>21</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919

20+
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
2021
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
2122
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
23+
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
2224
<central-publishing-maven-plugin.version>0.10.0</central-publishing-maven-plugin.version>
2325
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
2426
<maven-scm-plugin.version>2.1.0</maven-scm-plugin.version>
@@ -82,9 +84,6 @@
8284
<profiles>
8385
<profile>
8486
<id>coverage</id>
85-
<properties>
86-
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
87-
</properties>
8887
<build>
8988
<plugins>
9089
<plugin>
@@ -127,6 +126,7 @@
127126
<plugin>
128127
<groupId>org.apache.maven.plugins</groupId>
129128
<artifactId>maven-source-plugin</artifactId>
129+
<version>${maven-source-plugin.version}</version>
130130
<executions>
131131
<execution>
132132
<id>attach-sources</id>

0 commit comments

Comments
 (0)