This is an automated email from the ASF dual-hosted git repository. nicoloboschi pushed a commit to branch branch-4.16 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit cc124dcc7753eb09f141c21e7218dd3cd17da146 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 200584cf12..fafdfdcac0 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 10708b049d..0fa36f13fd 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> @@ -124,8 +124,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> @@ -147,7 +147,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 943d81e788..70c8b27bdc 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 9bedfcd311..5861dd6ff9 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 6e4e7bbd94..353a64f1b5 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> @@ -98,8 +98,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> @@ -121,7 +121,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 2152b6efff..b3de078d6c 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -228,7 +228,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 a0391e9b01..f316d77574 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 680bc2debc..55bccfffea 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 70c0c06c27..1329fe02d9 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 61b38356da..eb80b2c77e 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 7922d03476..d6a4a5cb87 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> @@ -190,17 +190,8 @@ <lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version> <jacoco-maven-plugin.version>0.8.8</jacoco-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> @@ -963,7 +954,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> @@ -1070,12 +1060,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> @@ -1440,6 +1429,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 c8d70f3cd6..b1e6b306ff 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 e4085575e7..b547339e18 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 59cc45b88e..eff484bb4c 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 138a77fa68..7733ab9f30 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 42fb573403..3c065c112f 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 54657574c1..200d7f6534 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 1fc502442d..0b8b4ca1bc 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 3ee3e143d2..9a89f33de6 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 f2c9f91a4c..e1575f2df8 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 67d1f32f22..20139d260c 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 290717be4c..a4b4ae7a42 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 28506408b8..ca586a80da 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 e1abeea6f3..d589a6b8a3 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 e9876d20e1..d9bc8d1b94 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 24e622bc26..8315755870 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 0b88f83ea3..0f9879b87f 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>
