servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject git commit: SM-2368: Upgrade to Camel 2.14.0 and CXF 3.0.2
Date Mon, 03 Nov 2014 21:12:21 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.2.x 8ff3c8ed5 -> 76ed680ce


SM-2368: Upgrade to Camel 2.14.0 and CXF 3.0.2


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/76ed680c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/76ed680c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/76ed680c

Branch: refs/heads/servicemix-5.2.x
Commit: 76ed680ce48f141e4a6f2778a4882b51ef0edd33
Parents: 8ff3c8e
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Mon Nov 3 22:11:04 2014 +0100
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Mon Nov 3 22:11:04 2014 +0100

----------------------------------------------------------------------
 .../src/main/filtered-resources/features.xml    |  2 +-
 .../src/main/filtered-resources/internal.xml    |  2 +-
 .../camel-cxf-rest-client/pom.xml               |  2 +-
 examples/cxf/cxf-jaxrs-blueprint/pom.xml        |  2 +-
 examples/cxf/cxf-jaxrs/pom.xml                  |  2 +-
 examples/cxf/cxf-jaxws-blueprint/pom.xml        |  2 +-
 examples/cxf/cxf-ws-rm/pom.xml                  |  2 +-
 examples/cxf/cxf-ws-security-blueprint/pom.xml  |  7 +---
 .../examples/cxf/ClientPasswordCallback.java    |  3 +-
 examples/cxf/cxf-ws-security-osgi/pom.xml       |  7 +---
 .../examples/cxf/ClientPasswordCallback.java    |  4 +-
 examples/cxf/cxf-ws-security-signature/pom.xml  | 14 +++----
 .../examples/cxf/ServerPasswordCallback.java    |  4 +-
 parent/pom.xml                                  | 43 +++++++++-----------
 pom.xml                                         | 12 ++----
 15 files changed, 45 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index e27b5b7..4e6276d 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -69,7 +69,7 @@
         <bundle>mvn:com.google.guava/guava/${google.guava.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core/${swagger.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger.jaxrs.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jackson-module-scala/${jackson-module-scala.bundle.version}</bundle>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/assembly/src/main/filtered-resources/internal.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml
index 76da7fe..cfa5067 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -23,7 +23,7 @@
 
     <!-- workaround before SM-2179 get addressed on CXF side-->
     <feature name="jaxrs-api">
-        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version}</bundle>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${servicemix.specs.version}</bundle>
     </feature>
 
     <!-- workaround for SM-2301 -->

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml b/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
index e94e002..e80452a 100644
--- a/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
+++ b/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.2.5</version>
+            <version>2.2.7</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-jaxrs-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs-blueprint/pom.xml b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
index 9bd1049..c7ae792 100644
--- a/examples/cxf/cxf-jaxrs-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs/pom.xml b/examples/cxf/cxf-jaxrs/pom.xml
index 8e69fd2..6dbf47f 100644
--- a/examples/cxf/cxf-jaxrs/pom.xml
+++ b/examples/cxf/cxf-jaxrs/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-jaxws-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxws-blueprint/pom.xml b/examples/cxf/cxf-jaxws-blueprint/pom.xml
index 7940c90..aefbd1a 100644
--- a/examples/cxf/cxf-jaxws-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxws-blueprint/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-api</artifactId>
+            <artifactId>cxf-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-ws-rm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-rm/pom.xml b/examples/cxf/cxf-ws-rm/pom.xml
index 16a9f8f..021c4a6 100644
--- a/examples/cxf/cxf-ws-rm/pom.xml
+++ b/examples/cxf/cxf-ws-rm/pom.xml
@@ -63,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-api</artifactId>
+            <artifactId>cxf-core</artifactId>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-ws-security-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-blueprint/pom.xml b/examples/cxf/cxf-ws-security-blueprint/pom.xml
index fe6483f..2f10830 100644
--- a/examples/cxf/cxf-ws-security-blueprint/pom.xml
+++ b/examples/cxf/cxf-ws-security-blueprint/pom.xml
@@ -37,10 +37,6 @@
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
         </dependency>
@@ -70,8 +66,7 @@
                             org.osgi.service.blueprint,
                             org.apache.cxf.ws.security.wss4j,
                             javax.security.auth.callback,
-                            org.apache.ws.security,
-                            org.apache.ws.security.processor,
+                            org.apache.wss4j.common.ext,
                             org.apache.cxf.interceptor.security,
                             org.apache.cxf.transport.http,
                             org.apache.cxf, org.apache.cxf.endpoint, org.apache.cxf.frontend,
org.apache.cxf.interceptor, org.apache.cxf.jaxws, org.apache.cxf.message, org.apache.cxf.phase

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
b/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
index f2687af..f52ea0a 100644
--- a/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
+++ b/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
@@ -19,11 +19,12 @@
 
 package org.apache.servicemix.examples.cxf;
 
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+
 import java.io.IOException;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
 
 public class ClientPasswordCallback implements CallbackHandler {
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-ws-security-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-osgi/pom.xml b/examples/cxf/cxf-ws-security-osgi/pom.xml
index 89d97cf..163df4f 100644
--- a/examples/cxf/cxf-ws-security-osgi/pom.xml
+++ b/examples/cxf/cxf-ws-security-osgi/pom.xml
@@ -37,10 +37,6 @@
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
         </dependency>
@@ -70,8 +66,7 @@
                             org.apache.cxf.ws.security.wss4j,
                             org.springframework.beans.factory.config,
                             javax.security.auth.callback,
-                            org.apache.ws.security,
-                            org.apache.ws.security.processor,
+                            org.apache.wss4j.common.ext,
                             org.apache.cxf.interceptor.security,
                             org.apache.cxf.transport.http,
                             org.apache.cxf, org.apache.cxf.endpoint, org.apache.cxf.frontend,
org.apache.cxf.interceptor, org.apache.cxf.jaxws, org.apache.cxf.message, org.apache.cxf.phase

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
b/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
index f2687af..2733689 100755
--- a/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
+++ b/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
@@ -19,11 +19,13 @@
 
 package org.apache.servicemix.examples.cxf;
 
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+
 import java.io.IOException;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+
 
 public class ClientPasswordCallback implements CallbackHandler {
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-ws-security-signature/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-signature/pom.xml b/examples/cxf/cxf-ws-security-signature/pom.xml
index 3414db9..947c44b 100644
--- a/examples/cxf/cxf-ws-security-signature/pom.xml
+++ b/examples/cxf/cxf-ws-security-signature/pom.xml
@@ -38,13 +38,13 @@
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -61,8 +61,6 @@
                             javax.xml.bind.annotation,
                             javax.xml.namespace,
                             javax.wsdl,
-                            META-INF.cxf,
-                            META-INF.cxf.osgi,
                             org.apache.cxf.bus,
                             org.apache.cxf.bus.spring,
                             org.apache.cxf.bus.resource,
@@ -72,13 +70,11 @@
                             org.apache.cxf.ws.security.wss4j,
                             org.springframework.beans.factory.config,
                             javax.security.auth.callback,
-                            org.apache.ws.security,
-                            org.apache.ws.security.processor,
+                            org.apache.wss4j.common.ext,
                             org.apache.cxf.binding.soap.saaj,
 			                      org.apache.commons.io
                         </Import-Package>
                         <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
-                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
b/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
index 8aab9b9..956952b 100755
--- a/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
+++ b/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
@@ -19,11 +19,13 @@
 
 package org.apache.servicemix.examples.cxf;
 
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+
 import java.io.IOException;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+
 
 public class ServerPasswordCallback implements CallbackHandler {
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1ddf8e1..5ef530e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -39,8 +39,8 @@
   <properties>
     <activemq.version>5.10.0</activemq.version>
     <activiti.version>5.15.1</activiti.version>
-    <camel.version>2.13.2</camel.version>
-    <cxf.version>2.7.11</cxf.version>
+    <camel.version>2.14.0</camel.version>
+    <cxf.version>3.0.2</cxf.version>
 
     <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
     <karaf.version>2.3.8</karaf.version>
@@ -154,17 +154,7 @@
       <!-- Apache CXF -->
       <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-api</artifactId>
-        <version>${cxf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-bundle</artifactId>
-        <version>${cxf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-common</artifactId>
+        <artifactId>cxf-core</artifactId>
         <version>${cxf.version}</version>
       </dependency>
       <dependency>
@@ -199,11 +189,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-core</artifactId>
-        <version>${cxf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-databinding-aegis</artifactId>
         <version>${cxf.version}</version>
       </dependency>
@@ -239,6 +224,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-features-clustering</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-javascript</artifactId>
         <version>${cxf.version}</version>
       </dependency>
@@ -249,6 +239,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-client</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
         <version>${cxf.version}</version>
       </dependency>
@@ -289,6 +284,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-security-oauth</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-testutils</artifactId>
         <version>${cxf.version}</version>
       </dependency>
@@ -358,18 +358,13 @@
         <version>${cxf.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-xerces-xsd-validation</artifactId>
-        <version>${cxf.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.cxf.services.wsn</groupId>
         <artifactId>cxf-services-wsn-core</artifactId>
         <version>${cxf-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
-        <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+        <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
         <version>${servicemix.specs.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/76ed680c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44b0fa4..cf06508 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,9 @@
         <jaxb.api.version>2.2</jaxb.api.version>
         <osgi.version>4.3.1</osgi.version>
         <scala.bundle.version>2.10.2_1</scala.bundle.version>
-        <wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
-        <swagger.bundle.version>1.3.0_1</swagger.bundle.version>
+        <wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version>
+        <swagger.bundle.version>1.3.2_1</swagger.bundle.version>
+        <swagger.jaxrs.bundle.version>1.3.2_2</swagger.jaxrs.bundle.version>
         <javassist.bundle.version>3.12.1.GA_2</javassist.bundle.version>
         <reflections.bundle.version>0.9.8_1</reflections.bundle.version>
         <json4s.bundle.version>3.2.4_1</json4s.bundle.version>
@@ -127,7 +128,7 @@
         <h2.version>1.3.170</h2.version>
         <xerces.version>2.11.0</xerces.version>
         <xml.api.version>2.11.0-20110622</xml.api.version>
-        <xalan.version>2.7.1</xalan.version>
+        <xalan.version>2.7.2</xalan.version>
         <pax.exam.version>3.5.0</pax.exam.version>
         <pax.url.version>1.3.7</pax.url.version>
         <postgresql.version>9.1-901</postgresql.version>
@@ -192,11 +193,6 @@
                <version>${xalan.version}</version>
            </dependency>
            <dependency>
-               <groupId>org.apache.ws.security</groupId>
-               <artifactId>wss4j</artifactId>
-               <version>${wss4j.version}</version>
-           </dependency>
-           <dependency>
                <groupId>org.ops4j.pax.url</groupId>
                <artifactId>pax-url-mvn</artifactId>
                <version>${pax.url.version}</version>


Mime
View raw message