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 2015/11/28 16:16:43 UTC
svn commit: r1716984 - in /maven/pom/trunk/maven: doxia-tools/pom.xml
maven-archetype-bundles/pom.xml maven-plugins/pom.xml
maven-shared-components/pom.xml maven-skins/pom.xml pom.xml
src/site-docs/apt/index.apt.vm
Author: hboutemy
Date: Sat Nov 28 15:16:43 2015
New Revision: 1716984
URL: http://svn.apache.org/viewvc?rev=1716984&view=rev
Log:
[MPOM-96] added mono-module profile
Modified:
maven/pom/trunk/maven/doxia-tools/pom.xml
maven/pom/trunk/maven/maven-archetype-bundles/pom.xml
maven/pom/trunk/maven/maven-plugins/pom.xml
maven/pom/trunk/maven/maven-shared-components/pom.xml
maven/pom/trunk/maven/maven-skins/pom.xml
maven/pom/trunk/maven/pom.xml
maven/pom/trunk/maven/src/site-docs/apt/index.apt.vm
Modified: maven/pom/trunk/maven/doxia-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/doxia-tools/pom.xml?rev=1716984&r1=1716983&r2=1716984&view=diff
==============================================================================
--- maven/pom/trunk/maven/doxia-tools/pom.xml (original)
+++ maven/pom/trunk/maven/doxia-tools/pom.xml Sat Nov 28 15:16:43 2015
@@ -63,6 +63,7 @@ under the License.
<properties>
<projectVersion>${project.version}</projectVersion>
<maven.site.path>doxia-tools-archives/${project.artifactId}-LATEST</maven.site.path>
+ <maven.site.scm-deploy>true</maven.site.scm-deploy>
</properties>
<dependencyManagement>
@@ -105,13 +106,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <content>${project.reporting.outputDirectory}</content><!-- doxia-tools are mono-module, no real need for site:stage -->
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: maven/pom/trunk/maven/maven-archetype-bundles/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/maven-archetype-bundles/pom.xml?rev=1716984&r1=1716983&r2=1716984&view=diff
==============================================================================
--- maven/pom/trunk/maven/maven-archetype-bundles/pom.xml (original)
+++ maven/pom/trunk/maven/maven-archetype-bundles/pom.xml Sat Nov 28 15:16:43 2015
@@ -47,6 +47,11 @@ under the License.
<url>https://issues.apache.org/jira/browse/MARCHETYPES</url>
</issueManagement>
+ <properties>
+ <maven.site.path>archetypes-archives/${project.artifactId}-LATEST</maven.site.path>
+ <maven.site.scm-deploy>true</maven.site.scm-deploy>
+ </properties>
+
<build>
<extensions>
<extension>
Modified: maven/pom/trunk/maven/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/maven-plugins/pom.xml?rev=1716984&r1=1716983&r2=1716984&view=diff
==============================================================================
--- maven/pom/trunk/maven/maven-plugins/pom.xml (original)
+++ maven/pom/trunk/maven/maven-plugins/pom.xml Sat Nov 28 15:16:43 2015
@@ -55,6 +55,7 @@ under the License.
<properties>
<maven.site.path>plugins-archives/${project.artifactId}-LATEST</maven.site.path>
+ <maven.site.scm-deploy>true</maven.site.scm-deploy>
<mavenInvokerPluginVersion>2.0.0</mavenInvokerPluginVersion>
</properties>
@@ -153,13 +154,6 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <content>${project.reporting.outputDirectory}</content><!-- plugins are mono-module, no real need for site:stage -->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
Modified: maven/pom/trunk/maven/maven-shared-components/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/maven-shared-components/pom.xml?rev=1716984&r1=1716983&r2=1716984&view=diff
==============================================================================
--- maven/pom/trunk/maven/maven-shared-components/pom.xml (original)
+++ maven/pom/trunk/maven/maven-shared-components/pom.xml Sat Nov 28 15:16:43 2015
@@ -59,6 +59,7 @@ under the License.
<properties>
<maven.site.path>shared-archives/${project.artifactId}-LATEST</maven.site.path>
+ <maven.site.scm-deploy>true</maven.site.scm-deploy>
</properties>
<repositories>
@@ -118,14 +119,5 @@ under the License.
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <content>${project.reporting.outputDirectory}</content>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: maven/pom/trunk/maven/maven-skins/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/maven-skins/pom.xml?rev=1716984&r1=1716983&r2=1716984&view=diff
==============================================================================
--- maven/pom/trunk/maven/maven-skins/pom.xml (original)
+++ maven/pom/trunk/maven/maven-skins/pom.xml Sat Nov 28 15:16:43 2015
@@ -60,6 +60,7 @@ under the License.
<properties>
<maven.site.path>skins-archives/${project.artifactId}-LATEST</maven.site.path>
+ <maven.site.scm-deploy>true</maven.site.scm-deploy>
<sitePluginVersion>3.3</sitePluginVersion>
</properties>
@@ -75,14 +76,5 @@ under the License.
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <content>${project.reporting.outputDirectory}</content><!-- skins are mono-module, no real need for site:stage -->
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: maven/pom/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1716984&r1=1716983&r2=1716984&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Sat Nov 28 15:16:43 2015
@@ -1299,5 +1299,38 @@ under the License.
</plugins>
</reporting>
</profile>
+ <profile>
+ <id>site.scm-deploy</id>
+ <activation>
+ <property><name>maven.site.scm-deploy</name><value>deploy</value></property>
+ </activation>
+ <build>
+ <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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+ </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>
+ </profile>
</profiles>
</project>
Modified: maven/pom/trunk/maven/src/site-docs/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/src/site-docs/apt/index.apt.vm?rev=1716984&r1=1716983&r2=1716984&view=diff
==============================================================================
--- maven/pom/trunk/maven/src/site-docs/apt/index.apt.vm (original)
+++ maven/pom/trunk/maven/src/site-docs/apt/index.apt.vm Sat Nov 28 15:16:43 2015
@@ -65,7 +65,7 @@ Site Publication
+-----+
<properties>
- <maven.site.path>xxx-archives/artifactId-LATEST</maven.site.path>
+ <maven.site.path>xxx-archives/\${project.artifactId}-LATEST</maven.site.path>
</properties>
<distributionManagement>
<site>
@@ -85,6 +85,23 @@ mvn scm-publish:publish-scm
See {{{/developers/website/deploy-component-reference-documentation.html}deploying Maven components reference documentation}}
for more information.
+* Mono Module: <<<site.scm-deploy>>> profile
+
+ If the build is mono module, previous 2-steps publication can be simplified by activating <<<site.scm-deploy>>> profile
+ through <<<maven.site.scm-deploy>>> property
+
++-----+
+ <properties>
+ <maven.site.scm-deploy>true</maven.site.scm-deploy>
+ </properties>
++-----+
+
+ Once this is configured, the site can be published in only command:
+
++-----+
+mvn -Preporting site-deploy
++-----+
+
History
#if( $project.version.endsWith( "SNAPSHOT" ) )