cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r964994 - in /cxf/trunk: common/common/ distribution/ distribution/bundle/all/ distribution/bundle/jaxrs/ distribution/bundle/minimal/ distribution/manifest/ distribution/src/main/release/lib/ parent/ rt/bindings/soap/
Date Sat, 17 Jul 2010 01:55:16 GMT
Author: dkulp
Date: Sat Jul 17 01:55:16 2010
New Revision: 964994

URL: http://svn.apache.org/viewvc?rev=964994&view=rev
Log:
Update a bunch of versions of things.  Update distribution to build same
on java6.

Modified:
    cxf/trunk/common/common/pom.xml
    cxf/trunk/distribution/bundle/all/pom.xml
    cxf/trunk/distribution/bundle/jaxrs/pom.xml
    cxf/trunk/distribution/bundle/minimal/pom.xml
    cxf/trunk/distribution/manifest/pom.xml
    cxf/trunk/distribution/pom.xml
    cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/bindings/soap/pom.xml

Modified: cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/pom.xml?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/common/common/pom.xml (original)
+++ cxf/trunk/common/common/pom.xml Sat Jul 17 01:55:16 2010
@@ -90,14 +90,13 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
+            <version>1.2.16</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.5.11</version>
             <optional>true</optional>
         </dependency>
 

Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Sat Jul 17 01:55:16 2010
@@ -281,8 +281,8 @@
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)",
-                            org.apache.abdera*;resolution:=optional,
-                            org.apache.commons.lang*;resolution:=optional,
+                            org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
                             org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
@@ -298,7 +298,7 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
-                            org.slf4j*;resolution:=optional,
+                            org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",
                             javax.activation;version="[0.0,2)",
                             javax.annotation;version="[0.0,2)",

Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Sat Jul 17 01:55:16 2010
@@ -136,8 +136,8 @@
                             javax.resource*;resolution:=optional,
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)",
-                            org.apache.abdera*;resolution:=optional,
-                            org.apache.commons.lang*;resolution:=optional,
+                            org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
                             org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
@@ -150,7 +150,7 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
-                            org.slf4j*;resolution:=optional,
+                            org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",
                             javax.activation;version="[0.0,2)",
                             javax.annotation;version="[0.0,2)",

Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Sat Jul 17 01:55:16 2010
@@ -183,8 +183,8 @@
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)",
-                            org.apache.abdera*;resolution:=optional,
-                            org.apache.commons.lang*;resolution:=optional,
+                            org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
                             org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
@@ -200,7 +200,7 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
-                            org.slf4j*;resolution:=optional,
+                            org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",
                             javax.activation;version="[0.0,2)",
                             javax.annotation;version="[0.0,2)",

Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Sat Jul 17 01:55:16 2010
@@ -310,5 +310,17 @@
             </plugin>
         </plugins>
     </build>
-
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <jaxb.version>${jaxb22.version}</jaxb.version>
+                <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
+                <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
+            </properties>
+        </profile>
+    </profiles>
 </project>

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Sat Jul 17 01:55:16 2010
@@ -454,4 +454,17 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <jaxb.version>${jaxb22.version}</jaxb.version>
+                <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
+                <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
+            </properties>
+        </profile>
+    </profiles>
 </project>

Modified: cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/lib/WHICH_JARS (original)
+++ cxf/trunk/distribution/src/main/release/lib/WHICH_JARS Sat Jul 17 01:55:16 2010
@@ -23,7 +23,8 @@ The following jars are required for all 
 - jaxb-impl.jar (this is a [6] for normal runtime, but is required for 
                  tooling and the dynamic clients)
 - XmlSchema.jar
-- wstx-asl.jar  [6] or another StAX implementation
+- woodstox-core-asl.jar  [6] or another StAX implementation
+- stax2-api-3.0.1.jar [6] for woodstox above
 - wsdl4j.jar
 
 The following jars are required for XML catalog support:
@@ -33,6 +34,7 @@ For Java2WSDL and WSDL2Java:
 - The above jars
 - jaxb-xjc.jar
 - velocity.jar
+- oro.jar
 - commons-collections.jar
 - commons-lang.jar
 
