This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch benchmark-request
in repository https://gitbox.apache.org/repos/asf/flink.git
commit a2ad139d0bf0dd62a57b8563888e73f794e0b1f2
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Wed Jul 7 12:05:53 2021 +0200
[FLINK-23329][build] Bump flink-shaded to 14.0
---
flink-dist/pom.xml | 2 +-
.../java/org/apache/flink/cep/utils/TestSharedBuffer.java | 4 +---
.../flink/yarn/YARNSessionCapacitySchedulerITCase.java | 2 +-
pom.xml | 14 +++++++-------
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 0355f27..b88b92b 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -34,7 +34,7 @@ under the License.
<packaging>jar</packaging>
<properties>
- <zookeeper.optional.version>3.5.6</zookeeper.optional.version>
+ <zookeeper.optional.version>3.5.9</zookeeper.optional.version>
</properties>
<dependencies>
diff --git
a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/utils/TestSharedBuffer.java
b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/utils/TestSharedBuffer.java
index e133c44..8a5df5b 100644
---
a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/utils/TestSharedBuffer.java
+++
b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/utils/TestSharedBuffer.java
@@ -32,8 +32,6 @@ import org.apache.flink.api.common.state.ValueStateDescriptor;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.cep.nfa.sharedbuffer.SharedBuffer;
-import org.apache.flink.shaded.guava18.com.google.common.collect.Iterators;
-
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
@@ -207,7 +205,7 @@ public class TestSharedBuffer<V> extends SharedBuffer<V> {
@Override
public Iterator<Map.Entry<UK, UV>> iterator() throws Exception
{
if (values == null) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
return new
CountingIterator<>(values.entrySet().iterator());
diff --git
a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
index e5ae45d..2f3e5dd 100644
---
a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
+++
b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
@@ -322,7 +322,7 @@ public class YARNSessionCapacitySchedulerITCase extends
YarnTestBase {
try {
final String logs = outContent.toString();
final HostAndPort hostAndPort =
parseJobManagerHostname(logs);
- final String host = hostAndPort.getHostText();
+ final String host = hostAndPort.getHost();
final int port = hostAndPort.getPort();
LOG.info("Extracted hostname:port: {}:{}", host, port);
diff --git a/pom.xml b/pom.xml
index c2dbb32..0068d38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,8 @@ under the License.
to avoid process kills due to container limits on
TravisCI -->
<flink.forkCountTestPackage>${flink.forkCount}</flink.forkCountTestPackage>
<flink.reuseForks>true</flink.reuseForks>
- <flink.shaded.version>13.0</flink.shaded.version>
+ <flink.shaded.version>14.0</flink.shaded.version>
+
<flink.shaded.jackson.version>2.12.4</flink.shaded.jackson.version>
<guava.version>18.0</guava.version>
<akka.version>2.5.21</akka.version>
<target.java.version>1.8</target.java.version>
@@ -120,7 +121,6 @@ under the License.
<zookeeper.version>3.4.14</zookeeper.version>
<!-- Only the curator2 TestingServer works with ZK 3.4 -->
<curator.version>2.12.0</curator.version>
- <jackson.version>2.12.1</jackson.version>
<prometheus.version>0.8.1</prometheus.version>
<avro.version>1.10.0</avro.version>
<javax.activation.api.version>1.2.0</javax.activation.api.version>
@@ -281,31 +281,31 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-guava</artifactId>
- <version>18.0-${flink.shaded.version}</version>
+
<version>30.1.1-jre-${flink.shaded.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson</artifactId>
-
<version>${jackson.version}-${flink.shaded.version}</version>
+
<version>${flink.shaded.jackson.version}-${flink.shaded.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-module-jsonSchema</artifactId>
-
<version>${jackson.version}-${flink.shaded.version}</version>
+
<version>${flink.shaded.jackson.version}-${flink.shaded.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-netty</artifactId>
-
<version>4.1.49.Final-${flink.shaded.version}</version>
+
<version>4.1.65.Final-${flink.shaded.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-netty-tcnative-dynamic</artifactId>
-
<version>2.0.30.Final-${flink.shaded.version}</version>
+
<version>2.0.39.Final-${flink.shaded.version}</version>
<scope>test</scope>
</dependency>
