This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new d86e16811f3 [improve][build] Upgrade dependencies to reduce CVE.
(#20162)
d86e16811f3 is described below
commit d86e16811f389f71c13df6972615ba2da220d47f
Author: Jiwei Guo <[email protected]>
AuthorDate: Sat Apr 22 20:42:55 2023 +0800
[improve][build] Upgrade dependencies to reduce CVE. (#20162)
---
distribution/server/src/assemble/LICENSE.bin.txt | 46 ++++++++++++------------
pom.xml | 4 +--
pulsar-sql/presto-distribution/LICENSE | 32 ++++++++---------
src/owasp-dependency-check-suppressions.xml | 30 ----------------
4 files changed, 41 insertions(+), 71 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index f80923b791c..62e3439c97c 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -430,25 +430,25 @@ The Apache Software License, Version 2.0
- org.asynchttpclient-async-http-client-2.12.1.jar
- org.asynchttpclient-async-http-client-netty-utils-2.12.1.jar
* Jetty
- - org.eclipse.jetty-jetty-client-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-continuation-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-http-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-io-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-proxy-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-security-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-server-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-servlet-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-servlets-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-util-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-util-ajax-9.4.48.v20220622.jar
- -
org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.48.v20220622.jar
- - org.eclipse.jetty.websocket-websocket-api-9.4.48.v20220622.jar
- - org.eclipse.jetty.websocket-websocket-client-9.4.48.v20220622.jar
- - org.eclipse.jetty.websocket-websocket-common-9.4.48.v20220622.jar
- - org.eclipse.jetty.websocket-websocket-server-9.4.48.v20220622.jar
- - org.eclipse.jetty.websocket-websocket-servlet-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.48.v20220622.jar
- - org.eclipse.jetty-jetty-alpn-server-9.4.48.v20220622.jar
+ - org.eclipse.jetty-jetty-client-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-continuation-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-proxy-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-server-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-servlet-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-servlets-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-util-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-util-ajax-9.4.51.v20230217.jar
+ -
org.eclipse.jetty.websocket-javax-websocket-client-impl-9.4.51.v20230217.jar
+ - org.eclipse.jetty.websocket-websocket-api-9.4.51.v20230217.jar
+ - org.eclipse.jetty.websocket-websocket-client-9.4.51.v20230217.jar
+ - org.eclipse.jetty.websocket-websocket-common-9.4.51.v20230217.jar
+ - org.eclipse.jetty.websocket-websocket-server-9.4.51.v20230217.jar
+ - org.eclipse.jetty.websocket-websocket-servlet-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.51.v20230217.jar
+ - org.eclipse.jetty-jetty-alpn-server-9.4.51.v20230217.jar
* SnakeYaml -- org.yaml-snakeyaml-2.0.jar
* RocksDB - org.rocksdb-rocksdbjni-6.10.2.jar
* Google Error Prone Annotations -
com.google.errorprone-error_prone_annotations-2.5.1.jar
@@ -459,10 +459,10 @@ The Apache Software License, Version 2.0
* Okio - com.squareup.okio-okio-2.8.0.jar
* Javassist -- org.javassist-javassist-3.25.0-GA.jar
* Kotlin Standard Lib
- - org.jetbrains.kotlin-kotlin-stdlib-1.4.32.jar
- - org.jetbrains.kotlin-kotlin-stdlib-common-1.4.32.jar
- - org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.4.32.jar
- - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.4.32.jar
+ - org.jetbrains.kotlin-kotlin-stdlib-1.6.0.jar
+ - org.jetbrains.kotlin-kotlin-stdlib-common-1.6.0.jar
+ - org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.6.0.jar
+ - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.6.0.jar
- org.jetbrains-annotations-13.0.jar
* gRPC
- io.grpc-grpc-all-1.45.1.jar
diff --git a/pom.xml b/pom.xml
index 545af19bc0d..26eaa9c63d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@ flexible messaging model and an intuitive client
API.</description>
<curator.version>5.1.0</curator.version>
<netty.version>4.1.87.Final</netty.version>
<netty-iouring.version>0.0.17.Final</netty-iouring.version>
- <jetty.version>9.4.48.v20220622</jetty.version>
+ <jetty.version>9.4.51.v20230217</jetty.version>
<conscrypt.version>2.5.2</conscrypt.version>
<jersey.version>2.34</jersey.version>
<athenz.version>1.10.50</athenz.version>
@@ -203,7 +203,7 @@ flexible messaging model and an intuitive client
API.</description>
<!-- use okio version that matches the okhttp3 version -->
<okio.version>2.8.0</okio.version>
<!-- override kotlin-stdlib used by okio in order to address
CVE-2020-29582 -->
- <kotlin-stdlib.version>1.4.32</kotlin-stdlib.version>
+ <kotlin-stdlib.version>1.6.0</kotlin-stdlib.version>
<nsq-client.version>1.0</nsq-client.version>
<cron-utils.version>9.1.6</cron-utils.version>
<spring-context.version>5.3.19</spring-context.version>
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index 049ff6c8e7e..c285eff2b5d 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -274,22 +274,22 @@ The Apache Software License, Version 2.0
- joda-time-2.10.5.jar
- failsafe-2.4.4.jar
* Jetty
- - http2-client-9.4.48.v20220622.jar
- - http2-common-9.4.48.v20220622.jar
- - http2-hpack-9.4.48.v20220622.jar
- - http2-http-client-transport-9.4.48.v20220622.jar
- - jetty-alpn-client-9.4.48.v20220622.jar
- - http2-server-9.4.48.v20220622.jar
- - jetty-alpn-java-client-9.4.48.v20220622.jar
- - jetty-client-9.4.48.v20220622.jar
- - jetty-http-9.4.48.v20220622.jar
- - jetty-io-9.4.48.v20220622.jar
- - jetty-jmx-9.4.48.v20220622.jar
- - jetty-security-9.4.48.v20220622.jar
- - jetty-server-9.4.48.v20220622.jar
- - jetty-servlet-9.4.48.v20220622.jar
- - jetty-util-9.4.48.v20220622.jar
- - jetty-util-ajax-9.4.48.v20220622.jar
+ - http2-client-9.4.51.v20230217.jar
+ - http2-common-9.4.51.v20230217.jar
+ - http2-hpack-9.4.51.v20230217.jar
+ - http2-http-client-transport-9.4.51.v20230217.jar
+ - jetty-alpn-client-9.4.51.v20230217.jar
+ - http2-server-9.4.51.v20230217.jar
+ - jetty-alpn-java-client-9.4.51.v20230217.jar
+ - jetty-client-9.4.51.v20230217.jar
+ - jetty-http-9.4.51.v20230217.jar
+ - jetty-io-9.4.51.v20230217.jar
+ - jetty-jmx-9.4.51.v20230217.jar
+ - jetty-security-9.4.51.v20230217.jar
+ - jetty-server-9.4.51.v20230217.jar
+ - jetty-servlet-9.4.51.v20230217.jar
+ - jetty-util-9.4.51.v20230217.jar
+ - jetty-util-ajax-9.4.51.v20230217.jar
* Apache BVal
- bval-jsr-2.0.0.jar
* Bytecode
diff --git a/src/owasp-dependency-check-suppressions.xml
b/src/owasp-dependency-check-suppressions.xml
index 8d54b3cbe08..e242ac52cec 100644
--- a/src/owasp-dependency-check-suppressions.xml
+++ b/src/owasp-dependency-check-suppressions.xml
@@ -52,36 +52,6 @@
<vulnerabilityName regex="true">.*</vulnerabilityName>
</suppress>
- <!-- see https://github.com/apache/pulsar/pull/14629-->
- <suppress>
- <notes><![CDATA[
- file name: kotlin-stdlib-common-1.4.32.jar
- ]]></notes>
- <sha1>ef50bfa2c0491a11dcc35d9822edbfd6170e1ea2</sha1>
- <cpe>cpe:/a:jetbrains:kotlin</cpe>
- </suppress>
- <suppress>
- <notes><![CDATA[
- file name: kotlin-stdlib-jdk7-1.4.32.jar
- ]]></notes>
- <sha1>3546900a3ebff0c43f31190baf87a9220e37b7ea</sha1>
- <cve>CVE-2022-24329</cve>
- </suppress>
- <suppress>
- <notes><![CDATA[
- file name: kotlin-stdlib-jdk8-1.4.32.jar
- ]]></notes>
- <sha1>3302f9ec8a5c1ed220781dbd37770072549bd333</sha1>
- <cve>CVE-2022-24329</cve>
- </suppress>
- <suppress>
- <notes><![CDATA[
- file name: kotlin-stdlib-1.4.32.jar
- ]]></notes>
- <sha1>461367948840adbb0839c51d91ed74ef4a9ccb52</sha1>
- <cve>CVE-2022-24329</cve>
- </suppress>
-
<!-- see https://github.com/alibaba/canal/issues/4010 -->
<suppress>
<notes><