Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[branch-2.10][improve][build] Upgrade dependencies to reduce CVE. #20162

Merged
merged 3 commits into from
Apr 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
32 changes: 16 additions & 16 deletions pulsar-sql/presto-distribution/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 0 additions & 30 deletions src/owasp-dependency-check-suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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><![CDATA[
Expand Down
Loading