From 3d28ca82f2f0a46b3e6852397fc6e31edf106670 Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Fri, 19 Mar 2004 16:13:14 +0000
Subject: [PATCH] o update plugin descriptors to match changes in maven-core.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162616 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/META-INF/maven/plugin.xml  | 40 +++++++++++++++----
 .../main/resources/META-INF/maven/plugin.xml  | 19 ++++++---
 .../main/resources/META-INF/maven/plugin.xml  | 28 +++++++++----
 .../main/resources/META-INF/maven/plugin.xml  | 25 +++++++++---
 4 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven/plugin.xml b/maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven/plugin.xml
index a5f7a549bf..b0da5879ed 100644
--- a/maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven/plugin.xml
+++ b/maven-plugins/maven-compiler-plugin/src/main/resources/META-INF/maven/plugin.xml
@@ -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>
diff --git a/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven/plugin.xml b/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven/plugin.xml
index 1041298c5f..07448ccd59 100644
--- a/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven/plugin.xml
+++ b/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven/plugin.xml
@@ -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>
diff --git a/maven-plugins/maven-resources-plugin/src/main/resources/META-INF/maven/plugin.xml b/maven-plugins/maven-resources-plugin/src/main/resources/META-INF/maven/plugin.xml
index 66cc6678de..67977e9feb 100644
--- a/maven-plugins/maven-resources-plugin/src/main/resources/META-INF/maven/plugin.xml
+++ b/maven-plugins/maven-resources-plugin/src/main/resources/META-INF/maven/plugin.xml
@@ -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>
diff --git a/maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven/plugin.xml b/maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven/plugin.xml
index 7170d9481e..86a4958600 100644
--- a/maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven/plugin.xml
+++ b/maven-plugins/maven-surefire-plugin/src/main/resources/META-INF/maven/plugin.xml
@@ -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>