This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new ba55cf146616 HADOOP-13816. Ambiguous plugin version warning from maven
build. Contributed by Kai Sasaki.
ba55cf146616 is described below
commit ba55cf1466161780bbac80118f1cf324c16d8528
Author: Akira Ajisaka <aajis...@apache.org>
AuthorDate: Mon Nov 28 13:10:31 2016 +0900
HADOOP-13816. Ambiguous plugin version warning from maven build.
Contributed by Kai Sasaki.
(cherry picked from commit 9e173d2bac567d3bdec2c6c4e15a72bca9c4f6d3)
Conflicts:
hadoop-tools/hadoop-rumen/pom.xml
---
hadoop-build-tools/pom.xml | 2 ++
pom.xml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index 873667369c2e..fdd6ebbedf14 100644
--- a/hadoop-build-tools/pom.xml
+++ b/hadoop-build-tools/pom.xml
@@ -54,6 +54,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
<executions>
<execution>
<id>copy-resources</id>
@@ -80,6 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${maven-remote-resources-plugin.version}</version>
<executions>
<execution>
<phase>process-resources</phase>
diff --git a/pom.xml b/pom.xml
index f4cfbc984d71..2f9fc9e111d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/x
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
+
<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.10</apache-rat-plugin.version>
<wagon-ssh.version>1.0</wagon-ssh.version>
<maven-clover2-plugin.version>3.3.0</maven-clover2-plugin.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
