Skip to content

Commit

Permalink
Update Guava to version 30.0 (apache#8538)
Browse files Browse the repository at this point in the history
### Motivation

Guava with version lower than 30.0 has vulnerability.
https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415

### Modifications

- Guava 25.1 -> 30.0
  • Loading branch information
kimula authored Nov 17, 2020
1 parent bd475c2 commit 5bbd447
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@ The Apache Software License, Version 2.0
- io.sundr-sundr-codegen-0.21.0.jar
- io.sundr-sundr-core-0.21.0.jar
* Guava
- com.google.guava-guava-25.1-jre.jar
- com.google.guava-guava-30.0-jre.jar
- com.google.guava-failureaccess-1.0.1.jar
- com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
* J2ObjC Annotations -- com.google.j2objc-j2objc-annotations-1.1.jar
* J2ObjC Annotations -- com.google.j2objc-j2objc-annotations-1.3.jar
* Netty Reactive Streams -- com.typesafe.netty-netty-reactive-streams-2.0.4.jar
* Swagger
- io.swagger-swagger-annotations-1.5.21.jar
Expand Down Expand Up @@ -448,7 +448,7 @@ The Apache Software License, Version 2.0
- org.eclipse.jetty.websocket-websocket-servlet-9.4.33.v20201020.jar
* SnakeYaml -- org.yaml-snakeyaml-1.26.jar
* RocksDB - org.rocksdb-rocksdbjni-6.10.2.jar
* Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.1.3.jar
* Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.3.4.jar
* Apache Thrifth - org.apache.thrift-libthrift-0.12.0.jar
* OkHttp
- com.squareup.okhttp-okhttp-2.5.0.jar
Expand Down Expand Up @@ -529,10 +529,10 @@ MIT License
- org.slf4j-slf4j-api-1.7.25.jar
- org.slf4j-jcl-over-slf4j-1.7.25.jar
* Animal Sniffer Annotations
- org.codehaus.mojo-animal-sniffer-annotations-1.14.jar
- org.codehaus.mojo-animal-sniffer-annotations-1.17.jar
* The Checker Framework
- org.checkerframework-checker-compat-qual-2.5.2.jar
- org.checkerframework-checker-qual-2.0.0.jar
- org.checkerframework-checker-qual-3.5.0.jar

Protocol Buffers License
* Protocol Buffers
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ flexible messaging model and an intuitive client API.</description>
<jsonwebtoken.version>0.11.1</jsonwebtoken.version>
<opencensus.version>0.18.0</opencensus.version>
<hbase.version>2.3.0</hbase.version>
<guava.version>25.1-jre</guava.version>
<guava.version>30.0-jre</guava.version>
<jcip.version>1.0</jcip.version>
<prometheus-jmx.version>0.14.0</prometheus-jmx.version>
<confluent.version>5.3.2</confluent.version>
Expand Down
12 changes: 6 additions & 6 deletions pulsar-sql/presto-distribution/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ The Apache Software License, Version 2.0
- jackson-module-jaxb-annotations-2.11.1.jar
- jackson-module-jsonSchema-2.11.1.jar
* Guava
- guava-25.1-jre.jar
- guava-30.0-jre.jar
- listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
- failureaccess-1.0.1.jar
* Google Guice
- guice-4.2.3.jar
- guice-multibindings-4.2.0.jar
Expand Down Expand Up @@ -304,15 +306,15 @@ The Apache Software License, Version 2.0
- httpclient-4.5.5.jar
- httpcore-4.4.9.jar
* Error Prone Annotations
- error_prone_annotations-2.1.3.jar
- error_prone_annotations-2.3.4.jar
* Esri Geometry API For Java
- esri-geometry-api-2.2.2.jar
* Failsafe
- failsafe-2.0.1.jar
* Fastutil
- fastutil-8.3.0.jar
* J2ObjC Annotations
- j2objc-annotations-1.1.jar
- j2objc-annotations-1.3.jar
* JSON Web Token Support For The JVM
- jjwt-0.9.0.jar
* Jmxutils
Expand Down Expand Up @@ -482,8 +484,6 @@ BSD License
- jline-terminal-jna-3.12.1.jar

MIT License
* Animal Sniffer Annotations
- animal-sniffer-annotations-1.14.jar
* PCollections
- pcollections-2.1.2.jar
* SLF4J
Expand All @@ -496,7 +496,7 @@ MIT License
* JUL to SLF4J Bridge
- jul-to-slf4j-1.7.25.jar
* Checker Qual
- checker-qual-2.0.0.jar
- checker-qual-3.5.0.jar

CDDL - 1.0
* OSGi Resource Locator
Expand Down
2 changes: 1 addition & 1 deletion pulsar-sql/presto-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<!--https://www.cvedetails.com/vulnerability-list/vendor_id-15866/product_id-42991/Fasterxml-Jackson-databind.html-->
<jackson.databind.version>2.11.1</jackson.databind.version>
<maven.version>3.0.5</maven.version>
<guava.version>25.1-jre</guava.version>
<guava.version>30.0-jre</guava.version>
<asynchttpclient.version>2.12.1</asynchttpclient.version>
</properties>

Expand Down

0 comments on commit 5bbd447

Please sign in to comment.