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 2008/09/16 20:31:36 UTC

svn commit: r695999 - in /cxf/trunk: ./ distribution/bundle/all/ distribution/bundle/jaxrs/ distribution/bundle/minimal/ parent/ rt/bindings/http/ rt/bindings/jbi/ rt/databinding/aegis/ rt/databinding/xmlbeans/ rt/frontend/jaxws/ rt/javascript/ rt/test...

Author: dkulp
Date: Tue Sep 16 11:31:35 2008
New Revision: 695999

URL: http://svn.apache.org/viewvc?rev=695999&view=rev
Log:
Update to latest versions of various plugins, various deps, etc...   Move some dep versions to the parent pom so one place to update.

Modified:
    cxf/trunk/distribution/bundle/all/pom.xml
    cxf/trunk/distribution/bundle/jaxrs/pom.xml
    cxf/trunk/distribution/bundle/minimal/pom.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/pom.xml
    cxf/trunk/rt/bindings/http/pom.xml
    cxf/trunk/rt/bindings/jbi/pom.xml
    cxf/trunk/rt/databinding/aegis/pom.xml
    cxf/trunk/rt/databinding/xmlbeans/pom.xml
    cxf/trunk/rt/frontend/jaxws/pom.xml
    cxf/trunk/rt/javascript/pom.xml
    cxf/trunk/rt/testsupport/pom.xml
    cxf/trunk/rt/transports/jbi/pom.xml
    cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
    cxf/trunk/systests/pom.xml
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java
    cxf/trunk/testutils/pom.xml
    cxf/trunk/tools/corba/pom.xml
    cxf/trunk/tools/javato/ws/pom.xml

Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Tue Sep 16 11:31:35 2008
@@ -243,7 +243,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Tue Sep 16 11:31:35 2008
@@ -98,7 +98,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Tue Sep 16 11:31:35 2008
@@ -132,7 +132,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Sep 16 11:31:35 2008
@@ -45,7 +45,7 @@
         <jaxb.version>2.1</jaxb.version>
         <jaxb.impl.version>2.1.7</jaxb.impl.version>
         <jaxb.xjc.version>2.1.7</jaxb.xjc.version>
-        <jetty.version>6.1.9</jetty.version>
+        <jetty.version>6.1.11</jetty.version>
         <saaj.version>1.3</saaj.version>
         <saaj.impl.version>1.3</saaj.impl.version>
         <spring.version>2.5.5</spring.version>
@@ -62,7 +62,7 @@
         <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
 
         <downloadSources>true</downloadSources>
-        <servicemix.version>3.2.1</servicemix.version>
+        <servicemix.version>3.2.2</servicemix.version>
     </properties>
 
 
@@ -434,6 +434,11 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.codehaus.jra</groupId>
+                <artifactId>jra</artifactId>
+                <version>1.0-alpha-4</version>
+            </dependency>
+            <dependency>
                 <groupId>jtidy</groupId>
                 <artifactId>jtidy</artifactId>
                 <version>4aug2000r7-dev</version>
@@ -769,7 +774,7 @@
             <dependency>
                 <groupId>org.easymock</groupId>
                 <artifactId>easymockclassextension</artifactId>
-                <version>2.2.2</version>
+                <version>2.4</version>
             </dependency>
             <dependency>
                 <groupId>asm</groupId>
@@ -815,7 +820,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                <version>1.3</version>
+                <version>1.5</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>

Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Tue Sep 16 11:31:35 2008
@@ -297,7 +297,7 @@
                     <plugin>
                         <inherited>true</inherited>
                         <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.3</version>
+                        <version>2.4</version>
                         <configuration>
                             <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
                             <updateReleaseInfo>true</updateReleaseInfo>
@@ -363,6 +363,16 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>1.4.3</version>
+                </plugin>
+                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
                     <configuration>
@@ -377,7 +387,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.5</version>
                     <configuration>
                         <attach>true</attach>
                         <quiet>true</quiet>
