From 565a29080b8083e9a37401fa8460eabc97bef9a1 Mon Sep 17 00:00:00 2001
From: zentol <chesnay@apache.org>
Date: Tue, 21 Nov 2017 11:52:42 +0100
Subject: [PATCH] [FLINK-8113][build] Bump maven-shade-plugin to 3.0.0

---
 .../flink-connector-cassandra/pom.xml         |  1 -
 flink-dist/pom.xml                            |  5 -----
 flink-filesystems/flink-s3-fs-hadoop/pom.xml  |  5 -----
 flink-filesystems/flink-s3-fs-presto/pom.xml  |  5 -----
 .../resources/archetype-resources/pom.xml     |  4 ++--
 .../resources/archetype-resources/pom.xml     |  4 ++--
 pom.xml                                       | 20 +------------------
 7 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml
index b7d80aefd0d30..1ead7e4df1158 100644
--- a/flink-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-connectors/flink-connector-cassandra/pom.xml
@@ -55,7 +55,6 @@ under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.1</version>
 				<executions>
 					<!-- Run shade goal on package phase -->
 					<execution>
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 4bce2465442e4..ed8314d5f3dd7 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -462,11 +462,6 @@ under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-
-				<!-- we need to explicitly override this version, because the -->
-				<!-- earlier versions of the shade plugin have a bug relocating services -->
-				<version>3.0.0</version>
-
 				<executions>
 					<execution>
 						<phase>package</phase>
diff --git a/flink-filesystems/flink-s3-fs-hadoop/pom.xml b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
index 26d1df2d856df..093ee08d30361 100644
--- a/flink-filesystems/flink-s3-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
@@ -214,11 +214,6 @@ under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-
-				<!-- we need to explicitly override this version, because the -->
-				<!-- earlier versions of the shade plugin have a bug relocating services -->
-				<version>3.0.0</version>
-
 				<executions>
 					<execution>
 						<id>shade-flink</id>
diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml
index 92a0f8758e885..b87103261dada 100644
--- a/flink-filesystems/flink-s3-fs-presto/pom.xml
+++ b/flink-filesystems/flink-s3-fs-presto/pom.xml
@@ -214,11 +214,6 @@ under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-
-				<!-- we need to explicitly override this version, because the -->
-				<!-- earlier versions of the shade plugin have a bug relocating services -->
-				<version>3.0.0</version>
-
 				<executions>
 					<execution>
 						<id>shade-flink</id>
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 34e2abbfe8956..0299d0c4c0061 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
@@ -154,7 +154,7 @@ under the License.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-shade-plugin</artifactId>
-						<version>2.4.1</version>
+						<version>3.0.0</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -182,7 +182,7 @@ under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.1</version>
+				<version>3.0.0</version>
 				<executions>
 					<!-- Run shade goal on package phase -->
 					<execution>
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 d705e8c137da9..d438f61816089 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
@@ -153,7 +153,7 @@ under the License.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-shade-plugin</artifactId>
-						<version>2.4.1</version>
+						<version>3.0.0</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -184,7 +184,7 @@ under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.1</version>
+				<version>3.0.0</version>
 				<executions>
 					<!-- Run shade goal on package phase -->
 					<execution>
diff --git a/pom.xml b/pom.xml
index b70389ad741ff..f1044a6bb5569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1314,25 +1314,7 @@ under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>2.4.1</version>
-					<dependencies>
-						<!-- bump asm to 5.1 to avoid a bug in the shading of akka -->
-						<dependency>
-							<groupId>org.ow2.asm</groupId>
-							<artifactId>asm</artifactId>
-							<version>5.1</version>
-						</dependency>
-						<dependency>
-							<groupId>org.ow2.asm</groupId>
-							<artifactId>asm-commons</artifactId>
-							<version>5.1</version>
-						</dependency>
-						<dependency>
-							<groupId>org.ow2.asm</groupId>
-							<artifactId>asm-tree</artifactId>
-							<version>5.1</version>
-						</dependency>
-					</dependencies>
+					<version>3.0.0</version>
 				</plugin>
 
 				<!-- Disable certain plugins in Eclipse -->