You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/04/08 00:57:16 UTC
svn commit: r1465502 - in /maven/pom/trunk/maven: pom.xml site-pom.xml
src/site-docs/apt/index.apt
Author: hboutemy
Date: Sun Apr 7 22:57:15 2013
New Revision: 1465502
URL: http://svn.apache.org/r1465502
Log:
enhanced svnpubsub configuration in Maven parent POM and added documentation
Modified:
maven/pom/trunk/maven/pom.xml
maven/pom/trunk/maven/site-pom.xml
maven/pom/trunk/maven/src/site-docs/apt/index.apt
Modified: maven/pom/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1465502&r1=1465501&r2=1465502&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Sun Apr 7 22:57:15 2013
@@ -752,13 +752,14 @@ under the License.
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content</url>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
</site>
</distributionManagement>
<properties>
<sonar.host.url>https://analysis.apache.org/</sonar.host.url>
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
+ <maven.site.path>../..</maven.site.path><!-- to be overridden -->
</properties>
<dependencyManagement>
@@ -817,6 +818,14 @@ under the License.
<useJava5>true</useJava5>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
+ <tryUpdate>true</tryUpdate>
+ </configuration>
+ </plugin>
<!-- Plexus description generator is either plexus-maven-plugin or plexus-component-metadata -->
<plugin>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/pom/trunk/maven/site-pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/site-pom.xml?rev=1465502&r1=1465501&r2=1465502&view=diff
==============================================================================
--- maven/pom/trunk/maven/site-pom.xml (original)
+++ maven/pom/trunk/maven/site-pom.xml Sun Apr 7 22:57:15 2013
@@ -34,7 +34,7 @@ under the License.
<name>Apache Maven Parent POM</name>
<description>This project consists of a POM that contains settings that are likely to be useful to any Maven project that is building and releasing code with Maven 2/3.</description>
- <url>http://maven.apache.org/${maven.site.path}</url>
+ <url>http://maven.apache.org/pom/maven</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven</connection>
@@ -47,7 +47,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org//view/M-R/view/Maven/job/maven-parent/</url>
+ <url>https://builds.apache.org/view/M-R/view/Maven/job/maven-parent/</url>
</ciManagement>
<distributionManagement>
<site>
@@ -57,7 +57,7 @@ under the License.
</distributionManagement>
<properties>
- <maven.site.path>pom-archives/maven-${project.version}</maven.site.path>
+ <maven.site.path>pom-archives/maven-LATEST</maven.site.path>
</properties>
<build>
@@ -73,11 +73,8 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.0-beta-2</version>
<configuration>
<content>${project.reporting.outputDirectory}</content>
- <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
- <tryUpdate>true</tryUpdate>
</configuration>
<executions>
<execution>
@@ -91,13 +88,4 @@ under the License.
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>site-release</id>
- <properties>
- <maven.site.path>pom/maven</maven.site.path>
- </properties>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+</project>
Modified: maven/pom/trunk/maven/src/site-docs/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/src/site-docs/apt/index.apt?rev=1465502&r1=1465501&r2=1465502&view=diff
==============================================================================
--- maven/pom/trunk/maven/src/site-docs/apt/index.apt (original)
+++ maven/pom/trunk/maven/src/site-docs/apt/index.apt Sun Apr 7 22:57:15 2013
@@ -43,13 +43,81 @@ The <<<reporting>>> Profile
This POM provides <<<reporting>>> profile for rendering documentation during site generation:
-+---
++-----+
mvn -Preporting site
-mvn -Preporting site-deploy
-+---
++-----+
See {{{./plugins.html}Plugins report}} for a list of configured report plugins.
+Site Publication
+
+ This POM prepares site publication to svnpubsub. Every inheriting POM needs to define <<<maven.site.path>>> property
+ with relative path to <<<$\{artifactId}-LATEST>>> publication uri, and define <<<distributionManagement>>> to avoid
+ automatic inheritance from parent:
+
++-----+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
++-----+
+
+ Then configuration differs between mono- and multi-modules sites:
+
+* Mono-Module Site
+
+ Inheriting POM must configure <<<site-deploy>>> phase to publish with <<<maven-scm-publish-plugin>>>:
+
++-----+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <content>${project.reporting.outputDirectory}</content>
+ </configuration>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
++-----+
+
+ Effective site publishing is done with:
+
++-----+
+mvn -Preporting site-deploy
++-----+
+
+* Multi-Modules Site
+
+ Multi-modules sites are preconfigured and published with:
+
++-----+
+mvn -Preporting site site:stage scm-publish:publish-scm
++-----+
+
History
As of version 21, this POM sets the Java source and target versions to 1.5. Thus, as any plugin (or other component)
@@ -58,7 +126,9 @@ History
*--------------+------------+
|| <<Version>> || <<Release Date>> ||
*--------------+------------+
-| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-23/pom.xml?view=markup}23}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-23/pom.xml?r1=HEAD&r2=1371599&diff_format=h}diff}}) | |
+| {{{http://svn.apache.org/viewvc/maven/pom/trunk/pom.xml?view=markup}trunk}} ({{{http://svn.apache.org/viewvc/maven/pom/trunk/pom.xml?r1=HEAD&r2=1465498&diff_format=h}diff}}) | |
+*--------------+------------+
+| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-23/pom.xml?view=markup}23}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-23/pom.xml?r1=HEAD&r2=1371599&diff_format=h}diff}}) | 2013-01-21 |
*--------------+------------+
| {{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-22/pom.xml?view=markup}22}} ({{{http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-22/pom.xml?r1=HEAD&r2=1157980&diff_format=h}diff}}) | 2012-08-08 |
*--------------+------------+