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 2021/06/07 15:45:36 UTC
[syncope] branch master updated: Revert commons-jexl3 to previous
version + moving to camel-spring-boot-starter
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 d9f7f96 Revert commons-jexl3 to previous version + moving to camel-spring-boot-starter
d9f7f96 is described below
commit d9f7f96a602e1d7b3e1e13523e332b6e256167fb
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Jun 7 17:45:19 2021 +0200
Revert commons-jexl3 to previous version + moving to camel-spring-boot-starter
---
ext/camel/provisioning-camel/pom.xml | 12 +----
.../camel/ProvisioningCamelContext.java | 10 +---
pom.xml | 53 ++++------------------
3 files changed, 13 insertions(+), 62 deletions(-)
diff --git a/ext/camel/provisioning-camel/pom.xml b/ext/camel/provisioning-camel/pom.xml
index 68ea7c0..600874b 100644
--- a/ext/camel/provisioning-camel/pom.xml
+++ b/ext/camel/provisioning-camel/pom.xml
@@ -39,16 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-javaconfig</artifactId>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/ProvisioningCamelContext.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/ProvisioningCamelContext.java
index ae463a3..3f5b12b 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/ProvisioningCamelContext.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/ProvisioningCamelContext.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.core.provisioning.camel;
-import org.apache.camel.CamelContext;
-import org.apache.camel.spring.javaconfig.CamelConfiguration;
import org.apache.syncope.core.spring.ResourceWithFallbackLoader;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -28,17 +26,11 @@ import org.springframework.context.annotation.Configuration;
@ComponentScan("org.apache.syncope.core.provisioning.camel")
@Configuration
-public class ProvisioningCamelContext extends CamelConfiguration {
+public class ProvisioningCamelContext {
@Value("${camel.directory}")
private String camelDirectory;
- @Override
- protected void setupCamelContext(final CamelContext camelContext) throws Exception {
- camelContext.setStreamCaching(false);
- camelContext.setAllowUseOriginalMessage(false);
- }
-
@Bean
public ResourceWithFallbackLoader userRoutes() {
ResourceWithFallbackLoader routes = new ResourceWithFallbackLoader();
diff --git a/pom.xml b/pom.xml
index 2b44260..8f659f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -439,7 +439,7 @@ under the License.
<log4j.version>2.14.1</log4j.version>
<disruptor.version>3.4.4</disruptor.version>
- <commons-jexl.version>3.2</commons-jexl.version>
+ <commons-jexl.version>3.1</commons-jexl.version>
<commons-lang.version>3.12.0</commons-lang.version>
<commons-text.version>1.9</commons-text.version>
<commons-codec.version>1.15</commons-codec.version>
@@ -640,49 +640,9 @@ under the License.
<!-- Camel -->
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
<version>${camel.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${camel.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-javaconfig</artifactId>
- <version>${camel.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2033,6 +1993,13 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>