You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/04/02 13:51:38 UTC
[syncope] branch master updated: Upgrading Camel
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 87bb773 Upgrading Camel
87bb773 is described below
commit 87bb77322e8168ac965e31e6e9b45509151dcc41
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Apr 2 15:51:29 2019 +0200
Upgrading Camel
---
.../apache/syncope/core/provisioning/camel/SyncopeCamelContext.java | 4 +++-
pom.xml | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
index 740c4a0..5184074 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.camel.CamelContext;
import org.apache.camel.component.metrics.routepolicy.MetricsRoutePolicyFactory;
+import org.apache.camel.model.ModelHelper;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.commons.io.IOUtils;
@@ -68,7 +69,8 @@ public class SyncopeCamelContext {
private void loadRouteDefinitions(final List<String> routes) {
try {
- RoutesDefinition routeDefs = camelContext.loadRoutesDefinition(
+ RoutesDefinition routeDefs = ModelHelper.loadRoutesDefinition(
+ camelContext,
IOUtils.toInputStream("<routes xmlns=\"http://camel.apache.org/schema/spring\">"
+ StringUtils.join(routes)
+ "</routes>", StandardCharsets.UTF_8));
diff --git a/pom.xml b/pom.xml
index 8833bac..ab120a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -411,7 +411,7 @@ under the License.
<flowable.version>6.4.1</flowable.version>
- <camel.version>3.0.0-M1</camel.version>
+ <camel.version>3.0.0-M2</camel.version>
<slf4j.version>1.7.26</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
@@ -2454,8 +2454,8 @@ under the License.
<link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/</link>
<link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.9.pr1/</link>
<link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.9/</link>
- <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/3.0.0-M1/</link>
- <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/3.0.0-M1/</link>
+ <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/3.0.0-M2/</link>
+ <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/3.0.0-M2/</link>
<link>https://ci.apache.org/projects/wicket/apidocs/8.x/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
<link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>