[FLINK-22931][build] Migrate to flink-shaded-force-shading

tongcheng-elong · Jun 10, 2021 · 3b83b5e · 3b83b5e
1 parent 4cfdc31
commit 3b83b5e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 139 deletions.
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -136,7 +136,7 @@ under the License.
  <configuration>
  <artifactSet>
  <excludes>
- <exclude>org.apache.flink:force-shading</exclude>
+ <exclude>org.apache.flink:flink-shaded-force-shading</exclude>
  <exclude>com.google.code.findbugs:jsr305</exclude>
  <exclude>org.slf4j:*</exclude>
  <exclude>org.apache.logging.log4j:*</exclude>

diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -132,7 +132,7 @@ under the License.
  <configuration>
  <artifactSet>
  <excludes>
- <exclude>org.apache.flink:force-shading</exclude>
+ <exclude>org.apache.flink:flink-shaded-force-shading</exclude>
  <exclude>com.google.code.findbugs:jsr305</exclude>
  <exclude>org.slf4j:*</exclude>
  <exclude>org.apache.logging.log4j:*</exclude>

diff --git a/...throughs/flink-walkthrough-datastream-java/src/main/resources/archetype-resources/pom.xml b/...throughs/flink-walkthrough-datastream-java/src/main/resources/archetype-resources/pom.xml
@@ -136,7 +136,7 @@ under the License.
  <configuration>
  <artifactSet>
  <excludes>
- <exclude>org.apache.flink:force-shading</exclude>
+ <exclude>org.apache.flink:flink-shaded-force-shading</exclude>
  <exclude>com.google.code.findbugs:jsr305</exclude>
  <exclude>org.slf4j:*</exclude>
  <exclude>org.apache.logging.log4j:*</exclude>

diff --git a/...hroughs/flink-walkthrough-datastream-scala/src/main/resources/archetype-resources/pom.xml b/...hroughs/flink-walkthrough-datastream-scala/src/main/resources/archetype-resources/pom.xml
@@ -124,7 +124,7 @@ under the License.
  <configuration>
  <artifactSet>
  <excludes>
- <exclude>org.apache.flink:force-shading</exclude>
+ <exclude>org.apache.flink:flink-shaded-force-shading</exclude>
  <exclude>com.google.code.findbugs:jsr305</exclude>
  <exclude>org.slf4j:*</exclude>
  <exclude>org.apache.logging.log4j:*</exclude>

diff --git a/pom.xml b/pom.xml
@@ -50,8 +50,6 @@ under the License.
  </scm>
 
  <modules>
- <!-- Dummy module to force execution of the Maven Shade plugin (see Shade plugin below) -->
- <module>tools/force-shading</module>
  <module>flink-annotations</module>
  <module>flink-core</module>
  <module>flink-java</module>
@@ -166,8 +164,8 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>force-shading</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <artifactId>flink-shaded-force-shading</artifactId>
+ <version>${flink.shaded.version}</version>
  </dependency>
 
  <!-- Root dependencies for all projects -->
@@ -1787,7 +1785,7 @@ under the License.
  <filters combine.children="append">
  <!-- drop entries into META-INF and NOTICE files for the dummy artifact -->
  <filter>
- <artifact>org.apache.flink:force-shading</artifact>
+ <artifact>org.apache.flink:flink-shaded-force-shading</artifact>
  <excludes>
  <exclude>**</exclude>
  </excludes>
@@ -1807,8 +1805,10 @@ under the License.
  i.e. poms which do not contain properties which are derived from this root pom.
  In particular, the Scala version properties are defined in the root pom and without
  shading, the root pom would have to be Scala suffixed and thereby all other modules.
+ Removing this exclusion will also cause compilation errors in at least
+ 1 module (flink-connector-elasticsearch5), for unknown reasons.
  -->
- <include>org.apache.flink:force-shading</include>
+ <include>org.apache.flink:flink-shaded-force-shading</include>
  </includes>
  </artifactSet>
  </configuration>

diff --git a/tools/force-shading/pom.xml b/tools/force-shading/pom.xml
diff --git a/tools/releasing/create_release_branch.sh b/tools/releasing/create_release_branch.sh
@@ -52,8 +52,7 @@ fi
 git checkout -b $target_branch
 
 #change version in all pom files
-#-DprocessAllModules is required for force-shading to be picked up
-$MVN org.codehaus.mojo:versions-maven-plugin:2.8.1:set -DnewVersion=$NEW_VERSION -DprocessAllModules -DgenerateBackupPoms=false --quiet
+$MVN org.codehaus.mojo:versions-maven-plugin:2.8.1:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false --quiet
 
 pushd tools
 ./releasing/update_japicmp_configuration.sh

diff --git a/tools/releasing/update_branch_version.sh b/tools/releasing/update_branch_version.sh
@@ -44,8 +44,7 @@ fi
 cd ..
 
 #change version in all pom files
-#-DprocessAllModules is required for force-shading to be picked up
-$MVN org.codehaus.mojo:versions-maven-plugin:2.8.1:set -DnewVersion=$NEW_VERSION -DprocessAllModules -DgenerateBackupPoms=false --quiet
+$MVN org.codehaus.mojo:versions-maven-plugin:2.8.1:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false --quiet
 
 
 #change version of documentation