@@ -404,7 +414,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.1</version>
+                    <version>1.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

Modified: cxf/trunk/rt/bindings/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/pom.xml (original)
+++ cxf/trunk/rt/bindings/http/pom.xml Tue Sep 16 11:31:35 2008
@@ -34,7 +34,6 @@
         <dependency>
             <groupId>org.codehaus.jra</groupId>
             <artifactId>jra</artifactId>
-            <version>1.0-alpha-4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ cxf/trunk/rt/bindings/jbi/pom.xml Tue Sep 16 11:31:35 2008
@@ -112,7 +112,6 @@
         <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
-            <version>1.4.1</version>
             <executions>
                 <execution>
                     <id>bundle-manifest</id>

Modified: cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ cxf/trunk/rt/databinding/aegis/pom.xml Tue Sep 16 11:31:35 2008
@@ -100,7 +100,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

Modified: cxf/trunk/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/trunk/rt/databinding/xmlbeans/pom.xml Tue Sep 16 11:31:35 2008
@@ -91,7 +91,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>

Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Tue Sep 16 11:31:35 2008
@@ -128,7 +128,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

Modified: cxf/trunk/rt/javascript/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/pom.xml (original)
+++ cxf/trunk/rt/javascript/pom.xml Tue Sep 16 11:31:35 2008
@@ -132,7 +132,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

Modified: cxf/trunk/rt/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/testsupport/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/testsupport/pom.xml (original)
+++ cxf/trunk/rt/testsupport/pom.xml Tue Sep 16 11:31:35 2008
@@ -53,7 +53,6 @@
         <dependency>
             <groupId>org.codehaus.jra</groupId>
             <artifactId>jra</artifactId>
-            <version>1.0-alpha-3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: cxf/trunk/rt/transports/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/pom.xml (original)
+++ cxf/trunk/rt/transports/jbi/pom.xml Tue Sep 16 11:31:35 2008
@@ -105,7 +105,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.1</version>
                 <executions>
                     <execution>
                         <id>bundle-manifest</id>

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java Tue Sep 16 11:31:35 2008
@@ -60,8 +60,9 @@
     @Before
     public void setUp() {
         control = EasyMock.createNiceControl();
+        control.makeThreadSafe(true);
         factory = new ObjectFactory();
-        ref = control.createMock(EndpointReferenceType.class); 
+        ref = control.createMock(EndpointReferenceType.class);
         id = factory.createIdentifier();
         id.setValue("seq");
     }

Modified: cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/systests/pom.xml (original)
+++ cxf/trunk/systests/pom.xml Tue Sep 16 11:31:35 2008
@@ -39,7 +39,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
@@ -375,11 +374,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.3.1</version>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
             <scope>test</scope>

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java Tue Sep 16 11:31:35 2008
@@ -71,7 +71,7 @@
 
         for (int i = 0; i < 5; i++) {
             putLastTradedPrice.sayHi(holder);
-            assertEquals(4.5f, holder.value.getTickerPrice());
+            assertEquals(4.5f, holder.value.getTickerPrice(), 0.01);
             assertEquals("APACHE", holder.value.getTickerSymbol());
             putLastTradedPrice.putLastTradedPrice(priceData);
         }

Modified: cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/testutils/pom.xml (original)
+++ cxf/trunk/testutils/pom.xml Tue Sep 16 11:31:35 2008
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>org.codehaus.jra</groupId>
             <artifactId>jra</artifactId>
-            <version>1.0-alpha-3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: cxf/trunk/tools/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/tools/corba/pom.xml (original)
+++ cxf/trunk/tools/corba/pom.xml Tue Sep 16 11:31:35 2008
@@ -83,7 +83,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

Modified: cxf/trunk/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=695999&r1=695998&r2=695999&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/pom.xml (original)
+++ cxf/trunk/tools/javato/ws/pom.xml Tue Sep 16 11:31:35 2008
@@ -196,7 +196,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>