Skip to content

Commit 013a3af

Browse files
mateczaganyMartijnVisser
authored andcommitted
[FLINK-38694][Build/Shaded] Update Guava to 33.5.0-jre
1 parent 43397fc commit 013a3af

File tree

10 files changed

+23
-7
lines changed

10 files changed

+23
-7
lines changed

flink-shaded-guava-33/src/main/resources/META-INF/NOTICE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ The Apache Software Foundation (http://www.apache.org/).
66

77
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
88

9-
- com.google.guava:guava:33.4.0-jre
10-
- com.google.guava:failureaccess:1.0.2
9+
- com.google.guava:guava:33.5.0-jre
10+
- com.google.guava:failureaccess:1.0.3

flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ under the License.
8484
<groupId>com.google.guava</groupId>
8585
<artifactId>listenablefuture</artifactId>
8686
</exclusion>
87+
<exclusion>
88+
<groupId>org.jspecify</groupId>
89+
<artifactId>jspecify</artifactId>
90+
</exclusion>
8791
<exclusion>
8892
<!-- not relevant at runtime -->
8993
<groupId>com.google.j2objc</groupId>

flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).
66

77
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
88

9-
- com.google.guava:guava:33.4.0-jre
9+
- com.google.guava:guava:33.5.0-jre
1010
- io.netty:netty-buffer:4.2.6.Final
1111
- io.netty:netty-codec-base:4.2.6.Final
1212
- io.netty:netty-common:4.2.6.Final

flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ under the License.
109109
<groupId>com.google.guava</groupId>
110110
<artifactId>listenablefuture</artifactId>
111111
</exclusion>
112+
<exclusion>
113+
<groupId>org.jspecify</groupId>
114+
<artifactId>jspecify</artifactId>
115+
</exclusion>
112116
<exclusion>
113117
<!-- not relevant at runtime -->
114118
<groupId>com.google.j2objc</groupId>

flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).
66

77
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
88

9-
- com.google.guava:guava:33.4.0-jre
9+
- com.google.guava:guava:33.5.0-jre
1010
- io.dropwizard.metrics:metrics-core:3.2.5
1111
- io.netty:netty-buffer:4.2.6.Final
1212
- io.netty:netty-codec-base:4.2.6.Final

flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ under the License.
9494
<groupId>com.google.guava</groupId>
9595
<artifactId>listenablefuture</artifactId>
9696
</exclusion>
97+
<exclusion>
98+
<groupId>org.jspecify</groupId>
99+
<artifactId>jspecify</artifactId>
100+
</exclusion>
97101
<exclusion>
98102
<!-- not relevant at runtime -->
99103
<groupId>com.google.j2objc</groupId>

flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).
66

77
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
88

9-
- com.google.guava:guava:33.4.0-jre
9+
- com.google.guava:guava:33.5.0-jre
1010
- io.dropwizard.metrics:metrics-core:4.1.12.1
1111
- io.netty:netty-buffer:4.2.6.Final
1212
- io.netty:netty-codec-base:4.2.6.Final

flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ under the License.
9898
<groupId>com.google.guava</groupId>
9999
<artifactId>listenablefuture</artifactId>
100100
</exclusion>
101+
<exclusion>
102+
<groupId>org.jspecify</groupId>
103+
<artifactId>jspecify</artifactId>
104+
</exclusion>
101105
<exclusion>
102106
<!-- not relevant at runtime -->
103107
<groupId>com.google.j2objc</groupId>

flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).
66

77
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
88

9-
- com.google.guava:guava:33.4.0-jre
9+
- com.google.guava:guava:33.5.0-jre
1010
- commons-io:commons-io:2.17.0
1111
- io.dropwizard.metrics:metrics-core:4.1.12.1
1212
- io.netty:netty-buffer:4.2.6.Final

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ under the License.
6565
<netty.version>4.2.6.Final</netty.version>
6666
<jackson.version>2.20.1</jackson.version>
6767
<jsonpath.version>2.10.0</jsonpath.version>
68-
<guava.version>33.4.0-jre</guava.version>
68+
<guava.version>33.5.0-jre</guava.version>
6969
<!-- The license check requires the artifactId to match the directory that the module resides in.
7070
This is not the case for several modules in flink-shaded for legacy reasons.
7171
This property can be used by modules to add a suffix to the artifactId to match the directory name on CI

0 commit comments

Comments
 (0)