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 2012/12/14 11:19:20 UTC
svn commit: r1421782 - /maven/plugins/trunk/maven-plugins/pom.xml
Author: hboutemy
Date: Fri Dec 14 10:19:19 2012
New Revision: 1421782
URL: http://svn.apache.org/viewvc?rev=1421782&view=rev
Log:
simplified svnpubsub configuration
Modified:
maven/plugins/trunk/maven-plugins/pom.xml
Modified: maven/plugins/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1421782&r1=1421781&r2=1421782&view=diff
==============================================================================
--- maven/plugins/trunk/maven-plugins/pom.xml (original)
+++ maven/plugins/trunk/maven-plugins/pom.xml Fri Dec 14 10:19:19 2012
@@ -46,18 +46,16 @@ under the License.
<url>https://builds.apache.org/job/maven-plugins/</url>
</ciManagement>
- <!--distributionManagement>
+ <distributionManagement>
<site>
<id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/plugins/</url>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/plugins</url>
</site>
- </distributionManagement-->
+ </distributionManagement>
<properties>
- <maven.sites.cache>${user.home}/maven-sites</maven.sites.cache>
- <siteFilePath>${maven.sites.cache}/plugins/${project.artifactId}-${project.version}</siteFilePath>
- <scmPubCheckoutDirectory>${siteFilePath}-content</scmPubCheckoutDirectory>
- <svnUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/plugins-archives/${project.artifactId}-${project.version}</svnUrl>
+ <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
+ <maven.site.path>plugins-archives/${project.artifactId}-${project.version}</maven.site.path>
</properties>
<repositories>
@@ -118,14 +116,35 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.2</version>
<configuration>
- <skipDeploy>true</skipDeploy>
+ <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>
+ <version>1.0-beta-2</version>
+ <configuration>
+ <content>${project.build.directory}/site</content>
+ <scmPubUrl>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</scmPubUrl>
+ <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
+ <tryUpdate>true</tryUpdate>
+ </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>
+ <plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
@@ -159,28 +178,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.0-beta-2</version>
- <configuration>
- <checkinComment>${project.name} site deployment</checkinComment>
- <pubScmUrl>scm:svn:${svnUrl}</pubScmUrl>
- <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
- <content>${project.reporting.outputDirectory}</content>
- </configuration>
- <executions>
- <execution>
- <id>scm-publish</id>
- <phase>site-deploy</phase>
- <goals>
- <goal>publish-scm</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
@@ -262,11 +259,7 @@ under the License.
<profile>
<id>site-release</id>
<properties>
-
- <siteFilePath>${maven.sites.cache}/plugins/${project.artifactId}</siteFilePath>
- <scmPubCheckoutDirectory>${siteFilePath}-content</scmPubCheckoutDirectory>
- <svnUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/plugins/${project.artifactId}</svnUrl>
-
+ <maven.site.path>plugins/${project.artifactId}</maven.site.path>
</properties>
</profile>
<profile>