jvanzyl 2004/03/19 08:13:14
Modified: maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven
plugin.xml
maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven
plugin.xml
maven-plugins/maven-resources-plugin/src/main/resources/META-INF/maven
plugin.xml
maven-plugins/maven-scm-plugin/src/main/resources/META-INF/maven
plugin.xml
maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven
plugin.xml
Log:
o update plugin descriptors to match changes in maven-core.
Revision Changes Path
1.4 +32 -8
maven-components/maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.xml 19 Mar 2004 04:11:11 -0000 1.3
+++ plugin.xml 19 Mar 2004 16:13:14 -0000 1.4
@@ -12,10 +12,22 @@
<goal>
<name>compile</name>
<parameters>
- <sourceDirectory>#project.build.sourceDirectory</sourceDirectory>
- <outputDirectory>#maven.build.dest</outputDirectory>
- <classpathElements>#project.classpathElements</classpathElements>
- <compiler>javac</compiler>
+ <parameter>
+ <name>sourceDirectory</name>
+ <expression>#project.build.sourceDirectory</expression>
+ </parameter>
+ <parameter>
+ <name>outputDirectory</name>
+ <expression>#maven.build.dest</expression>
+ </parameter>
+ <parameter>
+ <name>classpathElements</name>
+ <expression>#project.classpathElements</expression>
+ </parameter>
+ <parameter>
+ <name>compiler</name>
+ <expression>javac</expression>
+ </parameter>
</parameters>
</goal>
<goal>
@@ -24,10 +36,22 @@
<prereq>compile</prereq>
</prereqs>
<parameters>
- <sourceDirectory>#project.build.unitTestSourceDirectory</sourceDirectory>
- <outputDirectory>#maven.test.dest</outputDirectory>
- <classpathElements>#project.classpathElements</classpathElements>
- <compiler>javac</compiler>
+ <parameter>
+ <name>sourceDirectory</name>
+ <expression>#project.build.unitTestSourceDirectory</expression>
+ </parameter>
+ <parameter>
+ <name>outputDirectory</name>
+ <expression>#maven.test.dest</expression>
+ </parameter>
+ <parameter>
+ <name>classpathElements</name>
+ <expression>#project.classpathElements</expression>
+ </parameter>
+ <parameter>
+ <name>compiler</name>
+ <expression>javac</expression>
+ </parameter>
</parameters>
</goal>
</goals>
1.3 +14 -5
maven-components/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.xml 19 Mar 2004 04:11:11 -0000 1.2
+++ plugin.xml 19 Mar 2004 16:13:14 -0000 1.3
@@ -9,11 +9,20 @@
<prereq>test</prereq>
<prereq>resources</prereq>
</prereqs>
- <fields>
- <jarName>#maven.final.name</jarName>
- <outputDirectory>#maven.build.dir</outputDirectory>
- <basedir>#maven.build.dest</basedir>
- </fields>
+ <parameters>
+ <parameter>
+ <name>jarName</name>
+ <expression>#maven.final.name</expression>
+ </parameter>
+ <parameter>
+ <name>outputDirectory</name>
+ <expression>#maven.build.dir</expression>
+ </parameter>
+ <parameter>
+ <name>basedir</name>
+ <expression>#maven.build.dest</expression>
+ </parameter>
+ </parameters>
</goal>
</goals>
</plugin>
1.3 +20 -8
maven-components/maven-plugins/maven-resources-plugin/src/main/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-resources-plugin/src/main/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.xml 19 Mar 2004 04:11:11 -0000 1.2
+++ plugin.xml 19 Mar 2004 16:13:14 -0000 1.3
@@ -5,17 +5,29 @@
<goals>
<goal>
<name>resources</name>
- <fields>
- <outputDirectory>#maven.build.dest</outputDirectory>
- <resources>#project.build.resources</resources>
- </fields>
+ <parameters>
+ <parameter>
+ <name>outputDirectory</name>
+ <expression>#maven.build.dest</expression>
+ </parameter>
+ <parameter>
+ <name>resources</name>
+ <expression>#project.build.resources</expression>
+ </parameter>
+ </parameters>
</goal>
<goal>
<name>test:resources</name>
- <fields>
- <outputDirectory>#maven.test.dest</outputDirectory>
- <resources>#project.build.unitTest.resources</resources>
- </fields>
+ <parameters>
+ <parameter>
+ <name>outputDirectory</name>
+ <expression>#maven.test.dest</expression>
+ </parameter>
+ <parameter>
+ <name>resources</name>
+ <expression>#project.build.unitTeset.resources</expression>
+ </parameter>
+ </parameters>
</goal>
</goals>
</plugin>
1.3 +79 -25
maven-components/maven-plugins/maven-scm-plugin/src/main/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-scm-plugin/src/main/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.xml 19 Mar 2004 04:11:11 -0000 1.2
+++ plugin.xml 19 Mar 2004 16:13:14 -0000 1.3
@@ -1,40 +1,94 @@
<plugin>
<id>scm</id>
<implementation>org.apache.maven.plugin.ScmPlugin</implementation>
- <mode>fields</mode>
+ <mode>field</mode>
<goals>
<goal>
<name>scm:checkout</name>
- <fields>
- <commandName>checkout</commandName>
- <connection>#project.repository.connection</connection>
- <workingDirectory>#basedir</workingDirectory>
- <branch>#branch</branch>
- <tag>#tag</tag>
- </fields>
+ <parameters>
+ <parameter>
+ <name>commandName</name>
+ <expression>checkout</expression>
+ </parameter>
+ <parameter>
+ <name>connection</name>
+ <expression>#project.repository.connection</expression>
+ </parameter>
+ <parameter>
+ <name>workingDirectory</name>
+ <expression>#basedir</expression>
+ </parameter>
+ <parameter>
+ <name>branch</name>
+ <expression>#branch</expression>
+ </parameter>
+ <parameter>
+ <name>name</name>
+ <expression>#tag</expression>
+ </parameter>
+ </parameters>
</goal>
<goal>
<name>scm:changelog</name>
- <fields>
- <commandName>changelog</commandName>
- <connection>#project.repository.connection</connection>
- <workingDirectory>#basedir</workingDirectory>
- <branch>#branch</branch>
- <tag>#tag</tag>
- <range>30</range>
- <startDate>#startDate</startDate>
- <endDate>#startDate</endDate>
- </fields>
+ <parameters>
+ <parameter>
+ <name>commandName</name>
+ <expression>changelog</expression>
+ </parameter>
+ <parameter>
+ <name>connection</name>
+ <expression>#project.repository.connection</expression>
+ </parameter>
+ <parameter>
+ <name>workingDirectory</name>
+ <expression>#basedir</expression>
+ </parameter>
+ <parameter>
+ <name>branch</name>
+ <expression>#branch</expression>
+ </parameter>
+ <parameter>
+ <name>tag</name>
+ <expression>#tag</expression>
+ </parameter>
+ <parameter>
+ <name>range</name>
+ <expression>30</expression>
+ </parameter>
+ <parameter>
+ <name>startDate</name>
+ <expression>#startDate</expression>
+ </parameter>
+ <parameter>
+ <name>endDate</name>
+ <expression>#endDate</expression>
+ </parameter>
+ </parameters>
</goal>
<goal>
<name>scm:update</name>
- <fields>
- <commandName>update</commandName>
- <connection>#project.repository.connection</connection>
- <workingDirectory>#basedir</workingDirectory>
- <branch>#branch</branch>
- <tag>#tag</tag>
- </fields>
+ <parameters>
+ <parameter>
+ <name>commandName</name>
+ <expression>update</expression>
+ </parameter>
+ <parameter>
+ <name>connection</name>
+ <expression>#project.repository.connection</expression>
+ </parameter>
+ <parameter>
+ <name>workingDirectory</name>
+ <expression>#basedir</expression>
+ </parameter>
+ <parameter>
+ <name>branch</name>
+ <expression>#branch</expression>
+ </parameter>
+ <parameter>
+ <name>tag</name>
+ <expression>#tag</expression>
+ </parameter>
+ </parameters>
</goal>
</goals>
</plugin>
1.4 +20 -5
maven-components/maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.xml 19 Mar 2004 04:11:11 -0000 1.3
+++ plugin.xml 19 Mar 2004 16:13:14 -0000 1.4
@@ -13,11 +13,26 @@
<method>
<name>execute</name>
<parameters>
- <mavenRepoLocal>#maven.repo.local</mavenRepoLocal>
- <basedir>#basedir</basedir>
- <includes>#project.build.unitTest.includes</includes>
- <excludes>#project.build.unitTest.excludes</excludes>
- <classpathElements>#project.classpathElements</classpathElements>
+ <parameter>
+ <name>mavenRepoLocal</name>
+ <expression>#maven.repo.local</expression>
+ </parameter>
+ <parameter>
+ <name>basedir</name>
+ <expression>#basedir</expression>
+ </parameter>
+ <parameter>
+ <name>includes</name>
+ <expression>#project.build.unitTest.includes</expression>
+ </parameter>
+ <parameter>
+ <name>excludes</name>
+ <expression>#project.build.unitTest.excludes</expression>
+ </parameter>
+ <parameter>
+ <name>classpathElements</name>
+ <expression>#project.classpathElements</expression>
+ </parameter>
</parameters>
</method>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
