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 wh...@apache.org on 2014/12/17 23:06:02 UTC
hadoop git commit: HADOOP-11420. Use latest maven-site-plugin and replace link to svn with link to git. Contributed by Hervé Boutemy.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 300a66530 -> e86927600
HADOOP-11420. Use latest maven-site-plugin and replace link to svn with link to git. Contributed by Hervé Boutemy.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e8692760
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e8692760
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e8692760
Branch: refs/heads/branch-2
Commit: e86927600539849bd30529f80a2cde8b30728300
Parents: 300a665
Author: Haohui Mai <wh...@apache.org>
Authored: Wed Dec 17 14:04:21 2014 -0800
Committer: Haohui Mai <wh...@apache.org>
Committed: Wed Dec 17 14:05:59 2014 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
hadoop-project/src/site/site.xml | 2 +-
pom.xml | 8 +-------
3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e8692760/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 8d23cf1..b5ce1e6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -221,6 +221,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11321. copyToLocal cannot save a file to an SMB share unless the user
has Full Control permissions. (cnauroth)
+ HADOOP-11420. Use latest maven-site-plugin and replace link to svn with
+ link to git. (Herve Boutemy via wheat9)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e8692760/hadoop-project/src/site/site.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
index b0bc6a8..3daf43f 100644
--- a/hadoop-project/src/site/site.xml
+++ b/hadoop-project/src/site/site.xml
@@ -38,7 +38,7 @@
<body>
<links position="left">
<item name="Wiki" href="http://wiki.apache.org/hadoop" />
- <item name="SVN" href="https://svn.apache.org/repos/asf/hadoop/" />
+ <item name="git" href="https://git-wip-us.apache.org/repos/asf/hadoop.git" />
</links>
<breadcrumbs position="left">
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e8692760/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a74d545..8dc377a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,18 +152,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.4</version>
<dependencies>
<dependency><!-- add support for ssh/scp -->
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0</version>
</dependency>
- <dependency> <!-- add support for markdown -->
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.3</version>
- </dependency>
</dependencies>
</plugin>
<plugin>
@@ -223,7 +218,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
<executions>
<execution>
<id>attach-descriptor</id>