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 2016/12/21 21:04:06 UTC
[1/3] camel git commit: Upgrade Spring
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x 053c34432 -> 6935b4f36
refs/heads/master a39f31336 -> 5f2b57777
Upgrade Spring
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e75ab7fb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e75ab7fb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e75ab7fb
Branch: refs/heads/master
Commit: e75ab7fbd9968caea371f48a276a972a2a76cd9e
Parents: a39f313
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 21 21:42:52 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 21 21:42:52 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e75ab7fb/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7bd86f6..c828168 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -575,9 +575,9 @@
<spring-version>${spring4-version}</spring-version>
<spring40-version>4.0.9.RELEASE</spring40-version>
<spring41-version>4.1.9.RELEASE</spring41-version>
- <spring42-version>4.2.8.RELEASE</spring42-version>
- <spring43-version>4.3.4.RELEASE</spring43-version>
- <spring4-version>4.3.4.RELEASE</spring4-version>
+ <spring42-version>4.2.9.RELEASE</spring42-version>
+ <spring43-version>4.3.5.RELEASE</spring43-version>
+ <spring4-version>4.3.5.RELEASE</spring4-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>4.1.3.RELEASE</spring-security-version>
<spring-security-bundle-version>4.1.3.RELEASE_1</spring-security-bundle-version>
[2/3] camel git commit: CAMEL-10636: Component options docs - Include
more details like endpoint options.
Posted by da...@apache.org.
CAMEL-10636: Component options docs - Include more details like endpoint options.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f2b5777
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f2b5777
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f2b5777
Branch: refs/heads/master
Commit: 5f2b57777f9ad829f1440dc3cf8757fb62981e80
Parents: e75ab7f
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 21 22:03:34 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 21 22:03:34 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/management/ManagedCamelContextTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5f2b5777/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index 786528f..00ffc66 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -390,9 +390,10 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
assertNotNull(json);
assertTrue(json.contains("\"label\": \"core,endpoint\""));
- assertTrue(json.contains("\"defaultQueueFactory\": { \"kind\": \"property\", \"type\": \"object\", \"javaType\":"
- + " \"org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange>\","));
- assertTrue(json.contains("\"queueSize\": { \"kind\": \"property\", \"type\": \"integer\", \"javaType\": \"int\", \"deprecated\": \"false\", \"secret\": \"false\", \"value\": \"0\""));
+ assertTrue(json.contains("\"defaultQueueFactory\": { \"kind\": \"property\", \"label\": \"advanced\", \"required\": \"false\","
+ + " \"type\": \"object\", \"javaType\": \"org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange>\","));
+ assertTrue(json.contains("\"queueSize\": { \"kind\": \"property\", \"label\": \"advanced\", \"required\": \"false\","
+ + " \"type\": \"integer\", \"javaType\": \"int\", \"deprecated\": \"false\", \"secret\": \"false\", \"value\": \"0\""));
}
@Override
[3/3] camel git commit: Upgrade Spring
Posted by da...@apache.org.
Upgrade Spring
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6935b4f3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6935b4f3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6935b4f3
Branch: refs/heads/camel-2.18.x
Commit: 6935b4f36178351726e854d3f9336e989c9a5184
Parents: 053c344
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 21 21:42:52 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 21 22:03:56 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6935b4f3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 51279af..461e7ea 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -565,9 +565,9 @@
<spring-version>${spring4-version}</spring-version>
<spring40-version>4.0.9.RELEASE</spring40-version>
<spring41-version>4.1.9.RELEASE</spring41-version>
- <spring42-version>4.2.8.RELEASE</spring42-version>
- <spring43-version>4.3.4.RELEASE</spring43-version>
- <spring4-version>4.3.4.RELEASE</spring4-version>
+ <spring42-version>4.2.9.RELEASE</spring42-version>
+ <spring43-version>4.3.5.RELEASE</spring43-version>
+ <spring4-version>4.3.5.RELEASE</spring4-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>4.0.4.RELEASE</spring-security-version>
<spring-security-bundle-version>4.0.4.RELEASE_1</spring-security-bundle-version>