From eafa91cbc7db785d31a9d94fd8043bc9bba51b2f Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Wed, 20 Nov 2024 14:53:15 +0800 Subject: [PATCH 01/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - upgrade Pulsar to 4.0.0 --- .github/workflows/integration-test.yaml | 12 ++++++------ README.md | 4 ++-- examples/kafka-streams/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/spark/pom.xml | 2 +- pom.xml | 6 +++--- pulsar-client-kafka-compat/pom.xml | 2 +- .../pulsar-client-kafka-shaded/pom.xml | 2 +- .../pulsar-client-kafka-shaded_0_8/pom.xml | 2 +- .../pulsar-client-kafka-shaded_0_9/pom.xml | 2 +- .../pulsar-client-kafka-tests/pom.xml | 7 +------ .../pulsar-client-kafka-tests_0_8/pom.xml | 2 +- .../pulsar-client-kafka-tests_0_9/pom.xml | 2 +- .../pulsar-client-kafka/pom.xml | 2 +- .../pulsar-client-kafka_0_8/pom.xml | 2 +- .../pulsar-client-kafka_0_9/pom.xml | 2 +- pulsar-log4j2-appender/pom.xml | 2 +- pulsar-spark/pom.xml | 2 +- pulsar-storm/pom.xml | 2 +- tests/pom.xml | 2 +- tests/pulsar-kafka-compat-client-test/pom.xml | 2 +- tests/pulsar-spark-test/pom.xml | 4 ++-- tests/pulsar-storm-test/pom.xml | 4 ++-- 23 files changed, 34 insertions(+), 39 deletions(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 9daee75..145e077 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -71,21 +71,21 @@ jobs: distribution: 'adopt' java-version: 17 - - name: install org.apache.pulsar.tests:integration:jar:tests:3.0.7 + - name: install org.apache.pulsar.tests:integration:jar:tests:4.0.0 if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | cd ~ - git clone --depth 50 --single-branch --branch v3.0.7 https://github.com/apache/pulsar + git clone --depth 50 --single-branch --branch v4.0.0 https://github.com/apache/pulsar cd pulsar mvn -B -ntp -f tests/pom.xml -pl org.apache.pulsar.tests:tests-parent,org.apache.pulsar.tests:integration install - name: build apachepulsar/pulsar-test-latest-version:latest if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | - docker pull apachepulsar/pulsar-all:3.0.7 - docker pull apachepulsar/pulsar:3.0.7 - docker tag apachepulsar/pulsar-all:3.0.7 apachepulsar/pulsar-all:latest - docker tag apachepulsar/pulsar:3.0.7 apachepulsar/pulsar:latest + docker pull apachepulsar/pulsar-all:4.0.0 + docker pull apachepulsar/pulsar:4.0.0 + docker tag apachepulsar/pulsar-all:4.0.0 apachepulsar/pulsar-all:latest + docker tag apachepulsar/pulsar:4.0.0 apachepulsar/pulsar:latest cd ~/pulsar mvn -B -ntp -f tests/docker-images/pom.xml install -pl org.apache.pulsar.tests:latest-version-image -am -Pdocker,-main -DskipTests diff --git a/README.md b/README.md index 7ebe364..682e1f9 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,11 @@ mvn install In order to build this repository the linked Pulsar release must be released to Maven Central other wise you have to build it locally. -For instance if this code depends on Pulsar 3.0.7 you have to build Pulsar 3.0.7 locally +For instance if this code depends on Pulsar 4.0.0 you have to build Pulsar 4.0.0 locally ``` git clone https://github.com/apache/pulsar -git checkout v3.0.7 +git checkout v4.0.0 mvn clean install -DskipTests ``` diff --git a/examples/kafka-streams/pom.xml b/examples/kafka-streams/pom.xml index 3817185..58ea160 100644 --- a/examples/kafka-streams/pom.xml +++ b/examples/kafka-streams/pom.xml @@ -24,7 +24,7 @@ org.apache.pulsar.examples pulsar-adapters-examples - 3.0.7 + 4.0.0 kafka-streams @@ -35,7 +35,7 @@ org.apache.pulsar pulsar-client-kafka - 3.0.7 + 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index ed17a82..156f4f4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,7 +25,7 @@ org.apache.pulsar pulsar-adapters - 3.0.7 + 4.0.0 org.apache.pulsar.examples diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml index f59d037..b62b3a4 100644 --- a/examples/spark/pom.xml +++ b/examples/spark/pom.xml @@ -25,7 +25,7 @@ org.apache.pulsar.examples pulsar-adapters-examples - 3.0.7 + 4.0.0 spark diff --git a/pom.xml b/pom.xml index 0f2cca6..41903a8 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.apache.pulsar pulsar-adapters - 3.0.7 + 4.0.0 Pulsar Adapters A collections of Pulsar adapters. @@ -76,7 +76,7 @@ - 3.0.7 + 4.0.0 2.7.2 2.0.0 0.8.1.1 @@ -123,7 +123,7 @@ 3.0.0-M3 3.3.0 3.1.2 - 3.4.1 + 3.6.0 3.0.0 1.2.0 3.1.2 diff --git a/pulsar-client-kafka-compat/pom.xml b/pulsar-client-kafka-compat/pom.xml index 5c965cf..f24c291 100644 --- a/pulsar-client-kafka-compat/pom.xml +++ b/pulsar-client-kafka-compat/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-adapters - 3.0.7 + 4.0.0 .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml index 3be6ef6..262c3f3 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml index 22d68f9..3cb152f 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml index 5c935dd..75f942c 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml index 9bbef89..67926ce 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. @@ -36,11 +36,6 @@ Tests to verify the correct shading configuration for the pulsar-client-kafka wrapper - - 17 - 17 - - ${project.groupId} diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml index 09117d9..51e4982 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml index 340eeab..3ecde84 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml index 6b01afd..f4ad930 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml index 9747e8e..1ad7ccc 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml index 5315723..0d46f07 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 3.0.7 + 4.0.0 .. diff --git a/pulsar-log4j2-appender/pom.xml b/pulsar-log4j2-appender/pom.xml index 09f54d7..28f239d 100644 --- a/pulsar-log4j2-appender/pom.xml +++ b/pulsar-log4j2-appender/pom.xml @@ -24,7 +24,7 @@ org.apache.pulsar pulsar-adapters - 3.0.7 + 4.0.0 .. diff --git a/pulsar-spark/pom.xml b/pulsar-spark/pom.xml index a6bd89e..f8cd259 100644 --- a/pulsar-spark/pom.xml +++ b/pulsar-spark/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar pulsar-adapters - 3.0.7 + 4.0.0 .. diff --git a/pulsar-storm/pom.xml b/pulsar-storm/pom.xml index 4fad85e..b52cfe5 100644 --- a/pulsar-storm/pom.xml +++ b/pulsar-storm/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar pulsar-adapters - 3.0.7 + 4.0.0 .. diff --git a/tests/pom.xml b/tests/pom.xml index 7d4b68d..a5acb91 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar pulsar-adapters - 3.0.7 + 4.0.0 org.apache.pulsar.tests adapters-tests-parent diff --git a/tests/pulsar-kafka-compat-client-test/pom.xml b/tests/pulsar-kafka-compat-client-test/pom.xml index c3593ed..068178c 100644 --- a/tests/pulsar-kafka-compat-client-test/pom.xml +++ b/tests/pulsar-kafka-compat-client-test/pom.xml @@ -25,7 +25,7 @@ org.apache.pulsar.tests adapters-tests-parent - 3.0.7 + 4.0.0 pulsar-kafka-compat-client-test diff --git a/tests/pulsar-spark-test/pom.xml b/tests/pulsar-spark-test/pom.xml index 8346d77..ca087fa 100644 --- a/tests/pulsar-spark-test/pom.xml +++ b/tests/pulsar-spark-test/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar.tests adapters-tests-parent - 3.0.7 + 4.0.0 pulsar-spark-test @@ -41,7 +41,7 @@ org.apache.pulsar pulsar-spark - 3.0.7 + 4.0.0 test diff --git a/tests/pulsar-storm-test/pom.xml b/tests/pulsar-storm-test/pom.xml index f93defc..f1b250a 100644 --- a/tests/pulsar-storm-test/pom.xml +++ b/tests/pulsar-storm-test/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar.tests adapters-tests-parent - 3.0.7 + 4.0.0 pulsar-storm-test @@ -43,7 +43,7 @@ org.apache.pulsar pulsar-storm - 3.0.7 + 4.0.0 test From c8ba8dceb3326c08410f215d37df82f0931621bb Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Wed, 20 Nov 2024 14:58:33 +0800 Subject: [PATCH 02/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - set `jcommander` version to 1.82 --- pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml index 51e4982..9df20e9 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml @@ -83,6 +83,7 @@ com.beust jcommander + 1.82 test From 64f752cf8a860deb679548bf1f0d8199e7fdbfd4 Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Wed, 20 Nov 2024 15:12:00 +0800 Subject: [PATCH 03/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - Set `mockito-core` version to 3.12.4 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 41903a8..97fb8db 100644 --- a/pom.xml +++ b/pom.xml @@ -296,6 +296,12 @@ powermock-module-testng ${powermock.version} + + org.mockito + mockito-core + 3.12.4 + test + From 812cf0154620091a118ba4c9fb67e3b1417af8ae Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Tue, 17 Dec 2024 12:08:05 +0800 Subject: [PATCH 04/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - Change version to `4.0.0-SNAPSHOT` --- .github/workflows/integration-test.yaml | 12 ++++++------ examples/kafka-streams/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/spark/pom.xml | 2 +- pom.xml | 4 ++-- pulsar-client-kafka-compat/pom.xml | 2 +- .../pulsar-client-kafka-shaded/pom.xml | 2 +- .../pulsar-client-kafka-shaded_0_8/pom.xml | 2 +- .../pulsar-client-kafka-shaded_0_9/pom.xml | 2 +- .../pulsar-client-kafka-tests/pom.xml | 2 +- .../pulsar-client-kafka-tests_0_8/pom.xml | 2 +- .../pulsar-client-kafka-tests_0_9/pom.xml | 2 +- .../pulsar-client-kafka/pom.xml | 2 +- .../pulsar-client-kafka_0_8/pom.xml | 2 +- .../pulsar-client-kafka_0_9/pom.xml | 2 +- pulsar-log4j2-appender/pom.xml | 2 +- pulsar-spark/pom.xml | 2 +- pulsar-storm/pom.xml | 2 +- tests/pom.xml | 2 +- tests/pulsar-kafka-compat-client-test/pom.xml | 2 +- tests/pulsar-spark-test/pom.xml | 4 ++-- tests/pulsar-storm-test/pom.xml | 4 ++-- 22 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 145e077..ed03b86 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -71,21 +71,21 @@ jobs: distribution: 'adopt' java-version: 17 - - name: install org.apache.pulsar.tests:integration:jar:tests:4.0.0 + - name: install org.apache.pulsar.tests:integration:jar:tests:4.0.0-SNAPSHOT if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | cd ~ - git clone --depth 50 --single-branch --branch v4.0.0 https://github.com/apache/pulsar + git clone --depth 50 --single-branch --branch v4.0.0-SNAPSHOT https://github.com/apache/pulsar cd pulsar mvn -B -ntp -f tests/pom.xml -pl org.apache.pulsar.tests:tests-parent,org.apache.pulsar.tests:integration install - name: build apachepulsar/pulsar-test-latest-version:latest if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | - docker pull apachepulsar/pulsar-all:4.0.0 - docker pull apachepulsar/pulsar:4.0.0 - docker tag apachepulsar/pulsar-all:4.0.0 apachepulsar/pulsar-all:latest - docker tag apachepulsar/pulsar:4.0.0 apachepulsar/pulsar:latest + docker pull apachepulsar/pulsar-all:4.0.0-SNAPSHOT + docker pull apachepulsar/pulsar:4.0.0-SNAPSHOT + docker tag apachepulsar/pulsar-all:4.0.0-SNAPSHOT apachepulsar/pulsar-all:latest + docker tag apachepulsar/pulsar:4.0.0-SNAPSHOT apachepulsar/pulsar:latest cd ~/pulsar mvn -B -ntp -f tests/docker-images/pom.xml install -pl org.apache.pulsar.tests:latest-version-image -am -Pdocker,-main -DskipTests diff --git a/examples/kafka-streams/pom.xml b/examples/kafka-streams/pom.xml index 58ea160..201cdbc 100644 --- a/examples/kafka-streams/pom.xml +++ b/examples/kafka-streams/pom.xml @@ -24,7 +24,7 @@ org.apache.pulsar.examples pulsar-adapters-examples - 4.0.0 + 4.0.0-SNAPSHOT kafka-streams @@ -35,7 +35,7 @@ org.apache.pulsar pulsar-client-kafka - 4.0.0 + 4.0.0-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 156f4f4..2267ec1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,7 +25,7 @@ org.apache.pulsar pulsar-adapters - 4.0.0 + 4.0.0-SNAPSHOT org.apache.pulsar.examples diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml index b62b3a4..92a2198 100644 --- a/examples/spark/pom.xml +++ b/examples/spark/pom.xml @@ -25,7 +25,7 @@ org.apache.pulsar.examples pulsar-adapters-examples - 4.0.0 + 4.0.0-SNAPSHOT spark diff --git a/pom.xml b/pom.xml index 97fb8db..c85ab31 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.apache.pulsar pulsar-adapters - 4.0.0 + 4.0.0-SNAPSHOT Pulsar Adapters A collections of Pulsar adapters. @@ -76,7 +76,7 @@ - 4.0.0 + 4.0.0-SNAPSHOT 2.7.2 2.0.0 0.8.1.1 diff --git a/pulsar-client-kafka-compat/pom.xml b/pulsar-client-kafka-compat/pom.xml index f24c291..f9e643c 100644 --- a/pulsar-client-kafka-compat/pom.xml +++ b/pulsar-client-kafka-compat/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-adapters - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml index 262c3f3..27a741c 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml index 3cb152f..c13e156 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml index 75f942c..7d82075 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml index 67926ce..2e16a16 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml index 9df20e9..cea9056 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml index 3ecde84..2b6de0d 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml index f4ad930..d7f29d0 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml index 1ad7ccc..6a9ceae 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml index 0d46f07..a8d7893 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml @@ -27,7 +27,7 @@ org.apache.pulsar pulsar-client-kafka-compat - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-log4j2-appender/pom.xml b/pulsar-log4j2-appender/pom.xml index 28f239d..e88f42d 100644 --- a/pulsar-log4j2-appender/pom.xml +++ b/pulsar-log4j2-appender/pom.xml @@ -24,7 +24,7 @@ org.apache.pulsar pulsar-adapters - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-spark/pom.xml b/pulsar-spark/pom.xml index f8cd259..5dd0d29 100644 --- a/pulsar-spark/pom.xml +++ b/pulsar-spark/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar pulsar-adapters - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/pulsar-storm/pom.xml b/pulsar-storm/pom.xml index b52cfe5..18057c3 100644 --- a/pulsar-storm/pom.xml +++ b/pulsar-storm/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar pulsar-adapters - 4.0.0 + 4.0.0-SNAPSHOT .. diff --git a/tests/pom.xml b/tests/pom.xml index a5acb91..d34b568 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar pulsar-adapters - 4.0.0 + 4.0.0-SNAPSHOT org.apache.pulsar.tests adapters-tests-parent diff --git a/tests/pulsar-kafka-compat-client-test/pom.xml b/tests/pulsar-kafka-compat-client-test/pom.xml index 068178c..d0a3ccc 100644 --- a/tests/pulsar-kafka-compat-client-test/pom.xml +++ b/tests/pulsar-kafka-compat-client-test/pom.xml @@ -25,7 +25,7 @@ org.apache.pulsar.tests adapters-tests-parent - 4.0.0 + 4.0.0-SNAPSHOT pulsar-kafka-compat-client-test diff --git a/tests/pulsar-spark-test/pom.xml b/tests/pulsar-spark-test/pom.xml index ca087fa..4289f31 100644 --- a/tests/pulsar-spark-test/pom.xml +++ b/tests/pulsar-spark-test/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar.tests adapters-tests-parent - 4.0.0 + 4.0.0-SNAPSHOT pulsar-spark-test @@ -41,7 +41,7 @@ org.apache.pulsar pulsar-spark - 4.0.0 + 4.0.0-SNAPSHOT test diff --git a/tests/pulsar-storm-test/pom.xml b/tests/pulsar-storm-test/pom.xml index f1b250a..152978f 100644 --- a/tests/pulsar-storm-test/pom.xml +++ b/tests/pulsar-storm-test/pom.xml @@ -26,7 +26,7 @@ org.apache.pulsar.tests adapters-tests-parent - 4.0.0 + 4.0.0-SNAPSHOT pulsar-storm-test @@ -43,7 +43,7 @@ org.apache.pulsar pulsar-storm - 4.0.0 + 4.0.0-SNAPSHOT test From f366ab61fc2bda5ceca6a54e3f504bf91362ca8a Mon Sep 17 00:00:00 2001 From: VisionXu Date: Tue, 17 Dec 2024 14:40:59 +0800 Subject: [PATCH 05/11] Apply suggestions from code review Use `4.0.1` version in test. Co-authored-by: Zixuan Liu --- .github/workflows/integration-test.yaml | 12 ++++++------ README.md | 4 ++-- pom.xml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index ed03b86..12ed117 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -71,21 +71,21 @@ jobs: distribution: 'adopt' java-version: 17 - - name: install org.apache.pulsar.tests:integration:jar:tests:4.0.0-SNAPSHOT + - name: install org.apache.pulsar.tests:integration:jar:tests:4.0.1 if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | cd ~ - git clone --depth 50 --single-branch --branch v4.0.0-SNAPSHOT https://github.com/apache/pulsar + git clone --depth 50 --single-branch --branch v4.0.1 https://github.com/apache/pulsar cd pulsar mvn -B -ntp -f tests/pom.xml -pl org.apache.pulsar.tests:tests-parent,org.apache.pulsar.tests:integration install - name: build apachepulsar/pulsar-test-latest-version:latest if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | - docker pull apachepulsar/pulsar-all:4.0.0-SNAPSHOT - docker pull apachepulsar/pulsar:4.0.0-SNAPSHOT - docker tag apachepulsar/pulsar-all:4.0.0-SNAPSHOT apachepulsar/pulsar-all:latest - docker tag apachepulsar/pulsar:4.0.0-SNAPSHOT apachepulsar/pulsar:latest + docker pull apachepulsar/pulsar-all:4.0.1 + docker pull apachepulsar/pulsar:4.0.1 + docker tag apachepulsar/pulsar-all:4.0.1 apachepulsar/pulsar-all:latest + docker tag apachepulsar/pulsar:4.0.1 apachepulsar/pulsar:latest cd ~/pulsar mvn -B -ntp -f tests/docker-images/pom.xml install -pl org.apache.pulsar.tests:latest-version-image -am -Pdocker,-main -DskipTests diff --git a/README.md b/README.md index 682e1f9..29ceada 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,11 @@ mvn install In order to build this repository the linked Pulsar release must be released to Maven Central other wise you have to build it locally. -For instance if this code depends on Pulsar 4.0.0 you have to build Pulsar 4.0.0 locally +For instance if this code depends on Pulsar 4.0.1 you have to build Pulsar 4.0.1 locally ``` git clone https://github.com/apache/pulsar -git checkout v4.0.0 +git checkout v4.0.1 mvn clean install -DskipTests ``` diff --git a/pom.xml b/pom.xml index c85ab31..f16f358 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ - 4.0.0-SNAPSHOT + 4.0.1 2.7.2 2.0.0 0.8.1.1 From 21274260081b55e64269679b0207fd6a281352b1 Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Wed, 18 Dec 2024 17:27:38 +0800 Subject: [PATCH 06/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - change dependency path, `javax.xxx` -> `jakarta.xxx` --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f16f358..29a118e 100644 --- a/pom.xml +++ b/pom.xml @@ -351,8 +351,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided From aa55829203e16b36f88a887a3f88435ebf062c26 Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Thu, 19 Dec 2024 10:43:01 +0800 Subject: [PATCH 07/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - `ConsumerName.java` has been removed. Replace ConsumerName#generateRandomName with RandomStringUtils#randomAlphanumeric (#23645) --- .../apache/kafka/clients/consumer/PulsarKafkaConsumer.java | 4 ++-- pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml | 4 ++++ .../apache/kafka/clients/consumer/PulsarKafkaConsumer.java | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java b/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java index 67d052b..6ae6302 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java +++ b/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java @@ -66,7 +66,7 @@ import org.apache.pulsar.client.kafka.compat.PulsarClientKafkaConfig; import org.apache.pulsar.client.kafka.compat.PulsarConsumerKafkaConfig; import org.apache.pulsar.client.kafka.compat.PulsarKafkaSchema; -import org.apache.pulsar.client.util.ConsumerName; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.pulsar.client.util.MessageIdUtils; import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.util.FutureUtil; @@ -270,7 +270,7 @@ public void subscribe(Collection topics, ConsumerRebalanceListener callb consumerBuilder.subscriptionName(groupId); if (numberOfPartitions > 1) { // Subscribe to each partition - consumerBuilder.consumerName(ConsumerName.generateRandomName()); + consumerBuilder.consumerName(RandomStringUtils.randomAlphanumeric(5)); for (int i = 0; i < numberOfPartitions; i++) { String partitionName = TopicName.get(topic).getPartition(i).toString(); CompletableFuture> future = consumerBuilder.clone() diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml index a8d7893..ea73eed 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml @@ -108,6 +108,10 @@ com.google.guava guava + + org.apache.commons + commons-lang3 + diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java b/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java index 0f65107..3563807 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java +++ b/pulsar-client-kafka-compat/pulsar-client-kafka_0_9/src/main/java/org/apache/kafka/clients/consumer/PulsarKafkaConsumer.java @@ -60,7 +60,7 @@ import org.apache.pulsar.client.kafka.compat.PulsarClientKafkaConfig; import org.apache.pulsar.client.kafka.compat.PulsarConsumerKafkaConfig; import org.apache.pulsar.client.kafka.compat.PulsarKafkaSchema; -import org.apache.pulsar.client.util.ConsumerName; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.pulsar.client.util.MessageIdUtils; import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.util.FutureUtil; @@ -221,7 +221,7 @@ public void subscribe(List topics, ConsumerRebalanceListener callback) { consumerBuilder.subscriptionName(groupId); if (numberOfPartitions > 1) { // Subscribe to each partition - consumerBuilder.consumerName(ConsumerName.generateRandomName()); + consumerBuilder.consumerName(RandomStringUtils.randomAlphanumeric(5)); for (int i = 0; i < numberOfPartitions; i++) { String partitionName = TopicName.get(topic).getPartition(i).toString(); CompletableFuture> future = consumerBuilder.clone() From 2bf358d1f91a8431382dc0e5562b9d360a11ddb4 Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Thu, 19 Dec 2024 20:17:19 +0800 Subject: [PATCH 08/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - change docker image version. --- .github/workflows/integration-test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 12ed117..09a5c88 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -82,10 +82,10 @@ jobs: - name: build apachepulsar/pulsar-test-latest-version:latest if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | - docker pull apachepulsar/pulsar-all:4.0.1 - docker pull apachepulsar/pulsar:4.0.1 - docker tag apachepulsar/pulsar-all:4.0.1 apachepulsar/pulsar-all:latest - docker tag apachepulsar/pulsar:4.0.1 apachepulsar/pulsar:latest + docker pull apachepulsar/pulsar-all:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) + docker pull apachepulsar/pulsar:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) + docker tag apachepulsar/pulsar-all:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) apachepulsar/pulsar-all:latest + docker tag apachepulsar/pulsar:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) apachepulsar/pulsar:latest cd ~/pulsar mvn -B -ntp -f tests/docker-images/pom.xml install -pl org.apache.pulsar.tests:latest-version-image -am -Pdocker,-main -DskipTests From 210190f1a1fcbff00122558d5c12b898a9d90536 Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Fri, 20 Dec 2024 14:35:26 +0800 Subject: [PATCH 09/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - change docker image version. --- .github/workflows/integration-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 09a5c88..da584fb 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -82,8 +82,8 @@ jobs: - name: build apachepulsar/pulsar-test-latest-version:latest if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | - docker pull apachepulsar/pulsar-all:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) - docker pull apachepulsar/pulsar:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) + docker pull apachepulsar/pulsar-all:4.0.1 + docker pull apachepulsar/pulsar:4.0.1 docker tag apachepulsar/pulsar-all:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) apachepulsar/pulsar-all:latest docker tag apachepulsar/pulsar:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) apachepulsar/pulsar:latest cd ~/pulsar From a23a5749933f48b2adf620967125b298fa75b5dd Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Fri, 20 Dec 2024 16:43:11 +0800 Subject: [PATCH 10/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - change docker image version. --- .github/workflows/integration-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index da584fb..7d1f8bb 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -84,8 +84,8 @@ jobs: run: | docker pull apachepulsar/pulsar-all:4.0.1 docker pull apachepulsar/pulsar:4.0.1 - docker tag apachepulsar/pulsar-all:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) apachepulsar/pulsar-all:latest - docker tag apachepulsar/pulsar:4.0.1-$(git rev-parse --short=7 HEAD 2>/dev/null || echo no-git) apachepulsar/pulsar:latest + docker tag apachepulsar/pulsar-all:4.0.1 apachepulsar/pulsar-all:4.0.1-$(git rev-parse --short=7 HEAD) + docker tag apachepulsar/pulsar:4.0.1 apachepulsar/pulsar:4.0.1-$(git rev-parse --short=7 HEAD) cd ~/pulsar mvn -B -ntp -f tests/docker-images/pom.xml install -pl org.apache.pulsar.tests:latest-version-image -am -Pdocker,-main -DskipTests From d899dcd8262d4daaa982cffbd5b96befab29924a Mon Sep 17 00:00:00 2001 From: Vision Xu Date: Fri, 20 Dec 2024 17:40:49 +0800 Subject: [PATCH 11/11] Fix issue: https://github.com/apache/pulsar/issues/23555. - fix docker tag error --- .github/workflows/integration-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 7d1f8bb..2afbca8 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -82,11 +82,11 @@ jobs: - name: build apachepulsar/pulsar-test-latest-version:latest if: ${{ steps.check_changes.outputs.docs_only != 'true' }} run: | + cd ~/pulsar docker pull apachepulsar/pulsar-all:4.0.1 docker pull apachepulsar/pulsar:4.0.1 docker tag apachepulsar/pulsar-all:4.0.1 apachepulsar/pulsar-all:4.0.1-$(git rev-parse --short=7 HEAD) docker tag apachepulsar/pulsar:4.0.1 apachepulsar/pulsar:4.0.1-$(git rev-parse --short=7 HEAD) - cd ~/pulsar mvn -B -ntp -f tests/docker-images/pom.xml install -pl org.apache.pulsar.tests:latest-version-image -am -Pdocker,-main -DskipTests - name: run integration tests