cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r813968 - in /cxf/branches/2.1.x-fixes: ./ maven-plugins/codegen-plugin/ parent/ rt/javascript/ systests/aegis/ systests/jaxrs/ systests/jaxws/ systests/transports/ systests/uncategorized/ tools/javato/ws/ tools/wsdlto/core/
Date Fri, 11 Sep 2009 18:15:15 GMT
Author: dkulp
Date: Fri Sep 11 18:15:14 2009
New Revision: 813968

URL: http://svn.apache.org/viewvc?rev=813968&view=rev
Log:
Merged revisions 813945 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r813945 | dkulp | 2009-09-11 13:40:15 -0400 (Fri, 11 Sep 2009) | 11 lines
  
  Merged revisions 813943 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r813943 | dkulp | 2009-09-11 13:38:19 -0400 (Fri, 11 Sep 2009) | 3 lines
    
    [CXF-2424] Add version numbers and such in poms to make sure it builds
    with maven 3
    Patch from Benjamin Bentmann applied
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/pom.xml
    cxf/branches/2.1.x-fixes/parent/pom.xml
    cxf/branches/2.1.x-fixes/pom.xml
    cxf/branches/2.1.x-fixes/rt/javascript/pom.xml
    cxf/branches/2.1.x-fixes/systests/aegis/pom.xml
    cxf/branches/2.1.x-fixes/systests/jaxrs/pom.xml
    cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml
    cxf/branches/2.1.x-fixes/systests/transports/pom.xml
    cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml
    cxf/branches/2.1.x-fixes/tools/javato/ws/pom.xml
    cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml

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

Modified: cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/pom.xml Fri Sep 11 18:15:14 2009
@@ -52,9 +52,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <scope>provided</scope>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>1.1</version>
         </dependency>
 
         <dependency>

Modified: cxf/branches/2.1.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Fri Sep 11 18:15:14 2009
@@ -167,7 +167,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.3</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf</groupId>
@@ -1141,16 +1141,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.1.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.4.3</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.5</version>
             </plugin>
-        </plugins>
     </reporting>
 
     <profiles>

Modified: cxf/branches/2.1.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/pom.xml Fri Sep 11 18:15:14 2009
@@ -501,10 +501,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.1.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.6</version>
             </plugin>
         </plugins>
     </reporting>

Modified: cxf/branches/2.1.x-fixes/rt/javascript/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/javascript/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/javascript/pom.xml Fri Sep 11 18:15:14 2009
@@ -29,11 +29,6 @@
             <artifactId>cxf-rt-frontend-simple</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.1.x-fixes/systests/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/aegis/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/aegis/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/aegis/pom.xml Fri Sep 11 18:15:14 2009
@@ -390,12 +390,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.1.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/jaxrs/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/jaxrs/pom.xml Fri Sep 11 18:15:14 2009
@@ -393,12 +393,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml Fri Sep 11 18:15:14 2009
@@ -408,12 +408,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.1.x-fixes/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/transports/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/transports/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/transports/pom.xml Fri Sep 11 18:15:14 2009
@@ -389,12 +389,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml Fri Sep 11 18:15:14 2009
@@ -489,12 +489,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.1.x-fixes/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/javato/ws/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/javato/ws/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/tools/javato/ws/pom.xml Fri Sep 11 18:15:14 2009
@@ -127,12 +127,6 @@
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml?rev=813968&r1=813967&r2=813968&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml Fri Sep 11 18:15:14 2009
@@ -40,12 +40,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common-schemas</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-validator</artifactId>
             <version>${project.version}</version>
 



Mime
View raw message