[FLINK-25773][build] Upgrade to flink-shaded 15.0

mbalassi · Jan 28, 2022 · 7eb0c36 · 7eb0c36
1 parent 1704b13
commit 7eb0c36
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -664,7 +664,7 @@ under the License.
  <artifactItem>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-zookeeper-3</artifactId>
- <version>${zookeeper.optional.version}-${flink.shaded.version}</version>
+ <version>${zookeeper.optional.version}-14.0</version>
  <type>jar</type>
  <overWrite>true</overWrite>
  </artifactItem>

diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
@@ -48,7 +48,7 @@ under the License.
  <outputDirectory>lib</outputDirectory>
  <unpack>false</unpack>
  <includes>
- <include>org.apache.flink:flink-shaded-zookeeper-3:jar:${zookeeper.version}-${flink.shaded.version}</include>
+ <include>org.apache.flink:flink-shaded-zookeeper-3:jar:${zookeeper.version}-14.0</include>
  </includes>
  <outputFileNameMapping>flink-shaded-zookeeper-${zookeeper.version}.jar</outputFileNameMapping>
  </dependencySet>

diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
@@ -126,7 +126,7 @@
  </file>
 
  <file>
- <source>target/temporary/flink-shaded-zookeeper-3-${zookeeper.optional.version}-${flink.shaded.version}.jar</source>
+ <source>target/temporary/flink-shaded-zookeeper-3-${zookeeper.optional.version}-14.0.jar</source>
  <outputDirectory>opt</outputDirectory>
  <destName>flink-shaded-zookeeper-${zookeeper.optional.version}.jar</destName>
  <fileMode>0644</fileMode>

diff --git a/pom.xml b/pom.xml
@@ -103,7 +103,7 @@ 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>14.0</flink.shaded.version>
+ <flink.shaded.version>15.0</flink.shaded.version>
  <flink.shaded.jackson.version>2.12.4</flink.shaded.jackson.version>
  <guava.version>18.0</guava.version>
  <target.java.version>1.8</target.java.version>
@@ -296,7 +296,7 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-asm-7</artifactId>
- <version>7.1-${flink.shaded.version}</version>
+ <version>7.1-14.0</version>
  </dependency>
 
  <dependency>
@@ -320,13 +320,13 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-netty</artifactId>
- <version>4.1.65.Final-${flink.shaded.version}</version>
+ <version>4.1.65.Final-14.0</version>
  </dependency>
 
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-netty-tcnative-dynamic</artifactId>
- <version>2.0.39.Final-${flink.shaded.version}</version>
+ <version>2.0.39.Final-14.0</version>
  <scope>test</scope>
  </dependency>
 
@@ -433,7 +433,7 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-zookeeper-3</artifactId>
- <version>${zookeeper.version}-${flink.shaded.version}</version>
+ <version>${zookeeper.version}-14.0</version>
  </dependency>
 
  <!-- This manages the 'javax.annotation' annotations (JSR305) -->