You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/06/20 19:15:52 UTC
[48/66] [abbrv] hadoop git commit: HADOOP-15504. Upgrade Maven Core
and Maven Wagon dependencies.
HADOOP-15504. Upgrade Maven Core and Maven Wagon dependencies.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1da3b556
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1da3b556
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1da3b556
Branch: refs/heads/HDFS-13532
Commit: 1da3b556591fffaae0751c4f7fceda34d2314fda
Parents: 308a159
Author: Sean Mackrory <ma...@apache.org>
Authored: Tue May 1 08:56:10 2018 -0600
Committer: Sean Mackrory <ma...@apache.org>
Committed: Fri Jun 15 16:06:26 2018 -0600
----------------------------------------------------------------------
hadoop-maven-plugins/pom.xml | 38 +++++++++++++++-----
.../maven/plugin/resourcegz/ResourceGzMojo.java | 2 +-
pom.xml | 2 +-
3 files changed, 31 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1da3b556/hadoop-maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-maven-plugins/pom.xml b/hadoop-maven-plugins/pom.xml
index b31d158..d6b18b4 100644
--- a/hadoop-maven-plugins/pom.xml
+++ b/hadoop-maven-plugins/pom.xml
@@ -26,7 +26,7 @@
<packaging>maven-plugin</packaging>
<name>Apache Hadoop Maven Plugins</name>
<properties>
- <maven.dependency.version>3.0</maven.dependency.version>
+ <maven.dependency.version>3.0.5</maven.dependency.version>
<maven.plugin-tools.version>3.5.1</maven.plugin-tools.version>
</properties>
<dependencies>
@@ -45,6 +45,14 @@
<artifactId>maven-plugin-annotations</artifactId>
<version>${maven.plugin-tools.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <!-- excluding dependency that conflicts with other maven
+ dependencies -->
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -60,16 +68,28 @@
<version>${maven-shade-plugin.version}</version>
<scope>provided</scope>
<exclusions>
- <!-- shade conflicts with itself and our other maven internals
- by including a combination of 3.x and 2.x
- -->
+ <!-- shade conflicts with itself and other maven internals so we simply
+ exclude shade's (older) copies of the dependencies -->
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-dependency-tree</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
</exclusion>
- <!-- again, shade conflicts with itself on the transitives of this
- dependency
- -->
<exclusion>
<groupId>org.vafer</groupId>
<artifactId>jdependency</artifactId>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1da3b556/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/resourcegz/ResourceGzMojo.java
----------------------------------------------------------------------
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 e7ab663..5bf84c2 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;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1da3b556/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3695be0..a250e64 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
<maven-remote-resources-plugin.version>1.5</maven-remote-resources-plugin.version>
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
- <wagon-ssh.version>1.0</wagon-ssh.version>
+ <wagon-ssh.version>2.4</wagon-ssh.version>
<maven-clover2-plugin.version>3.3.0</maven-clover2-plugin.version>
<maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version>
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org