You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/02/09 23:26:13 UTC
[1/5] git commit: CAMEL-7170: Upgrade to CXF 2.7.10
Updated Branches:
refs/heads/camel-2.12.x b0d4e53a0 -> 8c07c85d5
CAMEL-7170: Upgrade to CXF 2.7.10
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c07c85d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c07c85d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c07c85d
Branch: refs/heads/camel-2.12.x
Commit: 8c07c85d53277fa94124569f9753b241cac6d25d
Parents: 6129e96
Author: cmueller <cm...@apache.org>
Authored: Sun Feb 9 23:25:20 2014 +0100
Committer: cmueller <cm...@apache.org>
Committed: Sun Feb 9 23:26:03 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8c07c85d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 809ae8f..6de8cd3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -107,9 +107,9 @@
<commons-vfs2-version>2.0</commons-vfs2-version>
<concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
<cobertura-maven-plugin-version>2.5.2</cobertura-maven-plugin-version>
- <cxf-version>2.7.8</cxf-version>
+ <cxf-version>2.7.10</cxf-version>
<cxf-version-range>[2.6,2.9)</cxf-version-range>
- <cxf-xjc-utils-version>2.6.2</cxf-xjc-utils-version>
+ <cxf-xjc-utils-version>2.7.0</cxf-xjc-utils-version>
<deltaspike-version>0.3-incubating</deltaspike-version>
<derby-version>10.10.1.1</derby-version>
<disruptor-version>3.2.0</disruptor-version>
[3/5] git commit: fixed CS issue
Posted by cm...@apache.org.
fixed CS issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/959f7728
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/959f7728
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/959f7728
Branch: refs/heads/camel-2.12.x
Commit: 959f7728219e8796fa529da1c45b9f68d4d70966
Parents: b0d4e53
Author: cmueller <cm...@apache.org>
Authored: Sun Feb 9 22:29:12 2014 +0100
Committer: cmueller <cm...@apache.org>
Committed: Sun Feb 9 23:26:03 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/959f7728/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
index f46e670..1bebeec 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
@@ -30,10 +30,10 @@ import org.apache.camel.impl.DefaultConsumer;
public class RabbitMQConsumer extends DefaultConsumer {
- private int closeTimeout = 30 * 1000;
ExecutorService executor;
Connection conn;
Channel channel;
+ private int closeTimeout = 30 * 1000;
private final RabbitMQEndpoint endpoint;
[5/5] git commit: fixed CS issue
Posted by cm...@apache.org.
fixed CS issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd4dfe45
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd4dfe45
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd4dfe45
Branch: refs/heads/camel-2.12.x
Commit: fd4dfe45c5cf71d4e39a8c1d68dd71be654ddea6
Parents: 959f772
Author: cmueller <cm...@apache.org>
Authored: Sun Feb 9 22:32:33 2014 +0100
Committer: cmueller <cm...@apache.org>
Committed: Sun Feb 9 23:26:03 2014 +0100
----------------------------------------------------------------------
.../apache/camel/component/restlet/RestletPostFormTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fd4dfe45/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
index 41f05e6..174a266 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.restlet;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -29,9 +32,6 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.message.BasicNameValuePair;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-
/**
*
* @version
[2/5] git commit: fixed CS issue
Posted by cm...@apache.org.
fixed CS issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/109836fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/109836fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/109836fc
Branch: refs/heads/camel-2.12.x
Commit: 109836fc6470bf1a82b99ece99493d8848f91c9c
Parents: fd4dfe4
Author: cmueller <cm...@apache.org>
Authored: Sun Feb 9 22:55:15 2014 +0100
Committer: cmueller <cm...@apache.org>
Committed: Sun Feb 9 23:26:03 2014 +0100
----------------------------------------------------------------------
.../camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/109836fc/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
index c73ff41..75c20f8 100755
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
@@ -40,12 +40,11 @@ import javax.crypto.spec.DESedeKeySpec;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.transform.dom.DOMSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
@@ -62,7 +61,8 @@ import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.EncryptionConstants;
import org.apache.xml.security.utils.XMLUtils;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class XMLSecurityDataFormat implements DataFormat, CamelContextAware {
[4/5] git commit: fixed CS issue
Posted by cm...@apache.org.
fixed CS issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6129e961
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6129e961
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6129e961
Branch: refs/heads/camel-2.12.x
Commit: 6129e961d2af3d01bb6fb4fbfd1b0973cb68ded2
Parents: 109836f
Author: cmueller <cm...@apache.org>
Authored: Sun Feb 9 23:24:18 2014 +0100
Committer: cmueller <cm...@apache.org>
Committed: Sun Feb 9 23:26:03 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/maven/RunMojo.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6129e961/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 032459d..2e405cc 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -65,6 +65,8 @@ import org.codehaus.mojo.exec.Property;
*/
public class RunMojo extends AbstractExecMojo {
+ protected String extendedPluginDependencyArtifactId;
+
// this code is based on a copy-and-paste of maven-exec-plugin
//
// If we could avoid the mega-cut-n-paste it would really really help!
@@ -369,7 +371,6 @@ public class RunMojo extends AbstractExecMojo {
private Properties originalSystemProperties;
private String extraPluginDependencyArtifactId;
- protected String extendedPluginDependencyArtifactId;
/**
* Execute goal.