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 2019/10/27 14:42:44 UTC
[camel] branch springboot22 created (now a06ef29)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch springboot22
in repository https://gitbox.apache.org/repos/asf/camel.git.
at a06ef29 CAMEL-14075: Upgrade to Spring Boot 2.2.0. Work in progress.
This branch includes the following new commits:
new a06ef29 CAMEL-14075: Upgrade to Spring Boot 2.2.0. Work in progress.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: CAMEL-14075: Upgrade to Spring Boot 2.2.0. Work in
progress.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch springboot22
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a06ef2989ccec66debe70a7a3ad2e73b56094c3f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Oct 27 15:42:15 2019 +0100
CAMEL-14075: Upgrade to Spring Boot 2.2.0. Work in progress.
---
.../org/apache/camel/component/ehcache/EhcacheManager.java | 4 ++--
components/camel-spring-integration/pom.xml | 4 ++--
parent/pom.xml | 14 +++++++-------
platforms/karaf/features/src/main/resources/features.xml | 1 +
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheManager.java b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheManager.java
index bcbe578..fc9fdef 100644
--- a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheManager.java
+++ b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheManager.java
@@ -92,8 +92,8 @@ public class EhcacheManager implements Service {
.withClassLoader(cacheConfiguration.getClassLoader())
.withEvictionAdvisor(cacheConfiguration.getEvictionAdvisor())
.withExpiry(cacheConfiguration.getExpiryPolicy());
- for (ServiceConfiguration<?> serviceConfig : cacheConfiguration.getServiceConfigurations()) {
- builder = builder.add(serviceConfig);
+ for (ServiceConfiguration<?, ?> serviceConfig : cacheConfiguration.getServiceConfigurations()) {
+ builder = builder.withService(serviceConfig);
}
cacheConfiguration = builder.build();
}
diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml
index e8ebb83..e0864d9 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -34,8 +34,8 @@
<properties>
<camel.osgi.import.before.defaults>
- org.springframework.integration.*;version="[4.2,5)",
- org.springframework.messaging.*;version="[4.2,5)"
+ org.springframework.integration.*;version="[5,6)",
+ org.springframework.messaging.*;version="[5,6)"
</camel.osgi.import.before.defaults>
</properties>
diff --git a/parent/pom.xml b/parent/pom.xml
index faee896..1de2794 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -177,7 +177,7 @@
<egit-github-core-version>2.1.5</egit-github-core-version>
<egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version>
<ehcache-version>2.10.6</ehcache-version>
- <ehcache3-version>3.7.0</ehcache3-version>
+ <ehcache3-version>3.8.1</ehcache3-version>
<ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
<elasticsearch-rest-sniffer-version>7.3.2</elasticsearch-rest-sniffer-version>
<elasticsearch-rest-cluster-runner-version>7.3.2.0</elasticsearch-rest-cluster-runner-version>
@@ -247,7 +247,7 @@
<grpc-netty-tcnative-boringssl-static-version>2.0.26.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-bundle-version>1.23.0_1</grpc-bundle-version>
<grpc-errorprone-version>2.3.2</grpc-errorprone-version>
- <gson-version>2.8.5</gson-version>
+ <gson-version>2.8.6</gson-version>
<guice3-version>3.0</guice3-version>
<guice-bundle-version>3.0_1</guice-bundle-version>
<hadoop-bundle-version>1.2.1_1</hadoop-bundle-version>
@@ -369,7 +369,7 @@
<jolt-version>0.1.1</jolt-version>
<jolt-bundle-version>0.1.1_1</jolt-bundle-version>
<jool-version>0.9.12</jool-version>
- <jooq-version>3.11.12</jooq-version>
+ <jooq-version>3.12.1</jooq-version>
<johnzon-version>1.2.1</johnzon-version>
<jose4j-version>0.6.4</jose4j-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
@@ -529,12 +529,12 @@
<qpid-broker-version>7.1.5</qpid-broker-version>
<qpid-proton-j-version>0.33.2</qpid-proton-j-version>
<qpid-jms-client-version>0.46.0</qpid-jms-client-version>
- <quartz-version>2.3.1</quartz-version>
+ <quartz-version>2.3.2</quartz-version>
<quickfixj-version>2.1.1</quickfixj-version>
<rabbitmq-amqp-client-version>5.7.3</rabbitmq-amqp-client-version>
<rdf4j-rio-version>2.4.4</rdf4j-rio-version>
<rdf4j-model-version>2.4.4</rdf4j-model-version>
- <reactive-streams-version>1.0.2</reactive-streams-version>
+ <reactive-streams-version>1.0.3</reactive-streams-version>
<reactor-version>3.2.12.RELEASE</reactor-version>
<reflections-bundle-version>0.9.11_1</reflections-bundle-version>
<regexp-bundle-version>1.4_1</regexp-bundle-version>
@@ -584,7 +584,7 @@
<splunk-version>1.6.5.0_1</splunk-version>
<spring-batch-version>4.1.2.RELEASE</spring-batch-version>
<spring-batch-bundle-version>4.1.2.RELEASE_1</spring-batch-bundle-version>
- <spring-boot-version>2.1.9.RELEASE</spring-boot-version>
+ <spring-boot-version>2.2.0.RELEASE</spring-boot-version>
<spring-cloud-commons-version>2.0.2.RELEASE</spring-cloud-commons-version>
<spring-cloud-consul-version>2.1.1.RELEASE</spring-cloud-consul-version>
<spring-cloud-netflix-version>2.0.2.RELEASE</spring-cloud-netflix-version>
@@ -598,7 +598,7 @@
<spring-ldap-bundle-version>2.3.2.RELEASE_1</spring-ldap-bundle-version>
<spring-version-range>[5,6)</spring-version-range>
<spring-version>${spring5-version}</spring-version>
- <spring5-version>5.1.10.RELEASE</spring5-version>
+ <spring5-version>5.2.0.RELEASE</spring5-version>
<spring-security-version>5.1.6.RELEASE</spring-security-version>
<spring-security-bundle-version>5.1.6.RELEASE_1</spring-security-bundle-version>
<spring-ws-version>3.0.7.RELEASE</spring-ws-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 3bf8747..979d917 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -898,6 +898,7 @@
<bundle>mvn:org.apache.camel/camel-debezium/${project.version}</bundle>
</feature>
<feature name='camel-ehcache' version='${project.version}' start-level='50'>
+ <feature>scr</feature>
<feature version="${project.version}">camel-core</feature>
<bundle dependency="true">mvn:org.ehcache/ehcache/${ehcache3-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ehcache/${project.version}</bundle>