[FLINK-8113][build] Bump maven-shade-plugin to 3.0.0 This closes #5042.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/400d2a38 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/400d2a38 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/400d2a38 Branch: refs/heads/master Commit: 400d2a3888fd6044be054ef634bc9682c3724b3e Parents: 7a434c3 Author: zentol <[email protected]> Authored: Tue Nov 21 11:52:42 2017 +0100 Committer: zentol <[email protected]> Committed: Wed Nov 22 11:53:09 2017 +0100 ---------------------------------------------------------------------- .../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 ----- .../main/resources/archetype-resources/pom.xml | 4 ++-- .../main/resources/archetype-resources/pom.xml | 4 ++-- pom.xml | 20 +------------------- 7 files changed, 5 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/400d2a38/flink-connectors/flink-connector-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml index b7d80ae..1ead7e4 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> http://git-wip-us.apache.org/repos/asf/flink/blob/400d2a38/flink-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 4bce246..ed8314d 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> http://git-wip-us.apache.org/repos/asf/flink/blob/400d2a38/flink-filesystems/flink-s3-fs-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/flink-filesystems/flink-s3-fs-hadoop/pom.xml b/flink-filesystems/flink-s3-fs-hadoop/pom.xml index 26d1df2..093ee08 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> http://git-wip-us.apache.org/repos/asf/flink/blob/400d2a38/flink-filesystems/flink-s3-fs-presto/pom.xml ---------------------------------------------------------------------- diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml index 92a0f87..b871032 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> http://git-wip-us.apache.org/repos/asf/flink/blob/400d2a38/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/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 34e2abb..0299d0c 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> http://git-wip-us.apache.org/repos/asf/flink/blob/400d2a38/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- 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 d705e8c..d438f61 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> http://git-wip-us.apache.org/repos/asf/flink/blob/400d2a38/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 170de59..977c1fc 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 -->
