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/07/27 14:17:19 UTC
[1/4] camel git commit: CAMEL-11610: Fixed a bug introduced with
recent rest-dsl fix for spring boot that caused rest-dsl being initialized
while camel context is initializing so spring boot gives us null values.
Repository: camel
Updated Branches:
refs/heads/camel-2.19.x b80470685 -> e366cb832
refs/heads/master e7bfaf212 -> d150d056a
CAMEL-11610: Fixed a bug introduced with recent rest-dsl fix for spring boot that caused rest-dsl being initialized while camel context is initializing so spring boot gives us null values.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b318380c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b318380c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b318380c
Branch: refs/heads/master
Commit: b318380c0d0bde24ca66597910b868f8877c8832
Parents: e7bfaf2
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 27 16:10:28 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 27 16:10:28 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/spring/boot/CamelAutoConfiguration.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b318380c/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 7363704..330b8d2 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -448,12 +448,6 @@ public class CamelAutoConfiguration {
camelContext.setRouteController(routeController);
}
- // rest-dsl global configuration
- RestConfiguration restConfiguration = getSingleBeanOfType(applicationContext, RestConfiguration.class);
- if (restConfiguration != null) {
- camelContext.setRestConfiguration(restConfiguration);
- }
-
// set the default thread pool profile if defined
initThreadPoolProfiles(applicationContext, camelContext);
}
[3/4] camel git commit: CAMEL-11610: Fixed a bug introduced with
recent rest-dsl fix for spring boot that caused rest-dsl being initialized
while camel context is initializing so spring boot gives us null values.
Posted by da...@apache.org.
CAMEL-11610: Fixed a bug introduced with recent rest-dsl fix for spring boot that caused rest-dsl being initialized while camel context is initializing so spring boot gives us null values.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/acc19d20
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/acc19d20
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/acc19d20
Branch: refs/heads/camel-2.19.x
Commit: acc19d2054c79fbe1661b411bd24bfe58c09728d
Parents: b804706
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 27 16:10:28 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 27 16:16:29 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/spring/boot/CamelAutoConfiguration.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/acc19d20/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 8eac55d..96e0d52 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -410,12 +410,6 @@ public class CamelAutoConfiguration {
camelContext.setSSLContextParameters(sslContextParametersSupplier.get());
}
- // rest-dsl global configuration
- RestConfiguration restConfiguration = getSingleBeanOfType(applicationContext, RestConfiguration.class);
- if (restConfiguration != null) {
- camelContext.setRestConfiguration(restConfiguration);
- }
-
// set the default thread pool profile if defined
initThreadPoolProfiles(applicationContext, camelContext);
}
[2/4] camel git commit: Upgrade Spring Boot
Posted by da...@apache.org.
Upgrade Spring Boot
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d150d056
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d150d056
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d150d056
Branch: refs/heads/master
Commit: d150d056aaeadb69747d4b5df6a6ab691cb11eb6
Parents: b318380
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 27 16:11:02 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 27 16:11:02 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d150d056/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0c0239b..774d573 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -607,7 +607,7 @@
<splunk-version>1.6.3.0_1</splunk-version>
<spring-batch-version>3.0.8.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>
- <spring-boot-version>1.5.5.RELEASE</spring-boot-version>
+ <spring-boot-version>1.5.6.RELEASE</spring-boot-version>
<spring-cloud-commons-version>1.2.3.RELEASE</spring-cloud-commons-version>
<spring-cloud-netflix-version>1.3.2.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
[4/4] camel git commit: Upgrade Spring Boot
Posted by da...@apache.org.
Upgrade Spring Boot
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e366cb83
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e366cb83
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e366cb83
Branch: refs/heads/camel-2.19.x
Commit: e366cb8322ebca379a3e79317d077fcb5cee11c0
Parents: acc19d2
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 27 16:17:07 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 27 16:17:07 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e366cb83/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 289f7a8..6714d0d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -587,7 +587,7 @@
<splunk-version>1.5.0.0_1</splunk-version>
<spring-batch-version>3.0.7.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>
- <spring-boot-version>1.5.5.RELEASE</spring-boot-version>
+ <spring-boot-version>1.5.6.RELEASE</spring-boot-version>
<spring-cloud-commons-version>1.2.0.RELEASE</spring-cloud-commons-version>
<spring-cloud-netflix-version>1.3.0.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>