Repository: hadoop Updated Branches: refs/heads/branch-3.1 ef9f8ca13 -> e3bf7f29a
HADOOP-15882. Upgrade maven-shade-plugin from 2.4.3 to 3.2.0. Contributed by Takanobu Asanuma. (cherry picked from commit 34b2521f5e7388e6a4d76af537ef147206fd9b72) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e3bf7f29 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e3bf7f29 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e3bf7f29 Branch: refs/heads/branch-3.1 Commit: e3bf7f29af1f4a043a4a74ecb0e2e97359b958d7 Parents: ef9f8ca Author: Bharat Viswanadham <[email protected]> Authored: Thu Oct 25 13:29:59 2018 -0700 Committer: Bharat Viswanadham <[email protected]> Committed: Thu Oct 25 13:53:24 2018 -0700 ---------------------------------------------------------------------- hadoop-maven-plugins/pom.xml | 4 ++++ hadoop-project/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e3bf7f29/hadoop-maven-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-maven-plugins/pom.xml b/hadoop-maven-plugins/pom.xml index d21375f..34e97f2 100644 --- a/hadoop-maven-plugins/pom.xml +++ b/hadoop-maven-plugins/pom.xml @@ -74,6 +74,10 @@ <groupId>org.vafer</groupId> <artifactId>jdependency</artifactId> </exclusion> + <exclusion> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-inject-plexus</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e3bf7f29/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 6722747..75f6349 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -123,7 +123,7 @@ <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version> <maven-install-plugin.version>2.5.1</maven-install-plugin.version> <maven-resources-plugin.version>2.6</maven-resources-plugin.version> - <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version> + <maven-shade-plugin.version>3.2.0</maven-shade-plugin.version> <maven-jar-plugin.version>2.5</maven-jar-plugin.version> <maven-war-plugin.version>3.1.0</maven-war-plugin.version> <maven-source-plugin.version>2.3</maven-source-plugin.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