@@ -82,6 +84,7 @@ For JAX-RS support:
 For JMS transport
 - geronimo-jms.jar (Or the Sun equivalent)
 - spring-jms.jar
+- spring-tx.jar
 
 For CORBA support:
 - antlr.jar

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Sat Jul 17 01:55:16 2010
@@ -48,14 +48,17 @@
         <saaj.impl.version>1.3.2</saaj.impl.version>
 
         <!-- please maintain alphabetical order here -->
-        <abdera.version>1.0</abdera.version>
-        <activemq.version>5.3.1</activemq.version>
+        <abdera.version>1.1</abdera.version>
+        <activemq.version>5.3.2</activemq.version>
         <derby.version>10.2.2.0</derby.version>
         <jaxb.version>2.1</jaxb.version>
         <jaxb.impl.version>2.1.13</jaxb.impl.version>
         <jaxb.xjc.version>2.1.13</jaxb.xjc.version>
+        <jaxb22.version>2.2.1</jaxb22.version>
+        <jaxb22.impl.version>2.2.1.1</jaxb22.impl.version>
+        <jaxb22.xjc.version>2.2.1.1</jaxb22.xjc.version>
         <jdom.version>1.0</jdom.version>
-        <jetty.version>6.1.21</jetty.version>
+        <jetty.version>6.1.24</jetty.version>
         <msv.version>2009.1</msv.version>
         <rhino.version>1.7R1</rhino.version>
         <saaj.version>1.3</saaj.version>
@@ -63,10 +66,10 @@
         <spring.mock>spring-test</spring.mock>
         <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
         <stax.impl.artifactId>woodstox-core-asl</stax.impl.artifactId>
-        <stax.impl.version>4.0.7</stax.impl.version>
+        <stax.impl.version>4.0.8</stax.impl.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <xmlbeans.version>2.4.0</xmlbeans.version>
-        <xmlschema.version>1.4.5</xmlschema.version>
+        <xmlschema.version>1.4.6</xmlschema.version>
         <checkstyle.extension />
 
         <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
@@ -433,7 +436,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.specs</groupId>
                 <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-                <version>1.3.0</version>
+                <version>1.5.0</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -511,12 +514,12 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jdk14</artifactId>
-                <version>1.5.8</version>
+                <version>1.6.1</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.5.8</version>
+                <version>1.6.1</version>
             </dependency>
             <dependency>
                 <groupId>org.mortbay.jetty</groupId>
@@ -799,7 +802,7 @@
             <dependency>
               <groupId>commons-codec</groupId>
               <artifactId>commons-codec</artifactId>
-              <version>1.3</version>
+              <version>1.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
@@ -877,12 +880,12 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                <version>1.6</version>
+                <version>1.7.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.2</version>
+                <version>1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -907,7 +910,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                <version>1.1.2</version>
+                <version>1.1.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -949,7 +952,7 @@
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.4</version>
+                <version>2.5</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
@@ -1033,7 +1036,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-api</artifactId>
-                <version>1.2.7</version>
+                <version>1.2.9</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -1076,7 +1079,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-impl</artifactId>
-                <version>1.2.7</version>
+                <version>1.2.9</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -1143,7 +1146,7 @@
             <dependency>
                 <groupId>org.codehaus.woodstox</groupId>
                 <artifactId>woodstox-core-asl</artifactId>
-                <version>4.0.7</version>
+                <version>4.0.8</version>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.msv</groupId>
@@ -1195,9 +1198,9 @@
                 <jdk>1.5</jdk>
             </activation>
             <properties>
-                <jaxb.version>2.2.1</jaxb.version>
-                <jaxb.impl.version>2.2.1.1</jaxb.impl.version>
-                <jaxb.xjc.version>2.2.1.1</jaxb.xjc.version>
+                <jaxb.version>${jaxb22.version}</jaxb.version>
+                <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
+                <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
                 <jdk.version>1.5</jdk.version>
             </properties>
         </profile>

Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=964994&r1=964993&r2=964994&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Sat Jul 17 01:55:16 2010
@@ -101,7 +101,7 @@
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
             <version>2.0.0-M6</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 



Mime
View raw message