You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2003/12/31 02:20:36 UTC
cvs commit: maven-plugins/touchstone-partner plugin.jelly project.xml
brett 2003/12/30 17:20:36
Modified: touchstone plugin.jelly project.xml
touchstone-partner plugin.jelly project.xml
Log:
changes to touchstone
Revision Changes Path
1.2 +38 -24 maven-plugins/touchstone/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/touchstone/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:46:22 -0000 1.1
+++ plugin.jelly 31 Dec 2003 01:20:36 -0000 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
<project
+ xmlns:maven="jelly:maven"
+ xmlns:ant="jelly:ant"
xmlns:j="jelly:core">
<!--
@@ -9,29 +11,41 @@
|
-->
- <goal name="touchstone-goal-A">
- <echo>touchstone-goal-A defined in plugin.</echo>
- <j:set var="touchstone_goal_A_from_plugin" value="true"/>
- </goal>
-
- <goal name="touchstone-goal-B">
- <echo>touchstone-goal-B defined in plugin.</echo>
- <j:set var="touchstone_goal_B_from_plugin" value="true"/>
- </goal>
-
- <goal name="touchstone-goal-C">
- <echo>touchstone-goal-C defined in plugin.</echo>
- <j:set var="touchstone_goal_C_from_plugin" value="true"/>
- </goal>
-
- <goal name="touchstone-goal-D">
- <echo>touchstone-goal-D defined in plugin.</echo>
- <j:set var="touchstone_goal_D_from_plugin" value="true"/>
- </goal>
-
- <goal name="touchstone-goal-E">
- <echo>touchstone-goal-E defined in plugin.</echo>
- <j:set var="touchstone_goal_E_from_plugin" value="true"/>
- </goal>
+ <goal name="touchstone-goal-A">
+ <echo>touchstone-goal-A defined in plugin.</echo>
+ <j:set var="touchstone_goal_A_from_plugin" value="true"/>
+ </goal>
+
+ <goal name="touchstone-goal-B">
+ <echo>touchstone-goal-B defined in plugin.</echo>
+ <j:set var="touchstone_goal_B_from_plugin" value="true"/>
+ </goal>
+
+ <goal name="touchstone-goal-C">
+ <echo>touchstone-goal-C defined in plugin.</echo>
+ <j:set var="touchstone_goal_C_from_plugin" value="true"/>
+ </goal>
+
+ <goal name="touchstone-goal-D">
+ <echo>touchstone-goal-D defined in plugin.</echo>
+ <j:set var="touchstone_goal_D_from_plugin" value="true"/>
+ </goal>
+
+ <goal name="touchstone-goal-E">
+ <echo>touchstone-goal-E defined in plugin.</echo>
+ <j:set var="touchstone_goal_E_from_plugin" value="true"/>
+ </goal>
+
+ <goal name="touchstone:test-context-switch-dummy">
+ <ant:echo>testing differing plugin contexts</ant:echo>
+ </goal>
+
+ <goal name="touchstone:test-context-switch">
+ <j:set var="touchstoneSourceDir" value="${pom.build.sourceDirectory}" />
+ <maven:pluginVar var="var" plugin="maven-touchstone-partner-plugin" property="partnerSourceDir" />
+ <j:if test="${var != touchstoneSourceDir}">
+ <ant:fail>pom.build.sourceDirectory differs over plugin and partner plugin (touchstone = '${touchstoneSourceDir}'; partner = '${var}')</ant:fail>
+ </j:if>
+ </goal>
</project>
1.11 +1 -1 maven-plugins/touchstone/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/touchstone/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 6 Sep 2003 07:28:55 -0000 1.10
+++ project.xml 31 Dec 2003 01:20:36 -0000 1.11
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-touchstone-plugin</id>
<name>Maven Touchstone Plug-in</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Sanity Check test project</shortDescription>
<url>http://maven.apache.org/reference/plugins/touchstone/</url>
1.6 +11 -0 maven-plugins/touchstone-partner/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/touchstone-partner/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 26 Nov 2003 09:08:31 -0000 1.5
+++ plugin.jelly 31 Dec 2003 01:20:36 -0000 1.6
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
<project
+ xmlns:maven="jelly:maven"
+ xmlns:ant="jelly:ant"
xmlns:j="jelly:core">
<preGoal name="touchstone-goal-C">
@@ -31,4 +33,13 @@
<j:set var="touchstone_partner_postGoal_D" value="true"/>
</goal>
+ <goal name="touchstone-partner:test-context-switch">
+ <maven:maven
+ descriptor="${basedir}/src/reactor-build/failProperty/success-1/project.xml"
+ goals="touchstone:test-context-switch-dummy"
+ ignoreFailures="false"
+ />
+ <j:set var="partnerSourceDir" value="${pom.build.sourceDirectory}" />
+ <attainGoal name="touchstone:test-context-switch" />
+ </goal>
</project>
1.13 +1 -1 maven-plugins/touchstone-partner/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/touchstone-partner/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 6 Sep 2003 07:28:55 -0000 1.12
+++ project.xml 31 Dec 2003 01:20:36 -0000 1.13
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-touchstone-partner-plugin</id>
<name>Maven Touchstone Partner Plug-in</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Testing sanity check project</shortDescription>
<url>http://maven.apache.org/reference/plugins/touchstone-partner/</url>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org