From c260c4e4f7de0c3d2641cbcd424052d749fc997a Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 21:49:33 +0800 Subject: [PATCH 1/8] Upgrade zookeeper version --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3cf4204a598a2..889b29990921a 100644 --- a/pom.xml +++ b/pom.xml @@ -91,9 +91,9 @@ 1.70 1.1 - - 3.8.1 - 5.4.0 + + 3.9.0 + 5.5.0 0.7.5 1.58.0 From 1a79aadc2bee707a785a4abecd668f3b6958c856 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 21:51:16 +0800 Subject: [PATCH 2/8] Upgrade zookeeper version --- .../proxy-native/src/main/release-docs/LICENSE | 10 +++++----- distribution/proxy/src/main/release-docs/LICENSE | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE index dad8e756555ba..c9c8594ff6561 100644 --- a/distribution/proxy-native/src/main/release-docs/LICENSE +++ b/distribution/proxy-native/src/main/release-docs/LICENSE @@ -231,9 +231,9 @@ The text of each license is the standard Apache 2.0 license. commons-lang 2.4: https://github.com/apache/commons-lang, Apache 2.0 commons-lang3 3.12.0: https://github.com/apache/commons-lang, Apache 2.0 commons-logging 1.1.3: https://github.com/apache/commons-logging, Apache 2.0 - curator-client 5.4.0: https://github.com/apache/curator, Apache 2.0 - curator-framework 5.4.0: https://github.com/apache/curator, Apache 2.0 - curator-recipes 5.4.0: https://github.com/apache/curator, Apache 2.0 + curator-client 5.5.0: https://github.com/apache/curator, Apache 2.0 + curator-framework 5.5.0: https://github.com/apache/curator, Apache 2.0 + curator-recipes 5.5.0: https://github.com/apache/curator, Apache 2.0 error_prone_annotations 2.22.0: https://github.com/google/error-prone, Apache 2.0 failsafe 2.4.4: https://github.com/jhalterman/failsafe, Apache 2.0 failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0 @@ -297,8 +297,8 @@ The text of each license is the standard Apache 2.0 license. snakeyaml 1.33: https://bitbucket.org/snakeyaml/snakeyaml, Apache 2.0 transmittable-thread-local 2.14.2: https://github.com/alibaba/transmittable-thread-local, Apache 2.0 uzaygezen-core 0.2: https://code.google.com/p/uzaygezen, Apache 2.0 - zookeeper 3.8.1: https://github.com/apache/zookeeper, Apache 2.0 - zookeeper-jute 3.8.1: https://github.com/apache/zookeeper, Apache 2.0 + zookeeper 3.9.0: https://github.com/apache/zookeeper, Apache 2.0 + zookeeper-jute 3.9.0: https://github.com/apache/zookeeper, Apache 2.0 ======================================================================== Apache 2.0 licenses diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE index dad8e756555ba..c9c8594ff6561 100644 --- a/distribution/proxy/src/main/release-docs/LICENSE +++ b/distribution/proxy/src/main/release-docs/LICENSE @@ -231,9 +231,9 @@ The text of each license is the standard Apache 2.0 license. commons-lang 2.4: https://github.com/apache/commons-lang, Apache 2.0 commons-lang3 3.12.0: https://github.com/apache/commons-lang, Apache 2.0 commons-logging 1.1.3: https://github.com/apache/commons-logging, Apache 2.0 - curator-client 5.4.0: https://github.com/apache/curator, Apache 2.0 - curator-framework 5.4.0: https://github.com/apache/curator, Apache 2.0 - curator-recipes 5.4.0: https://github.com/apache/curator, Apache 2.0 + curator-client 5.5.0: https://github.com/apache/curator, Apache 2.0 + curator-framework 5.5.0: https://github.com/apache/curator, Apache 2.0 + curator-recipes 5.5.0: https://github.com/apache/curator, Apache 2.0 error_prone_annotations 2.22.0: https://github.com/google/error-prone, Apache 2.0 failsafe 2.4.4: https://github.com/jhalterman/failsafe, Apache 2.0 failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0 @@ -297,8 +297,8 @@ The text of each license is the standard Apache 2.0 license. snakeyaml 1.33: https://bitbucket.org/snakeyaml/snakeyaml, Apache 2.0 transmittable-thread-local 2.14.2: https://github.com/alibaba/transmittable-thread-local, Apache 2.0 uzaygezen-core 0.2: https://code.google.com/p/uzaygezen, Apache 2.0 - zookeeper 3.8.1: https://github.com/apache/zookeeper, Apache 2.0 - zookeeper-jute 3.8.1: https://github.com/apache/zookeeper, Apache 2.0 + zookeeper 3.9.0: https://github.com/apache/zookeeper, Apache 2.0 + zookeeper-jute 3.9.0: https://github.com/apache/zookeeper, Apache 2.0 ======================================================================== Apache 2.0 licenses From 9c8c86de5d38cc3aa69235dbb002109dc9a5728b Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 22:00:29 +0800 Subject: [PATCH 3/8] Upgrade zookeeper version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 889b29990921a..f25ea2fa96729 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ 1.70 1.1 - + 3.9.0 5.5.0 0.7.5 From 66f4a900e8df412ff6d3e2cfde2e9407371ab959 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 23:25:35 +0800 Subject: [PATCH 4/8] Upgrade logback version --- distribution/proxy-native/src/main/release-docs/LICENSE | 4 ++-- distribution/proxy/src/main/release-docs/LICENSE | 4 ++-- pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE index c9c8594ff6561..1252bc82d6711 100644 --- a/distribution/proxy-native/src/main/release-docs/LICENSE +++ b/distribution/proxy-native/src/main/release-docs/LICENSE @@ -351,8 +351,8 @@ EPL licenses The following components are provided under the EPL License. See project link for details. The text of each license is also included at licenses/LICENSE-[project].txt. - logback-classic 1.2.11: https://github.com/qos-ch/logback, EPL 1.0 - logback-core 1.2.11: https://github.com/qos-ch/logback, EPL 1.0 + logback-classic 1.2.12: https://github.com/qos-ch/logback, EPL 1.0 + logback-core 1.2.12: https://github.com/qos-ch/logback, EPL 1.0 mchange-commons-java 0.2.15: https://github.com/swaldman/mchange-commons-java, EPL 1.0 h2 2.2.224: https://github.com/h2database/h2database, EPL 1.0 diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE index c9c8594ff6561..1252bc82d6711 100644 --- a/distribution/proxy/src/main/release-docs/LICENSE +++ b/distribution/proxy/src/main/release-docs/LICENSE @@ -351,8 +351,8 @@ EPL licenses The following components are provided under the EPL License. See project link for details. The text of each license is also included at licenses/LICENSE-[project].txt. - logback-classic 1.2.11: https://github.com/qos-ch/logback, EPL 1.0 - logback-core 1.2.11: https://github.com/qos-ch/logback, EPL 1.0 + logback-classic 1.2.12: https://github.com/qos-ch/logback, EPL 1.0 + logback-core 1.2.12: https://github.com/qos-ch/logback, EPL 1.0 mchange-commons-java 0.2.15: https://github.com/swaldman/mchange-commons-java, EPL 1.0 h2 2.2.224: https://github.com/h2database/h2database, EPL 1.0 diff --git a/pom.xml b/pom.xml index f25ea2fa96729..ff5886bdab491 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.0.3 1.7.36 - 1.2.11 + 1.2.12 1.18.30 From 7b501b534a83878754373d1b4213b43fb2865982 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 23:27:08 +0800 Subject: [PATCH 5/8] Upgrade logback version --- distribution/proxy-native/src/main/release-docs/LICENSE | 2 +- distribution/proxy/src/main/release-docs/LICENSE | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE index 1252bc82d6711..3637655b27e83 100644 --- a/distribution/proxy-native/src/main/release-docs/LICENSE +++ b/distribution/proxy-native/src/main/release-docs/LICENSE @@ -224,7 +224,7 @@ The text of each license is the standard Apache 2.0 license. caffeine 2.9.3: https://github.com/ben-manes/caffeine, Apache 2.0 calcite-core 1.35.0: https://calcite.apache.org, Apache 2.0 calcite-linq4j 1.35.0: https://calcite.apache.org, Apache 2.0 - commons-codec 1.15: https://github.com/apache/commons-codec, Apache 2.0 + commons-codec 1.16.0: https://github.com/apache/commons-codec, Apache 2.0 commons-collections4 4.4: https://github.com/apache/commons-collections, Apache 2.0 commons-exec 1.3: https://github.com/apache/commons-exec, Apache 2.0 commons-io 2.11.0: https://github.com/apache/commons-io, Apache 2.0 diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE index 1252bc82d6711..3637655b27e83 100644 --- a/distribution/proxy/src/main/release-docs/LICENSE +++ b/distribution/proxy/src/main/release-docs/LICENSE @@ -224,7 +224,7 @@ The text of each license is the standard Apache 2.0 license. caffeine 2.9.3: https://github.com/ben-manes/caffeine, Apache 2.0 calcite-core 1.35.0: https://calcite.apache.org, Apache 2.0 calcite-linq4j 1.35.0: https://calcite.apache.org, Apache 2.0 - commons-codec 1.15: https://github.com/apache/commons-codec, Apache 2.0 + commons-codec 1.16.0: https://github.com/apache/commons-codec, Apache 2.0 commons-collections4 4.4: https://github.com/apache/commons-collections, Apache 2.0 commons-exec 1.3: https://github.com/apache/commons-exec, Apache 2.0 commons-io 2.11.0: https://github.com/apache/commons-io, Apache 2.0 diff --git a/pom.xml b/pom.xml index ff5886bdab491..dc524ec005e69 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 2.22.0 3.12.0 4.4 - 1.15 + 1.16.0 2.14.2 4.10.1 From 5f7bd7aab84d03284c96d9d7fd381b0bd635285c Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 23:28:53 +0800 Subject: [PATCH 6/8] Upgrade logback version --- distribution/proxy-native/src/main/release-docs/LICENSE | 2 +- distribution/proxy/src/main/release-docs/LICENSE | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE index 3637655b27e83..5bed3db28bf86 100644 --- a/distribution/proxy-native/src/main/release-docs/LICENSE +++ b/distribution/proxy-native/src/main/release-docs/LICENSE @@ -247,7 +247,7 @@ The text of each license is the standard Apache 2.0 license. grpc-protobuf 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0 grpc-protobuf-lite 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0 grpc-stub 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0 - gson 2.9.1: https://github.com/google/gson, Apache 2.0 + gson 2.10.1: https://github.com/google/gson, Apache 2.0 guava 32.1.2-jre: https://github.com/google/guava, Apache 2.0 HikariCP 4.0.3: https://github.com/brettwooldridge/HikariCP, Apache 2.0 httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0 diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE index 3637655b27e83..5bed3db28bf86 100644 --- a/distribution/proxy/src/main/release-docs/LICENSE +++ b/distribution/proxy/src/main/release-docs/LICENSE @@ -247,7 +247,7 @@ The text of each license is the standard Apache 2.0 license. grpc-protobuf 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0 grpc-protobuf-lite 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0 grpc-stub 1.58.0: https://github.com/grpc/grpc-java, Apache 2.0 - gson 2.9.1: https://github.com/google/gson, Apache 2.0 + gson 2.10.1: https://github.com/google/gson, Apache 2.0 guava 32.1.2-jre: https://github.com/google/guava, Apache 2.0 HikariCP 4.0.3: https://github.com/brettwooldridge/HikariCP, Apache 2.0 httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0 diff --git a/pom.xml b/pom.xml index dc524ec005e69..b788dde5b2d45 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 4.10.1 1.14.8 1.33 - 2.9.1 + 2.10.1 2.14.0 2.8.0 4.0.10 From 20520a600d50edbc50e1ce4c65bfcace80f3b57a Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 23:30:34 +0800 Subject: [PATCH 7/8] Upgrade junit version --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b788dde5b2d45..604c7a30edb38 100644 --- a/pom.xml +++ b/pom.xml @@ -113,13 +113,13 @@ 1.7.1 4.0.3 - - 5.9.2 + + 5.10.0 2.2 4.11.0 + 4.2.0 3.21.12 - 4.2.0 0.6.1 From ddd7a835ef3cb40ef9849d4ec69d79f2058e9405 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Mon, 16 Oct 2023 00:57:16 +0800 Subject: [PATCH 8/8] Upgrade junit version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 604c7a30edb38..d987a063a420b 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 1.7.1 4.0.3 - + 5.10.0 2.2 4.11.0