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/08/15 08:28:58 UTC
[41/74] [abbrv] camel git commit: CAMEL-10222: Fixed factories and
logging dependencies
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-mustache-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-mustache-starter/pom.xml b/components-starter/camel-mustache-starter/pom.xml
index 77b3f34..ffaaf04 100644
--- a/components-starter/camel-mustache-starter/pom.xml
+++ b/components-starter/camel-mustache-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mustache</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-mvel-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-mvel-starter/pom.xml b/components-starter/camel-mvel-starter/pom.xml
index 5d7983f..902402f 100644
--- a/components-starter/camel-mvel-starter/pom.xml
+++ b/components-starter/camel-mvel-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mvel</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-mybatis-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-mybatis-starter/pom.xml b/components-starter/camel-mybatis-starter/pom.xml
index 1dcebbd..591171d 100644
--- a/components-starter/camel-mybatis-starter/pom.xml
+++ b/components-starter/camel-mybatis-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mybatis</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-nagios-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-nagios-starter/pom.xml b/components-starter/camel-nagios-starter/pom.xml
index db156c2..675b938 100644
--- a/components-starter/camel-nagios-starter/pom.xml
+++ b/components-starter/camel-nagios-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-nagios</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-nats-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-nats-starter/pom.xml b/components-starter/camel-nats-starter/pom.xml
index 9e47351..2ce00d0 100644
--- a/components-starter/camel-nats-starter/pom.xml
+++ b/components-starter/camel-nats-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-nats</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-netty-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-netty-starter/pom.xml b/components-starter/camel-netty-starter/pom.xml
index 85c60d6..0b63426 100644
--- a/components-starter/camel-netty-starter/pom.xml
+++ b/components-starter/camel-netty-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-netty4-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-netty4-starter/pom.xml b/components-starter/camel-netty4-starter/pom.xml
index 798c729..eb3e8ec 100644
--- a/components-starter/camel-netty4-starter/pom.xml
+++ b/components-starter/camel-netty4-starter/pom.xml
@@ -40,12 +40,11 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty4</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator-version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-ognl-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-ognl-starter/pom.xml b/components-starter/camel-ognl-starter/pom.xml
index b4acd94..586c1f0 100644
--- a/components-starter/camel-ognl-starter/pom.xml
+++ b/components-starter/camel-ognl-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ognl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-openshift-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-openshift-starter/pom.xml b/components-starter/camel-openshift-starter/pom.xml
index 6ea08cf..ddb59ed 100644
--- a/components-starter/camel-openshift-starter/pom.xml
+++ b/components-starter/camel-openshift-starter/pom.xml
@@ -42,13 +42,13 @@
<artifactId>camel-openshift</artifactId>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-optaplanner-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-optaplanner-starter/pom.xml b/components-starter/camel-optaplanner-starter/pom.xml
index 36f552b..8143c94 100644
--- a/components-starter/camel-optaplanner-starter/pom.xml
+++ b/components-starter/camel-optaplanner-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-optaplanner</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-paho-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-paho-starter/pom.xml b/components-starter/camel-paho-starter/pom.xml
index eadb2ca..15a298a 100644
--- a/components-starter/camel-paho-starter/pom.xml
+++ b/components-starter/camel-paho-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-paho</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-pgevent-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-pgevent-starter/pom.xml b/components-starter/camel-pgevent-starter/pom.xml
index 909ed24..e8aaf0b 100644
--- a/components-starter/camel-pgevent-starter/pom.xml
+++ b/components-starter/camel-pgevent-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-pgevent</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-printer-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-printer-starter/pom.xml b/components-starter/camel-printer-starter/pom.xml
index 5efe43d..b0935ee 100644
--- a/components-starter/camel-printer-starter/pom.xml
+++ b/components-starter/camel-printer-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-printer</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-protobuf-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-protobuf-starter/pom.xml b/components-starter/camel-protobuf-starter/pom.xml
index 1b9cd73..de9ebc1 100644
--- a/components-starter/camel-protobuf-starter/pom.xml
+++ b/components-starter/camel-protobuf-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-quickfix-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-quickfix-starter/pom.xml b/components-starter/camel-quickfix-starter/pom.xml
index 92868b2..cbc8395 100644
--- a/components-starter/camel-quickfix-starter/pom.xml
+++ b/components-starter/camel-quickfix-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-quickfix</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-rabbitmq-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-rabbitmq-starter/pom.xml b/components-starter/camel-rabbitmq-starter/pom.xml
index 3fd3d60..a0d21ba 100644
--- a/components-starter/camel-rabbitmq-starter/pom.xml
+++ b/components-starter/camel-rabbitmq-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-rabbitmq</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-restlet-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-restlet-starter/pom.xml b/components-starter/camel-restlet-starter/pom.xml
index 1480e9f..104329c 100644
--- a/components-starter/camel-restlet-starter/pom.xml
+++ b/components-starter/camel-restlet-starter/pom.xml
@@ -47,6 +47,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator-version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-rmi-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-rmi-starter/pom.xml b/components-starter/camel-rmi-starter/pom.xml
index 6bb4609..7a1cbd7 100644
--- a/components-starter/camel-rmi-starter/pom.xml
+++ b/components-starter/camel-rmi-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-rmi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-routebox-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-routebox-starter/pom.xml b/components-starter/camel-routebox-starter/pom.xml
index 71c43c6..14685d2 100644
--- a/components-starter/camel-routebox-starter/pom.xml
+++ b/components-starter/camel-routebox-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-routebox</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-ruby-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-ruby-starter/pom.xml b/components-starter/camel-ruby-starter/pom.xml
index 3175ab8..a4ee632 100644
--- a/components-starter/camel-ruby-starter/pom.xml
+++ b/components-starter/camel-ruby-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ruby</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-salesforce-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-salesforce-starter/pom.xml b/components-starter/camel-salesforce-starter/pom.xml
index 48cd06f..88ab33e 100644
--- a/components-starter/camel-salesforce-starter/pom.xml
+++ b/components-starter/camel-salesforce-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-saxon-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-saxon-starter/pom.xml b/components-starter/camel-saxon-starter/pom.xml
index bf2dc6a..06ad00c 100644
--- a/components-starter/camel-saxon-starter/pom.xml
+++ b/components-starter/camel-saxon-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-saxon</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-saxon-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components-starter/camel-saxon-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-saxon-starter/src/main/resources/META-INF/spring.factories
index 1490947..5d1fe52 100644
--- a/components-starter/camel-saxon-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-saxon-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.language.xquery.springboot.XQueryLanguageAutoConfiguration
+org.apache.camel.language.xquery.springboot.XQueryLanguageAutoConfiguration,\
+org.apache.camel.component.xquery.springboot.XQueryComponentAutoConfiguration
+
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-scala-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-scala-starter/pom.xml b/components-starter/camel-scala-starter/pom.xml
index 10a3f35..18fcaf8 100644
--- a/components-starter/camel-scala-starter/pom.xml
+++ b/components-starter/camel-scala-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-scala</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-schematron-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-schematron-starter/pom.xml b/components-starter/camel-schematron-starter/pom.xml
index 7f4be0f..39e6037 100644
--- a/components-starter/camel-schematron-starter/pom.xml
+++ b/components-starter/camel-schematron-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-schematron</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-scr-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-scr-starter/pom.xml b/components-starter/camel-scr-starter/pom.xml
index 46738e4..6a46b9c 100644
--- a/components-starter/camel-scr-starter/pom.xml
+++ b/components-starter/camel-scr-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-scr</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-script-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-script-starter/pom.xml b/components-starter/camel-script-starter/pom.xml
index 66ebc3a..0f22413 100644
--- a/components-starter/camel-script-starter/pom.xml
+++ b/components-starter/camel-script-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-script</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-script-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components-starter/camel-script-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-script-starter/src/main/resources/META-INF/spring.factories
index 108c332..12982c5 100644
--- a/components-starter/camel-script-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-script-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,10 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.builder.script.springboot.RubyLanguageAutoConfiguration
+org.apache.camel.builder.script.springboot.RubyLanguageAutoConfiguration,\
+org.apache.camel.builder.script.springboot.JavaScriptLanguageAutoConfiguration,\
+org.apache.camel.builder.script.springboot.PhpLanguageAutoConfiguration,\
+org.apache.camel.builder.script.springboot.PythonLanguageAutoConfiguration
+
+
+
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-servicenow-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-servicenow-starter/pom.xml b/components-starter/camel-servicenow-starter/pom.xml
index 1e841d8..f6413c6 100644
--- a/components-starter/camel-servicenow-starter/pom.xml
+++ b/components-starter/camel-servicenow-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servicenow</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-servletlistener-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-servletlistener-starter/pom.xml b/components-starter/camel-servletlistener-starter/pom.xml
index 3cb3117..6350791 100644
--- a/components-starter/camel-servletlistener-starter/pom.xml
+++ b/components-starter/camel-servletlistener-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servletlistener</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-shiro-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-shiro-starter/pom.xml b/components-starter/camel-shiro-starter/pom.xml
index 182877e..38daa62 100644
--- a/components-starter/camel-shiro-starter/pom.xml
+++ b/components-starter/camel-shiro-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-shiro</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-sip-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-sip-starter/pom.xml b/components-starter/camel-sip-starter/pom.xml
index b4fd674..7b720e1 100644
--- a/components-starter/camel-sip-starter/pom.xml
+++ b/components-starter/camel-sip-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-sip</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-sjms-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-sjms-starter/pom.xml b/components-starter/camel-sjms-starter/pom.xml
index dcb14c6..82a622e 100644
--- a/components-starter/camel-sjms-starter/pom.xml
+++ b/components-starter/camel-sjms-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-sjms</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-sjms-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components-starter/camel-sjms-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-sjms-starter/src/main/resources/META-INF/spring.factories
index c9fc595..7fe9139 100644
--- a/components-starter/camel-sjms-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-sjms-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.sjms.springboot.SjmsComponentAutoConfiguration
+org.apache.camel.component.sjms.springboot.SjmsComponentAutoConfiguration,\
+org.apache.camel.component.sjms.batch.springboot.SjmsBatchComponentAutoConfiguration
+
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-snakeyaml-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-snakeyaml-starter/pom.xml b/components-starter/camel-snakeyaml-starter/pom.xml
index 0dffca6..e62bc1c 100644
--- a/components-starter/camel-snakeyaml-starter/pom.xml
+++ b/components-starter/camel-snakeyaml-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-snakeyaml</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-snmp-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-snmp-starter/pom.xml b/components-starter/camel-snmp-starter/pom.xml
index 7b70ca3..7c1a7ea 100644
--- a/components-starter/camel-snmp-starter/pom.xml
+++ b/components-starter/camel-snmp-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-snmp</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-spark-rest-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-spark-rest-starter/pom.xml b/components-starter/camel-spark-rest-starter/pom.xml
index 846ee7b..5e5bb92 100644
--- a/components-starter/camel-spark-rest-starter/pom.xml
+++ b/components-starter/camel-spark-rest-starter/pom.xml
@@ -41,6 +41,11 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spark-rest</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator-version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-spark-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-spark-starter/pom.xml b/components-starter/camel-spark-starter/pom.xml
index 6c6a13f..3468068 100644
--- a/components-starter/camel-spark-starter/pom.xml
+++ b/components-starter/camel-spark-starter/pom.xml
@@ -53,6 +53,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-splunk-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-splunk-starter/pom.xml b/components-starter/camel-splunk-starter/pom.xml
index 08b3d9a..b8c0295 100644
--- a/components-starter/camel-splunk-starter/pom.xml
+++ b/components-starter/camel-splunk-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-splunk</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-spring-dm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-spring-dm-starter/pom.xml b/components-starter/camel-spring-dm-starter/pom.xml
index 645c686..99110e8 100644
--- a/components-starter/camel-spring-dm-starter/pom.xml
+++ b/components-starter/camel-spring-dm-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-dm</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-spring-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components-starter/camel-spring-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-spring-starter/src/main/resources/META-INF/spring.factories
index 5ffc2db..f9549f3 100644
--- a/components-starter/camel-spring-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-spring-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.language.spel.springboot.SpelLanguageAutoConfiguration
+org.apache.camel.language.spel.springboot.SpelLanguageAutoConfiguration,\
+org.apache.camel.component.event.springboot.EventComponentAutoConfiguration
+
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-spring-ws-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-spring-ws-starter/pom.xml b/components-starter/camel-spring-ws-starter/pom.xml
index 948e544..ab91af5 100644
--- a/components-starter/camel-spring-ws-starter/pom.xml
+++ b/components-starter/camel-spring-ws-starter/pom.xml
@@ -47,6 +47,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring-boot-version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-sql-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components-starter/camel-sql-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-sql-starter/src/main/resources/META-INF/spring.factories
index c3510e5..1412326 100644
--- a/components-starter/camel-sql-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-sql-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.sql.springboot.SqlComponentAutoConfiguration
+org.apache.camel.component.sql.springboot.SqlComponentAutoConfiguration,\
+org.apache.camel.component.sql.stored.springboot.SqlStoredComponentAutoConfiguration
+
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-ssh-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-ssh-starter/pom.xml b/components-starter/camel-ssh-starter/pom.xml
index 8be09e5..ee5c589 100644
--- a/components-starter/camel-ssh-starter/pom.xml
+++ b/components-starter/camel-ssh-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ssh</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-stax-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-stax-starter/pom.xml b/components-starter/camel-stax-starter/pom.xml
index 0696615..6d259cb 100644
--- a/components-starter/camel-stax-starter/pom.xml
+++ b/components-starter/camel-stax-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stax</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-stomp-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-stomp-starter/pom.xml b/components-starter/camel-stomp-starter/pom.xml
index 6fc63eb..217f400 100644
--- a/components-starter/camel-stomp-starter/pom.xml
+++ b/components-starter/camel-stomp-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stomp</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-stream-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-stream-starter/pom.xml b/components-starter/camel-stream-starter/pom.xml
index be0cc14..a769965 100644
--- a/components-starter/camel-stream-starter/pom.xml
+++ b/components-starter/camel-stream-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stream</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-stringtemplate-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-stringtemplate-starter/pom.xml b/components-starter/camel-stringtemplate-starter/pom.xml
index fc543df..c813aa9 100644
--- a/components-starter/camel-stringtemplate-starter/pom.xml
+++ b/components-starter/camel-stringtemplate-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stringtemplate</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-swagger-java-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-swagger-java-starter/pom.xml b/components-starter/camel-swagger-java-starter/pom.xml
index ac422be..972edf6 100644
--- a/components-starter/camel-swagger-java-starter/pom.xml
+++ b/components-starter/camel-swagger-java-starter/pom.xml
@@ -40,12 +40,11 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-swagger-java</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator-version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-tagsoup-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-tagsoup-starter/pom.xml b/components-starter/camel-tagsoup-starter/pom.xml
index b42ba83..18367b8 100644
--- a/components-starter/camel-tagsoup-starter/pom.xml
+++ b/components-starter/camel-tagsoup-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tagsoup</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-telegram-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-telegram-starter/pom.xml b/components-starter/camel-telegram-starter/pom.xml
index e180c71..667e236 100644
--- a/components-starter/camel-telegram-starter/pom.xml
+++ b/components-starter/camel-telegram-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-telegram</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-test-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-test-starter/pom.xml b/components-starter/camel-test-starter/pom.xml
index 9af332c..6c149df 100644
--- a/components-starter/camel-test-starter/pom.xml
+++ b/components-starter/camel-test-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-twitter-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-twitter-starter/pom.xml b/components-starter/camel-twitter-starter/pom.xml
index c64de50..c57a6f4 100644
--- a/components-starter/camel-twitter-starter/pom.xml
+++ b/components-starter/camel-twitter-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-twitter</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-undertow-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-undertow-starter/pom.xml b/components-starter/camel-undertow-starter/pom.xml
index d6a0d9c..13e1f9b 100644
--- a/components-starter/camel-undertow-starter/pom.xml
+++ b/components-starter/camel-undertow-starter/pom.xml
@@ -41,6 +41,11 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-undertow</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator-version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-univocity-parsers-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components-starter/camel-univocity-parsers-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-univocity-parsers-starter/src/main/resources/META-INF/spring.factories
index 3baf4ce..8428050 100644
--- a/components-starter/camel-univocity-parsers-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-univocity-parsers-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,8 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.dataformat.univocity.springboot.UniVocityTsvDataFormatAutoConfiguration
+org.apache.camel.dataformat.univocity.springboot.UniVocityTsvDataFormatAutoConfiguration,\
+org.apache.camel.dataformat.univocity.springboot.UniVocityCsvDataFormatAutoConfiguration,\
+org.apache.camel.dataformat.univocity.springboot.UniVocityFixedWidthDataFormatAutoConfiguration
+
+
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-vertx-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-vertx-starter/pom.xml b/components-starter/camel-vertx-starter/pom.xml
index a2a0cd9..baded5d 100644
--- a/components-starter/camel-vertx-starter/pom.xml
+++ b/components-starter/camel-vertx-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-vertx</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-websocket-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-websocket-starter/pom.xml b/components-starter/camel-websocket-starter/pom.xml
index f7070b9..8eb6c9e 100644
--- a/components-starter/camel-websocket-starter/pom.xml
+++ b/components-starter/camel-websocket-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-websocket</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-xmlbeans-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-xmlbeans-starter/pom.xml b/components-starter/camel-xmlbeans-starter/pom.xml
index cb2e8b8..f8fefd2 100644
--- a/components-starter/camel-xmlbeans-starter/pom.xml
+++ b/components-starter/camel-xmlbeans-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xmlbeans</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-xmlrpc-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-xmlrpc-starter/pom.xml b/components-starter/camel-xmlrpc-starter/pom.xml
index 2632b1e..8b9eb8f 100644
--- a/components-starter/camel-xmlrpc-starter/pom.xml
+++ b/components-starter/camel-xmlrpc-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xmlrpc</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-xmlsecurity-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components-starter/camel-xmlsecurity-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-xmlsecurity-starter/src/main/resources/META-INF/spring.factories
index 866c301..a1cc61f 100644
--- a/components-starter/camel-xmlsecurity-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-xmlsecurity-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.dataformat.xmlsecurity.springboot.XMLSecurityDataFormatAutoConfiguration
+org.apache.camel.dataformat.xmlsecurity.springboot.XMLSecurityDataFormatAutoConfiguration,\
+org.apache.camel.component.xmlsecurity.springboot.XmlSignatureComponentAutoConfiguration
+
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-xmpp-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-xmpp-starter/pom.xml b/components-starter/camel-xmpp-starter/pom.xml
index d8ed756..8650e5d 100644
--- a/components-starter/camel-xmpp-starter/pom.xml
+++ b/components-starter/camel-xmpp-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xmpp</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-xstream-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components-starter/camel-xstream-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-xstream-starter/src/main/resources/META-INF/spring.factories
index 5b9b7b8..d8c183a 100644
--- a/components-starter/camel-xstream-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-xstream-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.dataformat.xstream.springboot.JsonDataFormatAutoConfiguration
+org.apache.camel.dataformat.xstream.springboot.JsonDataFormatAutoConfiguration,\
+org.apache.camel.dataformat.xstream.springboot.XStreamDataFormatAutoConfiguration
+
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-yammer-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-yammer-starter/pom.xml b/components-starter/camel-yammer-starter/pom.xml
index 442fb1c..a1ebf9b 100644
--- a/components-starter/camel-yammer-starter/pom.xml
+++ b/components-starter/camel-yammer-starter/pom.xml
@@ -40,12 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yammer</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/components-starter/camel-zookeeper-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-zookeeper-starter/pom.xml b/components-starter/camel-zookeeper-starter/pom.xml
index 46d2d74..84814bd 100644
--- a/components-starter/camel-zookeeper-starter/pom.xml
+++ b/components-starter/camel-zookeeper-starter/pom.xml
@@ -42,13 +42,13 @@
<artifactId>camel-zookeeper</artifactId>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index 6eff7f9..e163404 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -191,7 +191,7 @@ public class SpringBootStarterMojo extends AbstractMojo {
String deps = properties.getProperty(project.getArtifactId());
if (deps != null && deps.trim().length() > 0) {
- getLog().info("Spring-Boot-Starter: the following dependencies will be added to the starter: " + deps);
+ getLog().debug("The following dependencies will be added to the starter: " + deps);
XPath xpath = XPathFactory.newInstance().newXPath();
Node dependencies = ((NodeList) xpath.compile("/project/dependencies").evaluate(pom, XPathConstants.NODESET)).item(0);
@@ -239,6 +239,7 @@ public class SpringBootStarterMojo extends AbstractMojo {
loggingImpl.add("ch.qos.logback:logback-classic");
loggingImpl.add("org.apache.logging.log4j:log4j");
+ loggingImpl.add("org.apache.logging.log4j:log4j-slf4j-impl");
loggingImpl.add("org.slf4j:slf4j-jcl");
loggingImpl.add("org.slf4j:slf4j-jdk14");
@@ -293,12 +294,14 @@ public class SpringBootStarterMojo extends AbstractMojo {
List<DependencyNode> nodes = visitor.getNodes();
for (DependencyNode dependencyNode : nodes) {
- int state = dependencyNode.getState();
Artifact artifact = dependencyNode.getArtifact();
- if (state == DependencyNode.INCLUDED && !Artifact.SCOPE_TEST.equals(artifact.getScope())) {
+ getLog().debug("Found dependency node: " + artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion() + " - scope=" + artifact.getScope());
+
+ if (!Artifact.SCOPE_TEST.equals(artifact.getScope()) && !Artifact.SCOPE_PROVIDED.equals(artifact.getScope())) {
String canonicalName = artifact.getGroupId() + ":" + artifact.getArtifactId();
if (artifacts.contains(canonicalName)) {
+ getLog().debug(canonicalName + " marked for exclusion");
included.add(canonicalName);
}
}
@@ -398,18 +401,18 @@ public class SpringBootStarterMojo extends AbstractMojo {
for (String ignored : IGNORE_MODULES) {
if (ignored.equals(project.getArtifactId())) {
- getLog().info("Spring-Boot-Starter: component inside ignore list");
+ getLog().debug("Component inside ignore list");
return false;
}
}
if (IGNORE_TEST_MODULES && project.getArtifactId().startsWith("camel-test-")) {
- getLog().info("Spring-Boot-Starter: test components are ignored");
+ getLog().debug("Test components are ignored");
return false;
}
if (project.getPackaging() != null && !project.getPackaging().equals("jar")) {
- getLog().info("Spring-Boot-Starter: ignored for wrong packaging");
+ getLog().debug("Ignored for wrong packaging");
return false;
}
@@ -423,7 +426,7 @@ public class SpringBootStarterMojo extends AbstractMojo {
return true;
}
- getLog().info("Spring-Boot-Starter: component directory mismatch");
+ getLog().debug("Component directory mismatch");
return false;
}
@@ -471,13 +474,13 @@ public class SpringBootStarterMojo extends AbstractMojo {
try (FileReader fr = new FileReader(file)) {
String oldContent = IOUtils.toString(fr);
if (!content.equals(oldContent)) {
- getLog().info("Writing new file " + file.getAbsolutePath());
+ getLog().debug("Writing new file " + file.getAbsolutePath());
fr.close();
try (FileWriter fw = new FileWriter(file)) {
IOUtils.write(content, fw);
}
} else {
- getLog().info("File " + file.getAbsolutePath() + " has been left unchanged");
+ getLog().debug("File " + file.getAbsolutePath() + " has been left unchanged");
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad79eae7/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-additional-dependencies.properties
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-additional-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-additional-dependencies.properties
index 39c0b0d..bc07fe1 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-additional-dependencies.properties
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-additional-dependencies.properties
@@ -1,7 +1,14 @@
# This file contains additional dependencies needed by camel modules in a spring-boot deployment
camel-guava-eventbus=com.google.guava:guava
+camel-jetty9=org.hibernate:hibernate-validator:${hibernate-validator-version}
camel-jms=org.apache.geronimo.specs:geronimo-jms_1.1_spec
camel-jpa=org.apache.geronimo.specs:geronimo-jpa_2.0_spec
camel-kubernetes=org.hibernate:hibernate-validator:${hibernate-validator-version}
+camel-netty4=org.hibernate:hibernate-validator:${hibernate-validator-version}
camel-sjms=org.apache.geronimo.specs:geronimo-jms_1.1_spec
+camel-spark-rest=org.hibernate:hibernate-validator:${hibernate-validator-version}
+camel-spring-ws=org.springframework.boot:spring-boot-starter-web:${spring-boot-version}
+camel-restlet=org.hibernate:hibernate-validator:${hibernate-validator-version}
+camel-swagger-java=org.hibernate:hibernate-validator:${hibernate-validator-version}
+camel-undertow=org.hibernate:hibernate-validator:${hibernate-validator-version}