Author: hboutemy
Date: Fri Dec 14 22:10:52 2012
New Revision: 1422122
URL: http://svn.apache.org/viewvc?rev=1422122&view=rev
Log:
prepared site deployment with svnpubsub for every Maven shared component
Modified:
maven/shared/trunk/maven-shared-components/pom.xml
maven/shared/trunk/maven-shared-components/site-pom.xml
Modified: maven/shared/trunk/maven-shared-components/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/pom.xml?rev=1422122&r1=1422121&r2=1422122&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-components/pom.xml (original)
+++ maven/shared/trunk/maven-shared-components/pom.xml Fri Dec 14 22:10:52 2012
@@ -51,21 +51,16 @@ under the License.
<system>Jenkins</system>
<url>https://builds.apache.org/job/maven-shared/</url>
</ciManagement>
-
- <!--distributionManagement>
+ <distributionManagement>
<site>
- <id>apache.website.svnpub</id>
- <url>scm:svn:${svnUrl}</url>
+ <id>apache.website</id>
+
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/shared</url>
</site>
- </distributionManagement-->
+ </distributionManagement>
<properties>
-
- <maven.sites.cache>${user.home}/maven-sites</maven.sites.cache>
-
<siteFilePath>${maven.sites.cache}/shared/${project.artifactId}-${project.version}</siteFilePath>
- <scmPubCheckoutDirectory>${siteFilePath}-content</scmPubCheckoutDirectory>
-
<svnUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/shared-archives/${project.artifactId}-${project.version}</svnUrl>
-
+ <maven.site.cache>${user.home}/maven-sites</maven.site.cache><!-- TODO
remove when upgrading parent to 23 -->
+
<maven.site.path>shared-archives/${project.artifactId}-${project.version}</maven.site.path>
</properties>
<repositories>
@@ -126,28 +121,27 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.2</version><!-- TODO remove when upgrading parent to 23
-->
<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>
- <checkinComment>${project.name} site deployment</checkinComment>
- <pubScmUrl>scm:svn:${svnUrl}</pubScmUrl>
- <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
<content>${project.reporting.outputDirectory}</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>
+ <phase>site-deploy</phase><!-- deploy site with
maven-scm-publish-plugin -->
<goals>
<goal>publish-scm</goal>
</goals>
@@ -157,27 +151,12 @@ under the License.
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>site-release</id>
<properties>
-
-
<siteFilePath>${maven.sites.cache}/shared/${project.artifactId}</siteFilePath>
-
<scmPubCheckoutDirectory>${siteFilePath}-content</scmPubCheckoutDirectory>
-
<svnUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/shared/${project.artifactId}</svnUrl>
-
+ <maven.site.path>shared/${project.artifactId}</maven.site.path>
</properties>
</profile>
</profiles>
-
</project>
Modified: maven/shared/trunk/maven-shared-components/site-pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/site-pom.xml?rev=1422122&r1=1422121&r2=1422122&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-components/site-pom.xml (original)
+++ maven/shared/trunk/maven-shared-components/site-pom.xml Fri Dec 14 22:10:52
2012
@@ -34,7 +34,7 @@ under the License.
<name>Apache Maven Shared Components POM</name>
<description>This project consists of a POM that contains settings that are
likely to be useful to any Maven Shared Component that is building and
releasing code with Maven 2/3.</description>
- <url>http://maven.apache.org/pom/maven-shared-component/</url>
+ <url>http://maven.apache.org/pom/maven-shared-components/</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-components</connection>
@@ -52,19 +52,32 @@ under the License.
<distributionManagement>
<site>
<id>apache.website</id>
-
<url>scp://people.apache.org/www/maven.apache.org/pom/maven-shared-components/</url>
+
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
</site>
</distributionManagement>
+ <properties>
+
<maven.site.path>pom-archives/maven-shared-components-${project.version}</maven.site.path>
+ </properties>
+
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<siteDirectory>${basedir}/src/site-docs</siteDirectory>
-
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/pom/maven-shared-components-${project.version}/</stagingSiteURL>
</configuration>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>site-release</id>
+ <properties>
+ <maven.site.path>pom/maven-shared-components</maven.site.path>
+ </properties>
+ </profile>
+ </profiles>
</project>
