This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 5abb87f270 Fix duplicate artifacts issue with maven-source-plugin in
release build (#4237)
5abb87f270 is described below
commit 5abb87f2705d8f4fc784cc2a27182e8022f384fc
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)
---
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 a2cb1e2dd5..aa733d20ff 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 246fe1d6dd..89dded19fb 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 2b55489106..ecfb2697d5 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 91fa5b4a06..e9efd48143 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 548d6a582c..a3f3d8d3d3 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 5773a5c90d..9db0c66835 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 20264af8a4..d67179c600 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 775121a17d..f30099da20 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 4fa78b7104..2abc99b2b9 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 5c5007af35..3f7126dc37 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 9af9ea7e7b..e856bb7473 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 a401778794..1fea94ef15 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 b6da406a1d..9871bb152e 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 7dfa1cef91..f80144b355 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 4d8013b100..91b2cc40ac 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 b0cd7a89c6..ac0a9dae51 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 295a1e9fa7..118ee5e5d6 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 7e79b65c6a..f1f34ca14a 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 a3db71a7b2..ef5d02c53a 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 620de9612d..f7540738a2 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 2b272d6398..e042caff49 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 383cff5baa..a69f0f29cc 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 5d705ed995..3b83074bcc 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 bf02190c18..f1ca667c87 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 42d36a4b96..8a8516de9d 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 e0c91aa512..3613053384 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 6f38813ae8..75128f83e8 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>
