From 3b83b5e054f11787723f480074950e76cb6f397c Mon Sep 17 00:00:00 2001
From: Chesnay Schepler <chesnay@apache.org>
Date: Thu, 10 Jun 2021 23:56:45 +0200
Subject: [PATCH] [FLINK-22931][build] Migrate to flink-shaded-force-shading

---
 .../resources/archetype-resources/pom.xml     |   2 +-
 .../resources/archetype-resources/pom.xml     |   2 +-
 .../resources/archetype-resources/pom.xml     |   2 +-
 .../resources/archetype-resources/pom.xml     |   2 +-
 pom.xml                                       |  12 +-
 tools/force-shading/pom.xml                   | 125 ------------------
 tools/releasing/create_release_branch.sh      |   3 +-
 tools/releasing/update_branch_version.sh      |   3 +-
 8 files changed, 12 insertions(+), 139 deletions(-)
 delete mode 100644 tools/force-shading/pom.xml

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
index 057d9581f4dfd..4d46fd655aac7 100644
--- 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
index 61564e77d0e7c..a239b8cb32619 100644
--- 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/flink-walkthroughs/flink-walkthrough-datastream-java/src/main/resources/archetype-resources/pom.xml b/flink-walkthroughs/flink-walkthrough-datastream-java/src/main/resources/archetype-resources/pom.xml
index 0eaf0c5797906..6764060f69e4e 100644
--- a/flink-walkthroughs/flink-walkthrough-datastream-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-walkthroughs/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/flink-walkthroughs/flink-walkthrough-datastream-scala/src/main/resources/archetype-resources/pom.xml b/flink-walkthroughs/flink-walkthrough-datastream-scala/src/main/resources/archetype-resources/pom.xml
index 08b267f9bef16..b7b4a392b4226 100644
--- a/flink-walkthroughs/flink-walkthrough-datastream-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-walkthroughs/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
index 08009208abee7..7e2e39effda4c 100644
--- 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
deleted file mode 100644
index cb56bf82f4f68..0000000000000
--- a/tools/force-shading/pom.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache</groupId>
-		<artifactId>apache</artifactId>
-		<version>18</version>
-	</parent>
-
-	<!--
-	This module is used a dependency in the root pom. It activates shading for all sub modules
-	through an include rule in the shading configuration. This assures that Maven always generates
-	an effective pom for all modules, i.e. get rid of Maven properties. In particular, this is needed
-	to define the Scala version property in the root pom but not let the root pom depend on Scala
-	and thus be suffixed along with all other modules.
-	-->
-
-	<groupId>org.apache.flink</groupId>
-	<artifactId>force-shading</artifactId>
-	<version>1.14-SNAPSHOT</version>
-	<name>Flink : Tools : Force Shading</name>
-
-	<packaging>jar</packaging>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<!-- This only exists to allow shorthand invocations on the command-line
-						i.e., 'mvn spotless:check'
-						This is necessary because this module does not declare the flink-parent pom as its parent -->
-					<groupId>com.diffplug.spotless</groupId>
-					<artifactId>spotless-maven-plugin</artifactId>
-					<version>2.4.2</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>release</id>
-			<activation>
-				<property>
-					<name>release</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.4</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-enforcer-plugin</artifactId>
-						<version>3.0.0-M1</version>
-						<executions>
-							<execution>
-								<id>enforce-maven</id>
-								<goals>
-									<goal>enforce</goal>
-								</goals>
-								<configuration>
-									<rules>
-										<requireMavenVersion>
-											<!-- maven version must be lower than 3.3. See FLINK-3158 -->
-											<version>(,3.3)</version>
-										</requireMavenVersion>
-									</rules>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-release-plugin</artifactId>
-							<version>2.1</version>
-							<configuration>
-								<mavenExecutorId>forked-path</mavenExecutorId>
-								<useReleaseProfile>false</useReleaseProfile>
-								<arguments>${arguments} -Psonatype-oss-release</arguments>
-							</configuration>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-		</profile>
-	</profiles>
-
-</project>
diff --git a/tools/releasing/create_release_branch.sh b/tools/releasing/create_release_branch.sh
index 886013f3a14fd..10aa571e7a12e 100755
--- 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
index 7a3bea1d2768b..ceddacc25bf29 100755
--- 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