This is an automated email from the ASF dual-hosted git repository. eolivelli pushed a commit to branch branch-4.17 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit a6c8d49963c678040755837e6c19cdd4bbd083c7 Author: Lari Hotari <[email protected]> AuthorDate: Thu Mar 21 06:17:52 2024 -0700 Fix duplicate artifacts issue with maven-source-plugin in release build (#4237) (cherry picked from commit 5abb87f2705d8f4fc784cc2a27182e8022f384fc) --- bookkeeper-common/pom.xml | 1 - bookkeeper-dist/all/pom.xml | 5 ++--- bookkeeper-dist/bkctl/pom.xml | 5 ++--- bookkeeper-dist/pom.xml | 4 ++-- bookkeeper-dist/server/pom.xml | 5 ++--- bookkeeper-server/pom.xml | 1 - circe-checksum/pom.xml | 1 - cpu-affinity/pom.xml | 6 ------ microbenchmarks/pom.xml | 1 - native-io/pom.xml | 6 ------ pom.xml | 16 +++------------- shaded/bookkeeper-server-shaded/pom.xml | 3 +-- shaded/bookkeeper-server-tests-shaded/pom.xml | 3 +-- shaded/distributedlog-core-shaded/pom.xml | 3 +-- stream/clients/java/all/pom.xml | 3 +-- stream/clients/java/base/pom.xml | 1 - stream/distributedlog/common/pom.xml | 1 - stream/distributedlog/core/pom.xml | 1 - stream/distributedlog/protocol/pom.xml | 1 - stream/proto/pom.xml | 1 - stream/server/pom.xml | 1 - stream/storage/api/pom.xml | 1 - stream/storage/impl/pom.xml | 1 - stream/tests-common/pom.xml | 1 - tests/docker-images/all-versions-image/pom.xml | 1 - tests/docker-images/current-version-image/pom.xml | 1 - tests/pom.xml | 1 - 27 files changed, 15 insertions(+), 60 deletions(-) diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 2947822782..20159d5b94 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -114,7 +114,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index ed23a0fdbd..673b0619f8 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>bookkeeper-dist-all</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <name>Apache BookKeeper :: Dist (All)</name> <dependencies> @@ -129,8 +129,8 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> <configuration> <finalName>bookkeeper-all-${project.version}</finalName> <attach>false</attach> @@ -152,7 +152,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>${maven-deploy-plugin.version}</version> <configuration> <skip>true</skip> </configuration> diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index de994e5938..1f72cd64db 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>bkctl</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <name>Apache BookKeeper :: Dist (Bkctl)</name> <dependencies> @@ -49,8 +49,8 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> <configuration> <finalName>bkctl-${project.version}</finalName> <attach>true</attach> @@ -72,7 +72,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>${maven-deploy-plugin.version}</version> <configuration> <skip>true</skip> </configuration> diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 12de201342..d333e68f2e 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -37,8 +37,8 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <id>default-jar</id> @@ -47,8 +47,8 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> <configuration> <finalName>bookkeeper-${project.version}</finalName> <descriptors> diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 14fc930bfd..8cd8b7f06a 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>bookkeeper-dist-server</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <name>Apache BookKeeper :: Dist (Server)</name> <dependencies> @@ -103,8 +103,8 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> <configuration> <finalName>bookkeeper-server-${project.version}</finalName> <attach>true</attach> @@ -126,7 +126,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>${maven-deploy-plugin.version}</version> <configuration> <skip>true</skip> </configuration> diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 1439466779..c7e9d240ae 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -239,7 +239,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 7100f4da6b..683e4897ad 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -93,7 +93,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> <configuration> <descriptors> <descriptor>src/main/assembly/assembly.xml</descriptor> diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index a80b712587..6856cdd905 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -52,13 +52,11 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> <configuration> <descriptors> <descriptor>src/main/assembly/assembly.xml</descriptor> @@ -103,7 +101,6 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> <executions> <execution> @@ -140,7 +137,6 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> <configuration> <runtime>${nar.runtime}</runtime> @@ -175,7 +171,6 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> <configuration> <runtime>${nar.runtime}</runtime> @@ -212,7 +207,6 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> <configuration> <runtime>${nar.runtime}</runtime> diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index 881b7cd751..d7e84dfdba 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -81,7 +81,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>${maven-shade-plugin.version}</version> <executions> <execution> <phase>package</phase> diff --git a/native-io/pom.xml b/native-io/pom.xml index fd64b4f0ca..974f79763f 100644 --- a/native-io/pom.xml +++ b/native-io/pom.xml @@ -49,13 +49,11 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> <configuration> <descriptors> <descriptor>src/main/assembly/assembly.xml</descriptor> @@ -94,7 +92,6 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> <executions> <execution> @@ -131,7 +128,6 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> <configuration> <runtime>${nar.runtime}</runtime> @@ -166,7 +162,6 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> <configuration> <runtime>${nar.runtime}</runtime> @@ -203,7 +198,6 @@ <plugin> <groupId>com.github.maven-nar</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${nar-maven-plugin.version}</version> <extensions>true</extensions> <configuration> <runtime>${nar.runtime}</runtime> diff --git a/pom.xml b/pom.xml index e433f00088..6e85b2934a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>26</version> + <version>29</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.bookkeeper</groupId> @@ -187,17 +187,8 @@ <license-maven-plugin.version>1.6</license-maven-plugin.version> <lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version> <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> - <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version> <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version> - <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version> <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version> - <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version> - <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version> - <maven-install-plugin.version>3.1.1</maven-install-plugin.version> - <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version> - <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version> - <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version> - <maven-source-plugin.version>3.3.0</maven-source-plugin.version> <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version> <dependency-check-maven.version>8.0.2</dependency-check-maven.version> <nar-maven-plugin.version>3.10.1</nar-maven-plugin.version> @@ -884,7 +875,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven-javadoc-plugin.version}</version> <configuration> <!-- skip javadoc generation by default, use -Pdelombok to activate --> <skip>true</skip> @@ -991,12 +981,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>${maven-source-plugin.version}</version> <executions> <execution> <id>attach-sources</id> <goals> - <goal>jar</goal> + <goal>jar-no-fork</goal> </goals> </execution> </executions> @@ -1314,6 +1303,7 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 3e266c6cda..d27820606d 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -58,7 +58,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>${maven-shade-plugin.version}</version> <executions> <execution> <phase>package</phase> @@ -119,8 +118,8 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>${maven-clean-plugin.version}</version> <configuration> <filesets> <fileset> diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml b/shaded/bookkeeper-server-tests-shaded/pom.xml index ab854fcb7f..a509ae52ea 100644 --- a/shaded/bookkeeper-server-tests-shaded/pom.xml +++ b/shaded/bookkeeper-server-tests-shaded/pom.xml @@ -83,7 +83,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>${maven-shade-plugin.version}</version> <executions> <execution> <phase>package</phase> @@ -137,8 +136,8 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>${maven-clean-plugin.version}</version> <configuration> <filesets> <fileset> diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml index 2fc7a82750..9e56026324 100644 --- a/shaded/distributedlog-core-shaded/pom.xml +++ b/shaded/distributedlog-core-shaded/pom.xml @@ -63,7 +63,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>${maven-shade-plugin.version}</version> <executions> <execution> <phase>package</phase> @@ -231,8 +230,8 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>${maven-clean-plugin.version}</version> <configuration> <filesets> <fileset> diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index cf8faf1eb0..9d1fcd0e05 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -50,7 +50,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>${maven-shade-plugin.version}</version> <executions> <execution> <phase>package</phase> @@ -97,8 +96,8 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>${maven-clean-plugin.version}</version> <configuration> <filesets> <fileset> diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml index 5df4c47c21..ff6520e547 100644 --- a/stream/clients/java/base/pom.xml +++ b/stream/clients/java/base/pom.xml @@ -66,7 +66,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 36d964a2c6..03eca956a2 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/pom.xml @@ -96,7 +96,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml index a60acc09f7..b958cb798a 100644 --- a/stream/distributedlog/core/pom.xml +++ b/stream/distributedlog/core/pom.xml @@ -96,7 +96,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml index cd262279d3..0d83ca2fde 100644 --- a/stream/distributedlog/protocol/pom.xml +++ b/stream/distributedlog/protocol/pom.xml @@ -46,7 +46,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml index 3f7b621db5..7192f52cfc 100644 --- a/stream/proto/pom.xml +++ b/stream/proto/pom.xml @@ -100,7 +100,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/stream/server/pom.xml b/stream/server/pom.xml index 4658c6dd4a..2e6d409955 100644 --- a/stream/server/pom.xml +++ b/stream/server/pom.xml @@ -71,7 +71,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index e9107a5a35..b5362bf953 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -44,7 +44,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml index 78512274ae..61906585db 100644 --- a/stream/storage/impl/pom.xml +++ b/stream/storage/impl/pom.xml @@ -110,7 +110,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml index 5d6831e7ba..892162cf4f 100644 --- a/stream/tests-common/pom.xml +++ b/stream/tests-common/pom.xml @@ -105,7 +105,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index 4df9f761ea..af14609213 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -90,7 +90,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> <executions> <execution> <id>copy-tarball</id> diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 905ec47ebe..558ef73704 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -126,7 +126,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> <executions> <execution> <id>copy-docker-dependencies</id> diff --git a/tests/pom.xml b/tests/pom.xml index 60862c5bb6..e0ec3528a4 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -50,7 +50,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>${maven-deploy-plugin.version}</version> <configuration> <skip>true</skip> </configuration>
