You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ve...@apache.org on 2010/02/03 11:37:11 UTC

svn commit: r905980 - /webservices/axis2/trunk/java/pom.xml

Author: veithen
Date: Wed Feb  3 10:37:09 2010
New Revision: 905980

URL: http://svn.apache.org/viewvc?rev=905980&view=rev
Log:
Eliminated/merged the two profiles for JDK 1.5 and JDK 1.6 in the root POM.

Reason: these two profiles are strictly the same [Note: they existed because in Axis2 1.4, we had another profile for JDK 1.4 which excluded one module from axis2-jar; this profile was removed in r651888].

Modified:
    webservices/axis2/trunk/java/pom.xml

Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?rev=905980&r1=905979&r2=905980&view=diff
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Wed Feb  3 10:37:09 2010
@@ -91,82 +91,6 @@
                 <module>modules/distribution</module>
             </modules>
         </profile>
-        <profile>
-            <id>java15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>axis2-jar</id>
-                                <phase>package</phase>
-                                <configuration>
-                                    <tasks>
-                                        <mkdir dir="target/lib"/>
-                                        <jar destfile="target/lib/axis2-${pom.version}.jar">
-                                            <fileset dir="modules/java2wsdl/target/classes"/>
-                                            <fileset dir="modules/kernel/target/classes"/>
-                                            <fileset dir="modules/addressing/target/classes"/>
-                                            <fileset dir="modules/codegen/target/classes"/>
-                                            <fileset dir="modules/adb/target/classes"/>
-                                            <fileset dir="modules/adb-codegen/target/classes"/>
-                                            <fileset dir="modules/xmlbeans/target/classes"/>
-                                            <fileset dir="modules/clustering/target/classes"/>
-                                        </jar>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>java16</id>
-            <activation>
-                <jdk>1.6</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>axis2-jar</id>
-                                <phase>package</phase>
-                                <configuration>
-                                    <tasks>
-                                        <mkdir dir="target/lib"/>
-                                        <jar destfile="target/lib/axis2-${pom.version}.jar">
-                                            <fileset dir="modules/java2wsdl/target/classes"/>
-                                            <fileset dir="modules/kernel/target/classes"/>
-                                            <fileset dir="modules/addressing/target/classes"/>
-                                            <fileset dir="modules/codegen/target/classes"/>
-                                            <fileset dir="modules/adb/target/classes"/>
-                                            <fileset dir="modules/adb-codegen/target/classes"/>
-                                            <fileset dir="modules/xmlbeans/target/classes"/>
-                                            <fileset dir="modules/clustering/target/classes"/>
-                                        </jar>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
     <ciManagement>
         <system>continuum</system>
@@ -212,6 +136,34 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>axis2-jar</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="target/lib"/>
+                                <jar destfile="target/lib/axis2-${pom.version}.jar">
+                                    <fileset dir="modules/java2wsdl/target/classes"/>
+                                    <fileset dir="modules/kernel/target/classes"/>
+                                    <fileset dir="modules/addressing/target/classes"/>
+                                    <fileset dir="modules/codegen/target/classes"/>
+                                    <fileset dir="modules/adb/target/classes"/>
+                                    <fileset dir="modules/adb-codegen/target/classes"/>
+                                    <fileset dir="modules/xmlbeans/target/classes"/>
+                                    <fileset dir="modules/clustering/target/classes"/>
+                                </jar>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <executions>