Author: brett Date: Fri Jul 4 09:56:00 2014 New Revision: 1607813 URL: http://svn.apache.org/r1607813 Log: adjust for plugin site deployment
Modified: incubator/npanday/trunk/plugins/pom.xml incubator/npanday/trunk/pom.xml incubator/npanday/trunk/site/pom.xml Modified: incubator/npanday/trunk/plugins/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/pom.xml?rev=1607813&r1=1607812&r2=1607813&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/pom.xml (original) +++ incubator/npanday/trunk/plugins/pom.xml Fri Jul 4 09:56:00 2014 @@ -145,7 +145,8 @@ <reportSets> <reportSet> <reports> - + <report>index</report> + <report>modules</report> </reports> </reportSet> </reportSets> @@ -208,4 +209,11 @@ </build> </profile> </profiles> + + <distributionManagement> + <site> + <id>site</id> + <url>scm:svn:${sitePublishUrl}/plugins</url> + </site> + </distributionManagement> </project> Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1607813&r1=1607812&r2=1607813&view=diff ============================================================================== --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Fri Jul 4 09:56:00 2014 @@ -51,7 +51,8 @@ under the License. --> <bootstrap.npanday.version>${project.version}</bootstrap.npanday.version> - <localdocs.folder>file:///c:/Program Files/NPanday/docs</localdocs.folder> + <sitePublishUrl>https://svn.apache.org/repos/asf/incubator/npanday/site-publish/docs/${project.version}</sitePublishUrl> + <checkoutDirectory>${basedir}/site-publish</checkoutDirectory> </properties> <repositories> @@ -331,6 +332,31 @@ under the License. </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <skipDeploy>true</skipDeploy> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>1.1</version> + <configuration> + <checkoutDirectory>${checkoutDirectory}</checkoutDirectory> + <tryUpdate>true</tryUpdate> + </configuration> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> Modified: incubator/npanday/trunk/site/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/site/pom.xml?rev=1607813&r1=1607812&r2=1607813&view=diff ============================================================================== --- incubator/npanday/trunk/site/pom.xml (original) +++ incubator/npanday/trunk/site/pom.xml Fri Jul 4 09:56:00 2014 @@ -47,28 +47,13 @@ under the License. </goals> </execution> </executions> - <configuration> - <skipDeploy>true</skipDeploy> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> <configuration> <content>${project.build.directory}/site</content> - <checkoutDirectory>${checkoutDirectory}</checkoutDirectory> - <tryUpdate>true</tryUpdate> </configuration> - <executions> - <execution> - <id>scm-publish</id> - <phase>site-deploy</phase> - <goals> - <goal>publish-scm</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -157,8 +142,6 @@ under the License. <properties> <npandayReleaseVersion>1.4.0-incubating</npandayReleaseVersion> <npandayReleaseDate>06 May 2011</npandayReleaseDate> - <sitePublishUrl>https://svn.apache.org/repos/asf/incubator/npanday/site-publish/docs/${project.version}</sitePublishUrl> - <checkoutDirectory>${basedir}/site-publish</checkoutDirectory> </properties> <profiles> <profile> @@ -225,7 +208,7 @@ under the License. </profiles> <distributionManagement> - <!-- Site base required here for site:stage to calculate correct URLs --> + <!-- Site base required here for site plugin to calculate correct URLs --> <site> <id>site</id> <url>scm:svn:${sitePublishUrl}</url>