You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/09/22 19:00:27 UTC

[1/3] camel git commit: Fix that will be required when updating to CXF 3.2.0

Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 1e68bf73c -> cddb41191


Fix that will be required when updating to CXF 3.2.0


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/25fbb790
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/25fbb790
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/25fbb790

Branch: refs/heads/camel-2.19.x
Commit: 25fbb790ea4ea9f24bdad4aea35d1f22be0bdd30
Parents: 1e68bf7
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Sep 11 16:18:15 2017 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 22 20:39:27 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/25fbb790/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index ecb16ae..015918a 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -46,6 +46,7 @@ import org.apache.camel.util.jsse.SSLContextParameters;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.feature.Feature;
 import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
@@ -290,7 +291,7 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
      */
     private void processUserResources(JAXRSServerFactoryBean sfb, List<UserResource> resources) {
         for (UserResource resource : resources) {
-            if (resource.getName() == null) {
+            if (StringUtils.isEmpty(resource.getName())) {
                 resource.setName(DefaultModelResource.class.getName());
             }
         }


[3/3] camel git commit: Upgrade CXF

Posted by da...@apache.org.
Upgrade CXF


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

Branch: refs/heads/camel-2.19.x
Commit: cddb411911ced52533d3799e6c6ef9d5877c9f42
Parents: 23e52e0
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Sep 22 21:00:15 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 22 21:00:15 2017 +0200

----------------------------------------------------------------------
 .../camel-spring-boot-dependencies/pom.xml      | 38 ++++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cddb4119/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 3b07442..ed3b9e2 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2815,97 +2815,97 @@
       <dependency>
         <groupId>org.apache.cxf.services.sts</groupId>
         <artifactId>cxf-services-sts-core</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf.services.ws-discovery</groupId>
         <artifactId>cxf-services-ws-discovery-api</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-jms</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-local</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-mex</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-rm</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-wsdl</artifactId>
-        <version>3.1.11</version>
+        <version>3.1.13</version>
       </dependency>
       <dependency>
         <groupId>org.apache.ftpserver</groupId>


[2/3] camel git commit: Upgrade CXF

Posted by da...@apache.org.
Upgrade CXF


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23e52e07
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23e52e07
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23e52e07

Branch: refs/heads/camel-2.19.x
Commit: 23e52e0777b3be51a2ca134a24ee5efaafeb132c
Parents: 25fbb79
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Sep 22 20:41:02 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 22 20:41:02 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/23e52e07/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f858039..e7a9762 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
     <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
     <couchbase-client-version>1.4.12</couchbase-client-version>
     <curator-version>2.11.1</curator-version>
-    <cxf-version>3.1.11</cxf-version>
+    <cxf-version>3.1.13</cxf-version>
     <cxf-version-range>[3.0,4.0)</cxf-version-range>
     <cxf-xjc-plugin-version>3.0.5</cxf-xjc-plugin-version>
     <cxf-xjc-utils-version>3.0.5</cxf-xjc-utils-version>