You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/06/11 20:53:23 UTC

svn commit: r953831 - in /cxf/branches/2.2.x-fixes: ./ distribution/pom.xml maven-plugins/codegen-plugin/pom.xml parent/pom.xml pom.xml systests/uncategorized/pom.xml testutils/pom.xml

Author: dkulp
Date: Fri Jun 11 18:53:23 2010
New Revision: 953831

URL: http://svn.apache.org/viewvc?rev=953831&view=rev
Log:
Merged revisions 953777 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r953777 | dkulp | 2010-06-11 13:12:09 -0400 (Fri, 11 Jun 2010) | 1 line
  
  Update versions of various ant things
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/distribution/pom.xml
    cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/pom.xml
    cxf/branches/2.2.x-fixes/parent/pom.xml
    cxf/branches/2.2.x-fixes/pom.xml
    cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
    cxf/branches/2.2.x-fixes/testutils/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/pom.xml?rev=953831&r1=953830&r2=953831&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/pom.xml Fri Jun 11 18:53:23 2010
@@ -407,9 +407,9 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>ant</groupId>
+                        <groupId>org.apache.ant</groupId>
                         <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
+                        <version>1.8.0</version>
                     </dependency>
                 </dependencies>
                 <executions>

Modified: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/pom.xml?rev=953831&r1=953830&r2=953831&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/pom.xml Fri Jun 11 18:53:23 2010
@@ -100,11 +100,11 @@
         </dependency>
                      
         <dependency>
-            <groupId>ant</groupId>
+            <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
         </dependency>
         <dependency>
-            <groupId>ant</groupId>
+            <groupId>org.apache.ant</groupId>
             <artifactId>ant-nodeps</artifactId>
         </dependency>
     </dependencies>

Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=953831&r1=953830&r2=953831&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Fri Jun 11 18:53:23 2010
@@ -411,14 +411,14 @@
                 <version>4aug2000r7-dev</version>
             </dependency>
             <dependency>
-                <groupId>ant</groupId>
+                <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
-                <version>1.6.5</version>
+                <version>1.8.1</version>
             </dependency>
             <dependency>
-                <groupId>ant</groupId>
+                <groupId>org.apache.ant</groupId>
                 <artifactId>ant-nodeps</artifactId>
-                <version>1.6.5</version>
+                <version>1.8.1</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.parsers</groupId>

Modified: cxf/branches/2.2.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/pom.xml?rev=953831&r1=953830&r2=953831&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/pom.xml Fri Jun 11 18:53:23 2010
@@ -439,6 +439,11 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.1.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>2.3.1</version>
                     <configuration>

Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml?rev=953831&r1=953830&r2=953831&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml Fri Jun 11 18:53:23 2010
@@ -388,7 +388,7 @@
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>ant</groupId>
+            <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
             <scope>test</scope>
         </dependency>

Modified: cxf/branches/2.2.x-fixes/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/testutils/pom.xml?rev=953831&r1=953830&r2=953831&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/testutils/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/testutils/pom.xml Fri Jun 11 18:53:23 2010
@@ -85,9 +85,9 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>ant</groupId>
+                        <groupId>org.apache.ant</groupId>
                         <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
+                        <version>1.8.0</version>
                     </dependency>
                 </dependencies>