Author: olamy
Date: Wed Aug 29 21:22:51 2012
New Revision: 1378742
URL: http://svn.apache.org/viewvc?rev=1378742&view=rev
Log:
simplify svnpub sub configuration: just use mvn site-deploy is easier and as
usual :-)
Removed:
archiva/redback/redback-site/trunk/deploySite.sh
archiva/site/deploySite.sh
archiva/trunk/archiva-docs/deploySite.sh
Modified:
archiva/parent/pom.xml
archiva/redback/redback-site/trunk/pom.xml
archiva/site/pom.xml
archiva/trunk/archiva-docs/pom.xml
Modified: archiva/parent/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/parent/pom.xml?rev=1378742&r1=1378741&r2=1378742&view=diff
==============================================================================
--- archiva/parent/pom.xml (original)
+++ archiva/parent/pom.xml Wed Aug 29 21:22:51 2012
@@ -68,8 +68,6 @@
<!-- svnsubpub configuration -->
- <siteFilePath></siteFilePath>
- <siteUrlDeployment>file://${siteFilePath}</siteUrlDeployment>
<scmPubCheckoutDirectory></scmPubCheckoutDirectory>
<scmTryUpdate>true</scmTryUpdate>
<scmSkipDeletedFiles>false</scmSkipDeletedFiles>
@@ -583,6 +581,19 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -677,6 +688,21 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.1</version>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ <executions>
+ <execution>
+ <id>stage-for-scm-publish</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>stage</goal>
+ </goals>
+ <configuration>
+ <skipDeploy>false</skipDeploy>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -699,8 +725,6 @@
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/</pubScmUrl>
- <content>${siteFilePath}</content>
<checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
<tryUpdate>${scmTryUpdate}</tryUpdate>
<skipDeletedFiles>${scmSkipDeletedFiles}</skipDeletedFiles>
@@ -708,11 +732,6 @@
<svn>javasvn</svn>
</providerImplementations>
<checkinComment>Apache Archiva Main site
deployment</checkinComment>
- <ignorePathsToDelete>
- <ignorePathToDelete>docs/**</ignorePathToDelete>
- <ignorePathToDelete>ref/**</ignorePathToDelete>
- <ignorePathToDelete>redback/**</ignorePathToDelete>
- </ignorePathsToDelete>
</configuration>
<dependencies>
<dependency>
@@ -726,6 +745,15 @@
<version>${svnkit.version}</version>
</dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
Modified: archiva/redback/redback-site/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-site/trunk/pom.xml?rev=1378742&r1=1378741&r2=1378742&view=diff
==============================================================================
--- archiva/redback/redback-site/trunk/pom.xml (original)
+++ archiva/redback/redback-site/trunk/pom.xml Wed Aug 29 21:22:51 2012
@@ -32,10 +32,18 @@
<properties>
<redbackVersion>${project.version}</redbackVersion>
- <siteFilePath>${user.home}/redback-site-deploy</siteFilePath>
-
<scmPubCheckoutDirectory>${user.home}/redback-site-content</scmPubCheckoutDirectory>
+
<scmPubCheckoutDirectory>${user.home}/redback-site-pub</scmPubCheckoutDirectory>
</properties>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website.svnpub</id>
+ <name>Redback Website</name>
+
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback</url>
+ </site>
+ </distributionManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -43,7 +51,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback</pubScmUrl>
<checkinComment>Apache Redback Main site
deployment</checkinComment>
<ignorePathsToDelete>
<ignorePathToDelete>core/**</ignorePathToDelete>
@@ -53,6 +60,7 @@
</plugin>
</plugins>
</pluginManagement>
+
</build>
<reporting>
<excludeDefaults>true</excludeDefaults>
@@ -87,11 +95,5 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-site/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/archiva/redback/redback-site/trunk/</url>
</scm>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Redback Website</name>
- <url>${siteUrlDeployment}</url>
- </site>
- </distributionManagement>
+
</project>
Modified: archiva/site/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/site/pom.xml?rev=1378742&r1=1378741&r2=1378742&view=diff
==============================================================================
--- archiva/site/pom.xml (original)
+++ archiva/site/pom.xml Wed Aug 29 21:22:51 2012
@@ -60,19 +60,28 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/site</developerConnection>
<url>http://svn.apache.org/viewvc/archiva/site</url>
</scm>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website.svnpub</id>
+ <url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/</url>
+ </site>
+ </distributionManagement>
+
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/</pubScmUrl>
<checkinComment>Apache Archiva Main site
deployment</checkinComment>
<ignorePathsToDelete>
<ignorePathToDelete>docs/**</ignorePathToDelete>
@@ -106,6 +115,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
<reporting>
@@ -136,11 +146,6 @@
</plugin>
</plugins>
</reporting>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>${siteUrlDeployment}/</url>
- </site>
- </distributionManagement>
+
</project>
Modified: archiva/trunk/archiva-docs/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/pom.xml?rev=1378742&r1=1378741&r2=1378742&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/pom.xml (original)
+++ archiva/trunk/archiva-docs/pom.xml Wed Aug 29 21:22:51 2012
@@ -38,10 +38,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -56,7 +52,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
-
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/docs/${project.version}</pubScmUrl>
<checkinComment>Apache Archiva Versionned docs for
${project.version}</checkinComment>
</configuration>
</plugin>
@@ -64,15 +59,26 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<executions>
<execution>
- <id>site</id>
+ <id>site-generate-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>site</goal>
</goals>
</execution>
+ <execution>
+ <id>stage-for-scm-publish</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>stage</goal>
+ </goals>
+ <configuration>
+ <skipDeploy>false</skipDeploy>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -115,7 +121,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>${siteUrlDeployment}</url>
+
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/docs/${project.version}</url>
</site>
</distributionManagement>
