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 to...@apache.org on 2011/10/29 02:18:00 UTC
svn commit: r1190706 - in /hadoop/common/branches/branch-0.23: ./
hadoop-project/ hadoop-project/src/ hadoop-project/src/site/
hadoop-project/src/site/apt/ hadoop-project/src/site/resources/
hadoop-project/src/site/resources/css/
Author: tomwhite
Date: Sat Oct 29 00:17:58 2011
New Revision: 1190706
URL: http://svn.apache.org/viewvc?rev=1190706&view=rev
Log:
Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763.
Added:
hadoop/common/branches/branch-0.23/hadoop-project/src/
- copied from r1190703, hadoop/common/trunk/hadoop-project/src/
hadoop/common/branches/branch-0.23/hadoop-project/src/site/
- copied from r1190703, hadoop/common/trunk/hadoop-project/src/site/
hadoop/common/branches/branch-0.23/hadoop-project/src/site/apt/
- copied from r1190703, hadoop/common/trunk/hadoop-project/src/site/apt/
hadoop/common/branches/branch-0.23/hadoop-project/src/site/apt/index.apt.vm
- copied unchanged from r1190703, hadoop/common/trunk/hadoop-project/src/site/apt/index.apt.vm
hadoop/common/branches/branch-0.23/hadoop-project/src/site/resources/
- copied from r1190703, hadoop/common/trunk/hadoop-project/src/site/resources/
hadoop/common/branches/branch-0.23/hadoop-project/src/site/resources/css/
- copied from r1190703, hadoop/common/trunk/hadoop-project/src/site/resources/css/
hadoop/common/branches/branch-0.23/hadoop-project/src/site/resources/css/site.css
- copied unchanged from r1190703, hadoop/common/trunk/hadoop-project/src/site/resources/css/site.css
hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml
- copied unchanged from r1190703, hadoop/common/trunk/hadoop-project/src/site/site.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
hadoop/common/branches/branch-0.23/pom.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/pom.xml?rev=1190706&r1=1190705&r2=1190706&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Sat Oct 29 00:17:58 2011
@@ -469,7 +469,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
+ <version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: hadoop/common/branches/branch-0.23/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1190706&r1=1190705&r2=1190706&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Sat Oct 29 00:17:58 2011
@@ -32,6 +32,10 @@
<name>${distMgmtSnapshotsName}</name>
<url>${distMgmtSnapshotsUrl}</url>
</snapshotRepository>
+ <site>
+ <id>apache.website</id>
+ <url>scpexe://people.apache.org/www/hadoop.apache.org/docs/r${project.version}</url>
+ </site>
</distributionManagement>
<repositories>
@@ -103,7 +107,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
+ <version>3.0</version>
+ <configuration>
+ <!-- Reports are generated at the site level -->
+ <generateReports>false</generateReports>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -157,9 +165,21 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>src</id>