diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 5a55d8f70aeb5..b7a57c7f3d8c5 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -664,7 +664,7 @@ under the License. org.apache.flink flink-shaded-zookeeper-3 - ${zookeeper.optional.version}-${flink.shaded.version} + ${zookeeper.optional.version}-14.0 jar true diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml index afd6492ff5d84..eac4dcbb07a19 100644 --- a/flink-dist/src/main/assemblies/bin.xml +++ b/flink-dist/src/main/assemblies/bin.xml @@ -48,7 +48,7 @@ under the License. lib false - org.apache.flink:flink-shaded-zookeeper-3:jar:${zookeeper.version}-${flink.shaded.version} + org.apache.flink:flink-shaded-zookeeper-3:jar:${zookeeper.version}-14.0 flink-shaded-zookeeper-${zookeeper.version}.jar diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml index 364151b45de50..03e1996b7b7a9 100644 --- a/flink-dist/src/main/assemblies/opt.xml +++ b/flink-dist/src/main/assemblies/opt.xml @@ -126,7 +126,7 @@ - target/temporary/flink-shaded-zookeeper-3-${zookeeper.optional.version}-${flink.shaded.version}.jar + target/temporary/flink-shaded-zookeeper-3-${zookeeper.optional.version}-14.0.jar opt flink-shaded-zookeeper-${zookeeper.optional.version}.jar 0644 diff --git a/pom.xml b/pom.xml index 6f51f4d8fd247..dfd988210a147 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ under the License. to avoid process kills due to container limits on TravisCI --> ${flink.forkCount} true - 14.0 + 15.0 2.12.4 18.0 1.8 @@ -296,7 +296,7 @@ under the License. org.apache.flink flink-shaded-asm-7 - 7.1-${flink.shaded.version} + 7.1-14.0 @@ -320,13 +320,13 @@ under the License. org.apache.flink flink-shaded-netty - 4.1.65.Final-${flink.shaded.version} + 4.1.65.Final-14.0 org.apache.flink flink-shaded-netty-tcnative-dynamic - 2.0.39.Final-${flink.shaded.version} + 2.0.39.Final-14.0 test @@ -433,7 +433,7 @@ under the License. org.apache.flink flink-shaded-zookeeper-3 - ${zookeeper.version}-${flink.shaded.version} + ${zookeeper.version}-14.0