brett 2004/10/30 01:30:46
Modified: . maven.xml project.xml
plugin-parent maven.xml project.xml
Log:
PR: MAVEN-1337
prompt to republish site
Revision Changes Path
1.15 +13 -0 maven-plugins/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/maven.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maven.xml 3 Sep 2004 22:58:16 -0000 1.14
+++ maven.xml 30 Oct 2004 08:30:46 -0000 1.15
@@ -16,12 +16,25 @@
*/
-->
<project
+ xmlns:i="jelly:interaction"
xmlns:j="jelly:core">
<goal name="plugins:test-all">
<j:set var="goal" value="plugin:test"/>
<j:set var="maven.multiproject.excludes" value="dashboard/*,eclipse/*"/>
<attainGoal name="multiproject:goal"/>
+ </goal>
+
+ <goal name="confirm-and-deploy-site">
+ <i:ask
+ question="Would you like to regenerate and deploy the main plugins site
(y/n)?"
+ answer="ok"
+ default="y"
+ />
+ <j:if test="${ok == 'y'}">
+ <attainGoal name="multiproject:site" />
+ <attainGoal name="site:sshdeploy" />
+ </j:if>
</goal>
</project>
1.26 +9 -1 maven-plugins/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 18 Oct 2004 14:02:37 -0000 1.25
+++ project.xml 30 Oct 2004 08:30:46 -0000 1.26
@@ -21,7 +21,7 @@
<pomVersion>3</pomVersion>
<id>plugin-parent</id>
- <name>Optional Maven Plugins</name>
+ <name>Maven Plugins</name>
<groupId>maven</groupId>
<currentVersion>1.0</currentVersion>
<organization>
@@ -159,6 +159,14 @@
<timezone>+1</timezone>
</developer>
</developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-interaction</artifactId>
+ <version>20030211.143817</version>
+ </dependency>
+ </dependencies>
<build>
<sourceDirectory>src/main</sourceDirectory>
1.5 +12 -3 maven-plugins/plugin-parent/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/plugin-parent/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 25 Sep 2004 12:07:07 -0000 1.4
+++ maven.xml 30 Oct 2004 08:30:46 -0000 1.5
@@ -17,6 +17,7 @@
-->
<project
xmlns:ant="jelly:ant"
+ xmlns:j="jelly:core"
xmlns:maven="jelly:maven">
<!-- XXX: must be a nicer way - maybe SCM can read the POM and recursively
checkout parent directories
@@ -26,13 +27,21 @@
<postGoal name="scm:cvs-checkout-project">
<maven:pluginVar plugin="maven-scm-plugin" property="maven.scm.checkout.dir"
var="dir" />
<ant:mkdir dir="${dir}/maven-plugins/plugin-parent" />
- <ant:copy todir="${dir}/maven-plugins/plugin-parent" file="${pom.parent.file}"
/>
- <ant:copy todir="${dir}/maven-plugins/plugin-parent"
file="${pom.parent.file.parent}/project.properties" />
- <ant:copy todir="${dir}/maven-plugins/plugin-parent"
file="${pom.parent.file.parent}/build.properties" failonerror="false" />
+ <ant:copy todir="${dir}/maven-plugins/plugin-parent">
+ <ant:fileset dir="${pom.parent.file.parent}" />
+ </ant:copy>
<ant:copy todir="${dir}/maven-plugins"
file="${pom.parent.file.parent}/../LICENSE.txt" />
<ant:copy todir="${dir}/maven-plugins"
file="${pom.parent.file.parent}/../NOTICE.txt" />
<ant:copy todir="${dir}/maven-plugins"
file="${pom.parent.file.parent}/../checkstyle.xml" />
<ant:copy todir="${dir}/maven-plugins"
file="${pom.parent.file.parent}/../checkstyle-license.txt" />
+ <j:set var="executionDir" value="${basedir}" scope="parent" />
</postGoal>
+ <postGoal name="site:deploy">
+ <maven:maven
+ descriptor="${executionDir}/../project.xml"
+ goals="confirm-and-deploy-site"
+ ignoreFailures="false"
+ />
+ </postGoal>
</project>
1.8 +2 -1 maven-plugins/plugin-parent/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/plugin-parent/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 18 Oct 2004 16:58:26 -0000 1.7
+++ project.xml 30 Oct 2004 08:30:46 -0000 1.8
@@ -22,7 +22,7 @@
<pomVersion>3</pomVersion>
<id>plugin-parent</id>
- <name>Optional Maven Plugins</name>
+ <name>Maven Plugins</name>
<groupId>maven</groupId>
<currentVersion>1.0</currentVersion>
<organization>
@@ -39,6 +39,7 @@
<siteDirectory>/www/maven.apache.org/reference/plugins/optional/</siteDirectory>
<distributionSite>www.apache.org</distributionSite>
<distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>
+
<mailingLists>
<mailingList>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
