Repository: hadoop Updated Branches: refs/heads/branch-2 57172c09e -> 7411c74b1
HADOOP-10574. Bump the maven plugin versions too -moving the numbers into properties. (aajisaka) (cherry picked from commit 57b8950f37f74fc4a046c598c710b19b50ccef1f) Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7411c74b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7411c74b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7411c74b Branch: refs/heads/branch-2 Commit: 7411c74b1140e6c697ca29a19e74f1164790580b Parents: 57172c0 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Jan 30 01:47:59 2015 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Jan 30 02:27:36 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++ hadoop-project/pom.xml | 43 +++++++++++++------- pom.xml | 37 +++++++++++------ 3 files changed, 57 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7411c74b/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6fa24e9..518274f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -152,6 +152,9 @@ Release 2.7.0 - UNRELEASED HADOOP-10525. Remove DRFA.MaxBackupIndex config from log4j.properties (aajisaka) + HADOOP-10574. Bump the maven plugin versions too -moving the numbers into + properties. (aajisaka) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. http://git-wip-us.apache.org/repos/asf/hadoop/blob/7411c74b/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 8aa46c8..0412889 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -91,6 +91,21 @@ <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version> <maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version> <maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version> + + <maven-clean-plugin.version>2.5</maven-clean-plugin.version> + <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-jar-plugin.version>2.5</maven-jar-plugin.version> + <maven-war-plugin.version>2.4</maven-war-plugin.version> + <maven-source-plugin.version>2.3</maven-source-plugin.version> + <maven-checkstyle-plugin.version>2.12.1</maven-checkstyle-plugin.version> + <maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version> + <maven-pdf-plugin.version>1.2</maven-pdf-plugin.version> + <build-helper-maven-plugin.version>1.9</build-helper-maven-plugin.version> + <exec-maven-plugin.version>1.3.1</exec-maven-plugin.version> + <make-maven-plugin.version>1.0-beta-1</make-maven-plugin.version> + <native-maven-plugin.version>1.0-alpha-8</native-maven-plugin.version> </properties> <dependencyManagement> @@ -942,12 +957,12 @@ <plugins> <plugin> <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> + <version>${maven-clean-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>${javac.version}</source> <target>${javac.version}</target> @@ -961,7 +976,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.5</version> + <version>${build-helper-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -971,12 +986,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.3.1</version> + <version>${maven-install-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3.1</version> + <version>${maven-jar-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -986,7 +1001,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.1</version> + <version>${maven-war-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -996,22 +1011,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.6</version> + <version>${maven-checkstyle-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>native-maven-plugin</artifactId> - <version>1.0-alpha-7</version> + <version>${native-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>make-maven-plugin</artifactId> - <version>1.0-beta-1</version> + <version>${make-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> + <version>${maven-source-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.avro</groupId> @@ -1021,22 +1036,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> + <version>${maven-project-info-reports-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>${maven-resources-plugin.version}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.2</version> + <version>${exec-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pdf-plugin</artifactId> - <version>1.1</version> + <version>${maven-pdf-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/7411c74b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8dc377a..f8882b8 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <!-- platform encoding override --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + <!-- maven plugin versions --> + <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version> + <maven-site-plugin.version>3.4</maven-site-plugin.version> + <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version> + <maven-assembly-plugin.version>2.4</maven-assembly-plugin.version> + <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version> + <maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version> + <maven-javadoc-plugin.version>2.9.1</maven-javadoc-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> + <maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version> </properties> <modules> @@ -112,12 +125,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.4</version> + <version>${maven-dependency-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> + <version>${maven-enforcer-plugin.version}</version> <configuration> <rules> <requireMavenVersion> @@ -132,44 +145,44 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.3</version> + <version>${maven-assembly-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.5</version> + <version>${maven-deploy-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.7</version> + <version>${apache-rat-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> + <version>${maven-antrun-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.4</version> + <version>${maven-site-plugin.version}</version> <dependencies> <dependency><!-- add support for ssh/scp --> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh</artifactId> - <version>1.0</version> + <version>${wagon-ssh.version}</version> </dependency> </dependencies> </plugin> <plugin> <groupId>com.atlassian.maven.plugins</groupId> <artifactId>maven-clover2-plugin</artifactId> - <version>3.0.5</version> + <version>${maven-clover2-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.4.0</version> + <version>${maven-bundle-plugin.version}</version> </plugin> </plugins> </pluginManagement> @@ -245,7 +258,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8.1</version> + <version>${maven-javadoc-plugin.version}</version> <inherited>false</inherited> <reportSets> <reportSet> @@ -304,7 +317,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.4</version> + <version>${maven-dependency-plugin.version}</version> <reportSets> <reportSet> <reports>