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 2011/02/18 23:29:23 UTC

svn commit: r1072177 - in /axis/axis2/java/core/branches/1_6: ./ modules/parent/pom.xml pom.xml

Author: veithen
Date: Fri Feb 18 22:29:22 2011
New Revision: 1072177

URL: http://svn.apache.org/viewvc?rev=1072177&view=rev
Log:
Merged r1072077 to the 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
    axis/axis2/java/core/branches/1_6/pom.xml

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
    svn:mergeinfo = /axis/axis2/java/core/trunk:1072077

Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1072177&r1=1072176&r2=1072177&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Fri Feb 18 22:29:22 2011
@@ -1031,12 +1031,6 @@
                     <version>1.2</version>
                 </plugin>
                 <plugin>
-                    <!-- Need 1.1 to avoid MGPG-17 -->
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
                     <version>2.1.0</version>

Modified: axis/axis2/java/core/branches/1_6/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1072177&r1=1072176&r2=1072177&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/pom.xml Fri Feb 18 22:29:22 2011
@@ -559,12 +559,6 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <!-- Need 1.1 to avoid MGPG-17 -->
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-                <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>2.7</version>
                     <configuration>