You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2024/03/25 11:36:09 UTC
(bookkeeper) branch branch-4.17 updated (298093553e -> fcef0ba1ed)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a change to branch branch-4.17
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
from 298093553e Upgrade Netty to 4.1.107.Final and io_uring to 0.0.25.Final (#4224)
new d720189334 Simplify getting project version in release script (#4235)
new a6c8d49963 Fix duplicate artifacts issue with maven-source-plugin in release build (#4237)
new 1f43f2c12d Improve release script instructions (#4236)
new 74c01cb9f2 Issue 4200: fix flaky test DeferredSyncTest.testForceWillAdvanceLacOnlyUpToLastAcknoledgedWrite (#4234)
new 7ab425b67b Bump org.apache.zookeeper:zookeeper from 3.8.3 to 3.8.4 (#4231)
new fcef0ba1ed Bump follow-redirects from 1.14.9 to 1.15.6 in /site3/website (#4230)
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 ++--
.../src/main/resources/LICENSE-all.bin.txt | 6 ++---
.../src/main/resources/LICENSE-bkctl.bin.txt | 6 ++---
.../src/main/resources/LICENSE-server.bin.txt | 6 ++---
bookkeeper-server/pom.xml | 1 -
.../bookkeeper/client/MockBookKeeperTestCase.java | 27 +++++++++++++++------
circe-checksum/pom.xml | 1 -
cpu-affinity/pom.xml | 6 -----
dev/release/000-run-docker.sh | 28 ++++++++++++++++++----
dev/release/Dockerfile | 6 +++--
microbenchmarks/pom.xml | 1 -
native-io/pom.xml | 6 -----
pom.xml | 18 ++++----------
shaded/bookkeeper-server-shaded/pom.xml | 3 +--
shaded/bookkeeper-server-tests-shaded/pom.xml | 3 +--
shaded/distributedlog-core-shaded/pom.xml | 3 +--
site3/website/yarn.lock | 6 ++---
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 -
34 files changed, 76 insertions(+), 86 deletions(-)
(bookkeeper) 04/06: Issue 4200: fix flaky test DeferredSyncTest.testForceWillAdvanceLacOnlyUpToLastAcknoledgedWrite (#4234)
Posted by eo...@apache.org.
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 74c01cb9f2ce77ba72a7b7876598ae83b9ca73e5
Author: Kang Zou <zo...@163.com>
AuthorDate: Fri Mar 22 00:12:02 2024 +0800
Issue 4200: fix flaky test DeferredSyncTest.testForceWillAdvanceLacOnlyUpToLastAcknoledgedWrite (#4234)
* Issue 4200: fix flaky test DeferredSyncTest.testForceWillAdvanceLacOnlyUpToLastAcknoledgedWrite
* add a comment
(cherry picked from commit 37708ade69129db1ff05bfd82d1f4f5b75593053)
---
.../bookkeeper/client/MockBookKeeperTestCase.java | 27 ++++++++++++++++------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java
index f43b6136c8..e1881d7477 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java
@@ -303,8 +303,15 @@ public abstract class MockBookKeeperTestCase {
}
protected void resumeBookieWriteAcks(BookieId address) {
- suspendedBookiesForForceLedgerAcks.remove(address);
- List<Runnable> pendingResponses = deferredBookieForceLedgerResponses.remove(address);
+ List<Runnable> pendingResponses;
+
+ // why use the BookieId instance as the object monitor? there is a date race problem if not
+ // see https://github.com/apache/bookkeeper/issues/4200
+ synchronized (address) {
+ suspendedBookiesForForceLedgerAcks.remove(address);
+ pendingResponses = deferredBookieForceLedgerResponses.remove(address);
+ }
+
if (pendingResponses != null) {
pendingResponses.forEach(Runnable::run);
}
@@ -656,11 +663,17 @@ public abstract class MockBookKeeperTestCase {
callback.forceLedgerComplete(BKException.Code.OK, ledgerId, bookieSocketAddress, ctx);
});
};
- if (suspendedBookiesForForceLedgerAcks.contains(bookieSocketAddress)) {
- List<Runnable> queue = deferredBookieForceLedgerResponses.computeIfAbsent(bookieSocketAddress,
- (k) -> new CopyOnWriteArrayList<>());
- queue.add(activity);
- } else {
+ List<Runnable> queue = null;
+
+ synchronized (bookieSocketAddress) {
+ if (suspendedBookiesForForceLedgerAcks.contains(bookieSocketAddress)) {
+ queue = deferredBookieForceLedgerResponses.computeIfAbsent(bookieSocketAddress,
+ (k) -> new CopyOnWriteArrayList<>());
+ queue.add(activity);
+ }
+ }
+
+ if (queue == null) {
activity.run();
}
return null;
(bookkeeper) 03/06: Improve release script instructions (#4236)
Posted by eo...@apache.org.
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 1f43f2c12d2c41a0b98d2dfbaa4e8496644602de
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Thu Mar 21 06:28:29 2024 -0700
Improve release script instructions (#4236)
(cherry picked from commit 47bf54d5f281ec8b386f13b0b7300a07baf22f81)
---
dev/release/000-run-docker.sh | 26 +++++++++++++++++++++++---
dev/release/Dockerfile | 6 ++++--
2 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh
index ab7a313d44..248c2e7fec 100755
--- a/dev/release/000-run-docker.sh
+++ b/dev/release/000-run-docker.sh
@@ -50,7 +50,9 @@ fi
docker build -t "${IMAGE_NAME}-${USER_NAME}" - <<UserSpecificDocker
FROM --platform=linux/amd64 ${IMAGE_NAME}
RUN groupadd --non-unique -g ${GROUP_ID} ${USER_NAME} && \
- useradd -l -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}
+ useradd -l -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME} && \
+ ([ "$(dirname "$HOME")" -eq "/home" ] || ln -s /home $(dirname "$HOME")) && \
+ mkdir -p /gpg && chown ${USER_ID}:${GROUP_ID} /gpg && chmod 700 /gpg
ENV HOME /home/${USER_NAME}
UserSpecificDocker
@@ -72,7 +74,13 @@ RC_DIR="bookkeeper-${VERSION}-rc${RC_NUM}"
RC_TAG="v${VERSION}-rc${RC_NUM}"
CMD="
-gpg-agent --daemon --pinentry-program /usr/bin/pinentry --homedir \$HOME/.gnupg --use-standard-socket
+# copy ~/.gnupg to /gpg in the container to workaround issue with permissions
+cp -Rdp \$HOME/.gnupg /gpg
+# remove any previous sockets
+rm -rf /gpg/.gnupg/S.*
+# set GNUPGHOME to /gpg/.gnupg
+export GNUPGHOME=/gpg/.gnupg
+gpg-agent --daemon --pinentry-program /usr/bin/pinentry --allow-loopback-pinentry --default-cache-ttl 3600
echo
echo 'Welcome to Apache BookKeeper Release Build Env'
echo
@@ -92,9 +100,21 @@ echo 'RC_TAG = $RC_TAG'
echo
echo 'Before executing any release scripts, PLEASE configure your git to cache your github password:'
echo
+echo ' // take a backup of ~/.gitconfig, remember to restore it after the release process'
+echo ' \$ cp ~/.gitconfig ~/.gitconfig.bak.\$(date -I)'
+echo ' // remove any previous credential helper configuration'
+echo ' \$ git config --global -l --name-only | grep credential | uniq | xargs -i{} git config --global --unset-all {}'
+echo ' // fix permission warning with git in docker on MacOS'
+echo ' \$ git config --global --add safe.directory $PWD'
+echo ' \$ git config --global --add safe.directory \$PWD'
echo ' // configure credential helper to cache your github password for 1 hr during the whole release process '
echo ' \$ git config --global credential.helper \"cache --timeout=3600\" '
-echo ' \$ git push apache --dry-run '
+echo ' // in another terminal get a GitHub token to be used as a password for the release process, assuming you are using GitHub CLI.'
+echo ' \$ gh auth token '
+echo ' // attempt to push to apache remote to cache your password'
+echo ' \$ git push apache HEAD:test --dry-run '
+echo ' // cache gpg password by signing a dummy file'
+echo ' \$ echo dummy > /tmp/dummy && gpg -sa /tmp/dummy'
echo
bash
"
diff --git a/dev/release/Dockerfile b/dev/release/Dockerfile
index 06e34d38af..23c28954c1 100644
--- a/dev/release/Dockerfile
+++ b/dev/release/Dockerfile
@@ -18,6 +18,8 @@
#
FROM --platform=linux/amd64 maven:3.9.0-eclipse-temurin-8
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install -y g++ cmake gnupg2 vim subversion less zip unzip
-RUN apt-get update
-RUN apt-get install -y g++ cmake gnupg2 vim subversion
(bookkeeper) 05/06: Bump org.apache.zookeeper:zookeeper from 3.8.3 to 3.8.4 (#4231)
Posted by eo...@apache.org.
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 7ab425b67bfad73d859f1482059c45491b67e41d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Mar 22 08:51:19 2024 +0800
Bump org.apache.zookeeper:zookeeper from 3.8.3 to 3.8.4 (#4231)
* Bump org.apache.zookeeper:zookeeper from 3.8.3 to 3.8.4
Bumps org.apache.zookeeper:zookeeper from 3.8.3 to 3.8.4.
---
updated-dependencies:
- dependency-name: org.apache.zookeeper:zookeeper
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <su...@github.com>
* Fix license
---------
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
Co-authored-by: chenhang <ch...@apache.org>
(cherry picked from commit 726dc5215d5d14488338e0ec83e5d89b53fdb959)
---
bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 6 +++---
bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 6 +++---
bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 6 +++---
pom.xml | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index 22c68040d8..da1adf2656 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -261,9 +261,9 @@ Apache Software License, Version 2.
- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17]
- lib/org.apache.commons-commons-collections4-4.1.jar [19]
- lib/org.apache.commons-commons-lang3-3.6.jar [20]
-- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [21]
-- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21]
-- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21]
+- lib/org.apache.zookeeper-zookeeper-3.8.4.jar [21]
+- lib/org.apache.zookeeper-zookeeper-jute-3.8.4.jar [21]
+- lib/org.apache.zookeeper-zookeeper-3.8.4-tests.jar [21]
- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22]
- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22]
- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 28dc9e28a1..646b19b208 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -246,9 +246,9 @@ Apache Software License, Version 2.
- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16]
- lib/org.apache.commons-commons-collections4-4.1.jar [18]
- lib/org.apache.commons-commons-lang3-3.6.jar [19]
-- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [20]
-- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [20]
-- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [20]
+- lib/org.apache.zookeeper-zookeeper-3.8.4.jar [20]
+- lib/org.apache.zookeeper-zookeeper-jute-3.8.4.jar [20]
+- lib/org.apache.zookeeper-zookeeper-3.8.4-tests.jar [20]
- lib/com.beust-jcommander-1.82.jar [23]
- lib/net.jpountz.lz4-lz4-1.3.0.jar [25]
- lib/com.google.api.grpc-proto-google-common-protos-2.17.0.jar [27]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index 3325cb3956..93e8a827ce 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -261,9 +261,9 @@ Apache Software License, Version 2.
- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17]
- lib/org.apache.commons-commons-collections4-4.1.jar [19]
- lib/org.apache.commons-commons-lang3-3.6.jar [20]
-- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [21]
-- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21]
-- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21]
+- lib/org.apache.zookeeper-zookeeper-3.8.4.jar [21]
+- lib/org.apache.zookeeper-zookeeper-jute-3.8.4.jar [21]
+- lib/org.apache.zookeeper-zookeeper-3.8.4-tests.jar [21]
- lib/org.eclipse.jetty-jetty-http-9.4.53.v20231009.jar [22]
- lib/org.eclipse.jetty-jetty-io-9.4.53.v20231009.jar [22]
- lib/org.eclipse.jetty-jetty-security-9.4.53.v20231009.jar [22]
diff --git a/pom.xml b/pom.xml
index 6e85b2934a..af072a3f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
<javax-annotations-api.version>1.3.2</javax-annotations-api.version>
<testcontainers.version>1.19.4</testcontainers.version>
<vertx.version>4.3.8</vertx.version>
- <zookeeper.version>3.8.3</zookeeper.version>
+ <zookeeper.version>3.8.4</zookeeper.version>
<snappy.version>1.1.10.5</snappy.version>
<jctools.version>2.1.2</jctools.version>
<hppc.version>0.9.1</hppc.version>
(bookkeeper) 02/06: Fix duplicate artifacts issue with maven-source-plugin in release build (#4237)
Posted by eo...@apache.org.
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 <lh...@users.noreply.github.com>
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>
(bookkeeper) 01/06: Simplify getting project version in release script (#4235)
Posted by eo...@apache.org.
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 d720189334ee6b6f30bfa57e8d19698e32ae73a5
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Thu Mar 21 03:01:50 2024 -0700
Simplify getting project version in release script (#4235)
(cherry picked from commit ca98a7e482987a3e6daaf9763c0794dde1753598)
---
dev/release/000-run-docker.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh
index 7854dc49dd..ab7a313d44 100755
--- a/dev/release/000-run-docker.sh
+++ b/dev/release/000-run-docker.sh
@@ -56,7 +56,7 @@ UserSpecificDocker
BOOKKEEPER_ROOT=${SCRIPT_DIR}/../..
-VERSION=`cd $BOOKKEEPER_ROOT && mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|Download\w+:)' | sed 's/^\(.*\)-SNAPSHOT/\1/'`
+VERSION=`cd $BOOKKEEPER_ROOT && mvn initialize help:evaluate -Dexpression=project.version -pl . -q -DforceStdout | grep -Ev '(^\[|Download\w+:)' | sed 's/^\(.*\)-SNAPSHOT/\1/'`
versions_list=(`echo $VERSION | tr '.' ' '`)
major_version=${versions_list[0]}
minor_version=${versions_list[1]}
(bookkeeper) 06/06: Bump follow-redirects from 1.14.9 to 1.15.6 in /site3/website (#4230)
Posted by eo...@apache.org.
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 fcef0ba1ed28243a5311e64940d72de5fa4dc720
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Mar 22 08:51:40 2024 +0800
Bump follow-redirects from 1.14.9 to 1.15.6 in /site3/website (#4230)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.9 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.9...v1.15.6)
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 15171e1904f7196d8e9f4116ab2aecdf582e0032)
---
site3/website/yarn.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/site3/website/yarn.lock b/site3/website/yarn.lock
index f2e66b6d6a..a124efbcf9 100644
--- a/site3/website/yarn.lock
+++ b/site3/website/yarn.lock
@@ -5047,9 +5047,9 @@ flux@^4.0.1:
fbjs "^3.0.1"
follow-redirects@^1.0.0, follow-redirects@^1.14.7:
- version "1.14.9"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
- integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+ version "1.15.6"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+ integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
fork-ts-checker-webpack-plugin@^6.5.0:
version "6.5.0"