You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2010/04/21 20:41:00 UTC

svn commit: r936434 - in /axis/axis2/java/core/trunk/modules: distribution/pom.xml java2wsdl/pom.xml parent/pom.xml tool/axis2-ant-plugin/pom.xml

Author: veithen
Date: Wed Apr 21 18:40:59 2010
New Revision: 936434

URL: http://svn.apache.org/viewvc?rev=936434&view=rev
Log:
Use the same Groovy Maven plugin everywhere.

Modified:
    axis/axis2/java/core/trunk/modules/distribution/pom.xml
    axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
    axis/axis2/java/core/trunk/modules/parent/pom.xml
    axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml

Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=936434&r1=936433&r2=936434&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Wed Apr 21 18:40:59 2010
@@ -224,36 +224,33 @@
             </plugin>
             <plugin>
                 <!-- This generates the modules.list and services.list files -->
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>script-maven-plugin</artifactId>
-                <version>1.1</version>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>groovy</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
                             <source>
-                                <body>
-                                    def modulesdir = new File(project.build.directory, "tmp-repository/modules");
-                                    def moduleslist = new File(modulesdir, "modules.list");
-                                    moduleslist.delete();
-                                    modulesdir.eachFile({
-                                        if (it.name.endsWith(".mar")) {
-                                            moduleslist.append("$it.name\n");
-                                        }
-                                    })
-                                    
-                                    def servicesdir = new File(project.build.directory, "tmp-repository/services");
-                                    def serviceslist = new File(servicesdir, "services.list");
-                                    serviceslist.delete();
-                                    servicesdir.eachFile({
-                                        if (it.name.endsWith(".aar")) {
-                                            serviceslist.append("$it.name\n");
-                                        }
-                                    })
-                                </body>
+                                def modulesdir = new File(project.build.directory, "tmp-repository/modules");
+                                def moduleslist = new File(modulesdir, "modules.list");
+                                moduleslist.delete();
+                                modulesdir.eachFile({
+                                    if (it.name.endsWith(".mar")) {
+                                        moduleslist.append("$it.name\n");
+                                    }
+                                })
+                                
+                                def servicesdir = new File(project.build.directory, "tmp-repository/services");
+                                def serviceslist = new File(servicesdir, "services.list");
+                                serviceslist.delete();
+                                servicesdir.eachFile({
+                                    if (it.name.endsWith(".aar")) {
+                                        serviceslist.append("$it.name\n");
+                                    }
+                                })
                             </source>
                         </configuration>
                     </execution>

Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=936434&r1=936433&r2=936434&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Wed Apr 21 18:40:59 2010
@@ -158,7 +158,6 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
-                <version>1.2</version>
                 <executions>
                     <execution>
                         <phase>test</phase>

Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=936434&r1=936433&r2=936434&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Wed Apr 21 18:40:59 2010
@@ -1281,6 +1281,11 @@
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.4</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>1.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=936434&r1=936433&r2=936434&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Wed Apr 21 18:40:59 2010
@@ -163,7 +163,6 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
-                <version>1.2</version>
                 <executions>
                     <execution>
                         <phase>test</phase>