You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2015/09/03 01:39:10 UTC

[1/2] camel git commit: upgrade to snmp4j 2.3.4_1

Repository: camel
Updated Branches:
  refs/heads/master a9bad7b1a -> 4f3ccee40


upgrade to snmp4j 2.3.4_1


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

Branch: refs/heads/master
Commit: b975c30b6700a33015233c4a24802ecaf084da4c
Parents: a9bad7b
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Sep 2 20:53:15 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Sep 2 20:53:15 2015 -0230

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


http://git-wip-us.apache.org/repos/asf/camel/blob/b975c30b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 579f696..2684b85 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -441,7 +441,7 @@
     <smack-version>4.0.7</smack-version>
     <snakeyaml-version>1.16</snakeyaml-version>
     <snappy-version>1.1.1.7</snappy-version>
-    <snmp4j-version>2.3.3_1</snmp4j-version>
+    <snmp4j-version>2.3.4_1</snmp4j-version>
     <solr-bundle-version>4.10.2_1</solr-bundle-version>
     <solr-version>4.10.2</solr-version>
     <solr-version-range>[4.10,5)</solr-version-range>


[2/2] camel git commit: Fix CS

Posted by ja...@apache.org.
Fix CS


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

Branch: refs/heads/master
Commit: 4f3ccee409c039647dbc4f0bdbcbbcdacded40ca
Parents: b975c30
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Sep 2 21:04:51 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Sep 2 21:04:51 2015 -0230

----------------------------------------------------------------------
 .../java/org/apache/camel/component/http4/HttpPathTest.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4f3ccee4/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java
index fe6f0f1..465854f 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java
@@ -84,8 +84,7 @@ public class HttpPathTest extends BaseHttpTest {
 
     @Test
     public void httpPathHeaderWithStaticQueryParams() throws Exception {
-        Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() +
-                "?abc=123", new Processor() {
+        Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "?abc=123", new Processor() {
             public void process(Exchange exchange) throws Exception {
                 exchange.getIn().setHeader(Exchange.HTTP_PATH, "testWithQueryParams");
             }
@@ -97,8 +96,7 @@ public class HttpPathTest extends BaseHttpTest {
 
     @Test
     public void httpPathHeaderWithBaseSlashesAndWithStaticQueryParams() throws Exception {
-        Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/" +
-                "?abc=123", new Processor() {
+        Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/" + "?abc=123", new Processor() {
             public void process(Exchange exchange) throws Exception {
                 exchange.getIn().setHeader(Exchange.HTTP_PATH, "/testWithQueryParams");
             }