From 049b7aab7ddf3ea00758562216ac79cfb0471d77 Mon Sep 17 00:00:00 2001 From: penghui Date: Mon, 5 Dec 2022 20:45:18 +0800 Subject: [PATCH 1/4] Fix Unit Other --- pom.xml | 2 +- .../apache/pulsar/client/impl/KeySharedSubscriptionTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 626c0b7ce46cf..c9718b094a3f3 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ flexible messaging model and an intuitive client API. UTF-8 UTF-8 - true + false --add-opens java.base/jdk.internal.loader=ALL-UNNAMED diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java index 8838bd9e3a1dd..fcc9800a12041 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java @@ -156,6 +156,7 @@ public void testCanRecoverConsumptionWhenLiftMaxUnAckedMessagesRestriction(Subsc // Wait for all consumers can not read more messages. the consumers are stuck by max unacked messages. Awaitility.await() .pollDelay(5, TimeUnit.SECONDS) + .pollInterval() .until(() -> (System.currentTimeMillis() - lastActiveTime.get()) > TimeUnit.SECONDS.toMillis(5)); From bb2a594f0c9b684e0bff6b08e336dbd778c77f6d Mon Sep 17 00:00:00 2001 From: penghui Date: Mon, 5 Dec 2022 21:14:23 +0800 Subject: [PATCH 2/4] Fix Unit Other --- .../org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java index fcc9800a12041..8838bd9e3a1dd 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java @@ -156,7 +156,6 @@ public void testCanRecoverConsumptionWhenLiftMaxUnAckedMessagesRestriction(Subsc // Wait for all consumers can not read more messages. the consumers are stuck by max unacked messages. Awaitility.await() .pollDelay(5, TimeUnit.SECONDS) - .pollInterval() .until(() -> (System.currentTimeMillis() - lastActiveTime.get()) > TimeUnit.SECONDS.toMillis(5)); From ba4030879ec40f45d0e4937ce32d04fe0ac6a40d Mon Sep 17 00:00:00 2001 From: penghui Date: Tue, 6 Dec 2022 14:00:42 +0800 Subject: [PATCH 3/4] Revert "[improve][misc] Update caffeine from 2.9.1 to 3.1.2 (#18647)" This reverts commit 8d3df45df3b0216797b6158e0f8ddfab6e5889e1. --- distribution/server/src/assemble/LICENSE.bin.txt | 2 +- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 6d54074451fcf..67eb9c23d49d7 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -254,7 +254,7 @@ The Apache Software License, Version 2.0 - com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.13.4.jar - com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.13.4.jar - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.13.4.jar - * Caffeine -- com.github.ben-manes.caffeine-caffeine-3.1.2.jar + * Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar * Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar * Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.0.1.jar * Bitbucket -- org.bitbucket.b_c-jose4j-0.7.6.jar diff --git a/pom.xml b/pom.xml index c9718b094a3f3..091e6456dc1cc 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ flexible messaging model and an intuitive client API. 2.1 2.1.9 3.1.0 - 3.1.2 + 2.9.1 0.9.0 2.14.6 3.21.0 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index a1e949f59091d..45ddd085244c9 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -366,7 +366,7 @@ The Apache Software License, Version 2.0 - avro-1.10.2.jar - avro-protobuf-1.10.2.jar * Caffeine - - caffeine-3.1.2.jar + - caffeine-2.9.1.jar * Javax - javax.inject-1.jar - javax.servlet-api-3.1.0.jar From 2c3aa07fd944955f4eb520ebc670e0d4ecaf9f11 Mon Sep 17 00:00:00 2001 From: penghui Date: Tue, 6 Dec 2022 14:11:27 +0800 Subject: [PATCH 4/4] Revert --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 091e6456dc1cc..e553392ae93ea 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ flexible messaging model and an intuitive client API. UTF-8 UTF-8 - false + true --add-opens java.base/jdk.internal.loader=ALL-UNNAMED