From 1da3b556591fffaae0751c4f7fceda34d2314fda Mon Sep 17 00:00:00 2001 From: Sean Mackrory Date: Tue, 1 May 2018 08:56:10 -0600 Subject: [PATCH] HADOOP-15504. Upgrade Maven Core and Maven Wagon dependencies. --- hadoop-maven-plugins/pom.xml | 38 ++++++++++++++----- .../plugin/resourcegz/ResourceGzMojo.java | 2 +- pom.xml | 2 +- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/hadoop-maven-plugins/pom.xml b/hadoop-maven-plugins/pom.xml index b31d158c13..d6b18b4e35 100644 --- a/hadoop-maven-plugins/pom.xml +++ b/hadoop-maven-plugins/pom.xml @@ -26,7 +26,7 @@ maven-plugin Apache Hadoop Maven Plugins - 3.0 + 3.0.5 3.5.1 @@ -45,6 +45,14 @@ maven-plugin-annotations ${maven.plugin-tools.version} provided + + + + org.apache.maven + maven-artifact + + commons-io @@ -60,16 +68,28 @@ ${maven-shade-plugin.version} provided - + - org.apache.maven.shared - maven-dependency-tree + org.apache.maven + maven-artifact + + + org.apache.maven + maven-compat + + + org.apache.maven + maven-core + + + org.apache.maven + maven-model + + + org.apache.maven + maven-plugin-api - org.vafer jdependency diff --git a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/resourcegz/ResourceGzMojo.java b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/resourcegz/ResourceGzMojo.java index e7ab663e42..5bf84c21fe 100644 --- a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/resourcegz/ResourceGzMojo.java +++ b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/resourcegz/ResourceGzMojo.java @@ -13,7 +13,7 @@ */ package org.apache.hadoop.maven.plugin.resourcegz; -import com.google.inject.internal.util.Lists; +import com.google.common.collect.Lists; import org.apache.commons.io.IOUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; diff --git a/pom.xml b/pom.xml index 3695be05af..a250e64b8e 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.5 3.0.1 0.12 - 1.0 + 2.4 3.3.0 2.5.0 1.0.0