http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml b/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml index a56388f..458cb80 100644 --- a/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml index c6162f9..3606cf9 100644 --- a/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml index 0611f04..f3e1d51 100644 --- a/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml index 2e2aaeb..dc29d6c 100644 --- a/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml b/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml index ce17340..abaee1a 100644 --- a/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml @@ -46,23 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-client</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml index 724f748..39b848a 100644 --- a/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml b/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml index 198d750..68b0752 100644 --- a/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml b/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml index b7efa84..0757e47 100644 --- a/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-script-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-script-starter/pom.xml b/platforms/spring-boot/components-starter/camel-script-starter/pom.xml index 8198365..fb216cc 100644 --- a/platforms/spring-boot/components-starter/camel-script-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-script-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml index cc24b9f..5c91500 100644 --- a/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml index 683b772..8c400ff 100644 --- a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml @@ -65,7 +65,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml index f9b34b9..eaa1884 100644 --- a/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml @@ -41,16 +41,13 @@ </dependency> <!--START OF GENERATED CODE--> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core-starter</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml b/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml index ede4c92..7bf6f58 100644 --- a/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml index 09f974e..79d7d86 100644 --- a/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml index 6b3f2b3..fd7c0e9 100644 --- a/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml @@ -46,12 +46,14 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> + <!--END OF GENERATED CODE--> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> </dependency> - <!--END OF GENERATED CODE--> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml index b9e9eb3..1692ee6 100644 --- a/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml @@ -46,12 +46,13 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> + <!--END OF GENERATED CODE--> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_2.0_spec</artifactId> </dependency> - <!--END OF GENERATED CODE--> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml b/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml index 903fe27..e4d400f 100644 --- a/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml index 382980d..e3bc3af 100644 --- a/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml index 3801d73..39d783b 100644 --- a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml index 0af06b4..d93c9e2 100644 --- a/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml index 2df8948..b175d5c 100644 --- a/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml b/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml index 7e59900..2bf86fb 100644 --- a/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml index b3ace4d..78ed6e5 100644 --- a/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml index 26fa1c6..a98d708 100644 --- a/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml index b7142a1..802570e 100644 --- a/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring-batch</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> @@ -46,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml index bea5c57..d326e26 100644 --- a/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml @@ -51,11 +51,5 @@ </exclusions> <!--END OF GENERATED CODE--> </dependency> - <!--START OF GENERATED CODE--> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-starter</artifactId> - </dependency> - <!--END OF GENERATED CODE--> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml index 567bfaf..33f5a71 100644 --- a/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml @@ -58,7 +58,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml index c734def..9df21db 100644 --- a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml index 76d79e6..5a5a574 100644 --- a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring-cloud</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> @@ -46,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml index d766aaa0..25738cd 100644 --- a/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring-integration</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> @@ -46,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml index 8d33b78..9c6a122 100644 --- a/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring-javaconfig</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> @@ -46,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml index 9be3497..c9adfc5 100644 --- a/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml index 8baac18..78b96d5 100644 --- a/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring-redis</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> @@ -46,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml index d635f68..876ff02 100644 --- a/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml index f1f96e4..9fe0a7f 100644 --- a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> @@ -46,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml index bd0c518..8396c88 100644 --- a/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml @@ -54,12 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml index f50b2db..1c1f643 100644 --- a/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-sql</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -52,7 +60,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml index 7f23b38..3760ad0 100644 --- a/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml b/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml index c14f8ac..17d75a7 100644 --- a/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml index eee0461..d0b1578 100644 --- a/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml b/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml index c7f5baa..744c863 100644 --- a/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml b/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml index 87c7a0c..ae2be4d 100644 --- a/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml b/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml index 5d84d40..9981bf2 100644 --- a/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml @@ -46,11 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml b/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml index 20dbb57..49d9fab 100644 --- a/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml index 56b2077..d460e4b 100644 --- a/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml index c2fa0f8..16c1e3c 100644 --- a/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml b/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml index 4e18179..921f4a1 100644 --- a/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml b/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml index 5b82d17..a5a4576 100644 --- a/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml index 20d7e71..40b1a5a 100644 --- a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml b/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml index 786c38d..fd641f0 100644 --- a/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml b/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml index ba84e82..c798cd9 100644 --- a/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml b/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml index 87390bf..ccbefc1 100644 --- a/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml index 0204d5f..05ec5fa 100644 --- a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml b/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml index b71e26f..e85281d 100644 --- a/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml b/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml index 738489d..1b584f1 100644 --- a/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml b/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml index b9616dc..f854479 100644 --- a/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml b/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml index c77d44c..80831a8 100644 --- a/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml b/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml index eb88552..b91e90d 100644 --- a/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml index 0ecf589..8539c44 100644 --- a/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml index 081e7c6..e21ea06 100644 --- a/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml @@ -54,7 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml index f89bf11..91e5a86 100644 --- a/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml index 6516e6e..a0e56a5 100644 --- a/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml index 1415ba0..103615b 100644 --- a/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml index a8478f9..26b9c46 100644 --- a/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml b/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml index d4cefcf..0ef7f4f 100644 --- a/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml index 868b7c6..5239467 100644 --- a/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml index d140ad2..2684869 100644 --- a/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml index b651cd3..ef3b778 100644 --- a/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml index ca607e0..b03f340 100644 --- a/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml index 3d61d01..85b2175 100644 --- a/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml @@ -46,7 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> + <artifactId>camel-spring-boot</artifactId> + <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml index 50833b4..1ebecf8 100644 --- a/platforms/spring-boot/components-starter/pom.xml +++ b/platforms/spring-boot/components-starter/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-starter-parent</artifactId> <version>2.20.0-SNAPSHOT</version> - <relativePath>../../../platforms/spring-boot/spring-boot-dm/camel-starter-parent</relativePath> + <relativePath>../spring-boot-dm/camel-starter-parent</relativePath> </parent> <artifactId>components-starter</artifactId> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/pom.xml b/platforms/spring-boot/pom.xml index b206027..a8d9434 100644 --- a/platforms/spring-boot/pom.xml +++ b/platforms/spring-boot/pom.xml @@ -21,10 +21,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>camel</artifactId> + <artifactId>platforms</artifactId> <groupId>org.apache.camel</groupId> <version>2.20.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml index 74cfefa..2f76fab 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml @@ -37,104 +37,104 @@ <dependencies> - <!-- Additional libraries related to Avro (version from Camel) --> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-mapred</artifactId> - <version>${avro-version}</version> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-mapred</artifactId> - <classifier>hadoop2</classifier> - <version>${avro-version}</version> - </dependency> - + <!--<!– Additional libraries related to Avro (version from Camel) –>--> + <!--<dependency>--> + <!--<groupId>org.apache.avro</groupId>--> + <!--<artifactId>avro-mapred</artifactId>--> + <!--<version>${avro-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.avro</groupId>--> + <!--<artifactId>avro-mapred</artifactId>--> + <!--<classifier>hadoop2</classifier>--> + <!--<version>${avro-version}</version>--> + <!--</dependency>--> - <!-- Add a uniform jackson 1 (version from Camel) --> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${jackson-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>${jackson-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - <version>${jackson-version}</version> - </dependency> - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-ext</artifactId> - <version>${slf4j-version}</version> - </dependency> + <!--<!– Add a uniform jackson 1 (version from Camel) –>--> + <!--<dependency>--> + <!--<groupId>org.codehaus.jackson</groupId>--> + <!--<artifactId>jackson-core</artifactId>--> + <!--<version>${jackson-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.codehaus.jackson</groupId>--> + <!--<artifactId>jackson-core-asl</artifactId>--> + <!--<version>${jackson-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.codehaus.jackson</groupId>--> + <!--<artifactId>jackson-jaxrs</artifactId>--> + <!--<version>${jackson-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.codehaus.jackson</groupId>--> + <!--<artifactId>jackson-mapper-asl</artifactId>--> + <!--<version>${jackson-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.codehaus.jackson</groupId>--> + <!--<artifactId>jackson-xc</artifactId>--> + <!--<version>${jackson-version}</version>--> + <!--</dependency>--> - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna-platform</artifactId> - <version>${jna-version}</version> - </dependency> + <!--<!– Added to match the version of related libraries provided by spring-boot –>--> + <!--<dependency>--> + <!--<groupId>org.slf4j</groupId>--> + <!--<artifactId>slf4j-ext</artifactId>--> + <!--<version>${slf4j-version}</version>--> + <!--</dependency>--> - <!-- Added to match the version of related libraries provided by spring-boot --> - <!-- Seems that htmlunit 2.21 is not present in Maven central --> + <!--<!– Added to match the version of related libraries provided by spring-boot –>--> <!--<dependency>--> - <!--<groupId>net.sourceforge.htmlunit</groupId>--> - <!--<artifactId>htmlunit-core-js</artifactId>--> - <!--<version>${htmlunit-version}</version>--> + <!--<groupId>net.java.dev.jna</groupId>--> + <!--<artifactId>jna-platform</artifactId>--> + <!--<version>${jna-version}</version>--> <!--</dependency>--> - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-rewrite</artifactId> - <version>${jetty-version}</version> - </dependency> + <!--<!– Added to match the version of related libraries provided by spring-boot –>--> + <!--<!– Seems that htmlunit 2.21 is not present in Maven central –>--> + <!--<!–<dependency>–>--> + <!--<!–<groupId>net.sourceforge.htmlunit</groupId>–>--> + <!--<!–<artifactId>htmlunit-core-js</artifactId>–>--> + <!--<!–<version>${htmlunit-version}</version>–>--> + <!--<!–</dependency>–>--> - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-api</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-common</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-servlet</artifactId> - <version>${jetty-version}</version> - </dependency> + <!--<!– Added to match the version of related libraries provided by spring-boot –>--> + <!--<dependency>--> + <!--<groupId>org.eclipse.jetty</groupId>--> + <!--<artifactId>jetty-util-ajax</artifactId>--> + <!--<version>${jetty-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.eclipse.jetty</groupId>--> + <!--<artifactId>jetty-rewrite</artifactId>--> + <!--<version>${jetty-version}</version>--> + <!--</dependency>--> - <!-- Added to match the version of related libraries provided by Spring-boot --> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-scala_2.11</artifactId> - <version>${scala-jackson2-version}</version> - </dependency> + <!--<!– Added to match the version of related libraries provided by spring-boot –>--> + <!--<dependency>--> + <!--<groupId>org.eclipse.jetty.websocket</groupId>--> + <!--<artifactId>websocket-api</artifactId>--> + <!--<version>${jetty-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.eclipse.jetty.websocket</groupId>--> + <!--<artifactId>websocket-common</artifactId>--> + <!--<version>${jetty-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.eclipse.jetty.websocket</groupId>--> + <!--<artifactId>websocket-servlet</artifactId>--> + <!--<version>${jetty-version}</version>--> + <!--</dependency>--> + + <!--<!– Added to match the version of related libraries provided by Spring-boot –>--> + <!--<dependency>--> + <!--<groupId>com.fasterxml.jackson.module</groupId>--> + <!--<artifactId>jackson-module-scala_2.11</artifactId>--> + <!--<version>${scala-jackson2-version}</version>--> + <!--</dependency>--> <!-- Dependencies from Camel parent at the end --> @@ -170,27 +170,7 @@ <artifactId>spring-boot-dependencies</artifactId> <version>${spring-boot-version}</version> </bom> - <!-- Other BOMs imported by SB should be listed explicitly --> - <bom> - <groupId>org.springframework</groupId> - <artifactId>spring-framework-bom</artifactId> - <version>${spring-version}</version> - </bom> - <bom> - <groupId>org.springframework.data</groupId> - <artifactId>spring-data-releasetrain</artifactId> - <version>${spring-data-releasetrain-version}</version> - </bom> - <bom> - <groupId>org.springframework.integration</groupId> - <artifactId>spring-integration-bom</artifactId> - <version>${spring-integration-version}</version> - </bom> - <bom> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-bom</artifactId> - <version>${spring-security-version}</version> - </bom> + <!-- Other BOMs imported by SB are now checked transitively --> </boms> </checkConflicts> <dependencies> @@ -236,18 +216,7 @@ <exclude>com.github.ben-manes.caffeine:caffeine</exclude> <exclude>com.datastax.cassandra:*</exclude> - <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude> - <exclude>com.fasterxml.jackson.core:jackson-core</exclude> - <exclude>com.fasterxml.jackson.core:jackson-databind</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-smile</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jaxrs</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-joda</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</exclude> + <exclude>com.fasterxml.jackson.*:*</exclude> <exclude>com.google.code.gson:*</exclude> <exclude>javax.servlet:javax.servlet-api</exclude> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 44a01e7..e6a512b 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -61,16 +61,6 @@ <version>1.8.2</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-jsonSchema</artifactId> - <version>2.8.7</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-scala_2.11</artifactId> - <version>2.8.9</version> - </dependency> - <dependency> <groupId>com.github.dozermapper</groupId> <artifactId>dozer-core</artifactId> <version>6.1.0</version> @@ -162,11 +152,6 @@ <version>1.2.17</version> </dependency> <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna-platform</artifactId> - <version>4.2.2</version> - </dependency> - <dependency> <groupId>net.sf.saxon</groupId> <artifactId>Saxon-HE</artifactId> <version>9.7.0-18</version> @@ -197,17 +182,6 @@ <version>1.8.2</version> </dependency> <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-mapred</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-mapred</artifactId> - <version>1.8.1</version> - <classifier>hadoop2</classifier> - </dependency> - <dependency> <groupId>org.apache.camel.karaf</groupId> <artifactId>camel-karaf-commands</artifactId> <version>${project.version}</version> @@ -3196,31 +3170,6 @@ <version>1.3.3</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core</artifactId> - <version>1.9.12</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.9.12</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>1.9.12</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.12</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - <version>1.9.12</version> - </dependency> - <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> <version>1.3.8</version> @@ -3242,21 +3191,6 @@ <version>3.4</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-api</artifactId> - <version>9.4.6.v20170531</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-common</artifactId> - <version>9.4.6.v20170531</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-servlet</artifactId> - <version>9.4.6.v20170531</version> - </dependency> - <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> <version>1.1.3</version> @@ -3524,11 +3458,6 @@ <version>2.3.6</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-ext</artifactId> - <version>1.7.25</version> - </dependency> - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>6.8.21</version> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml index 523f511..197cbe4 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml @@ -33,16 +33,6 @@ <packaging>pom</packaging> <name>Camel :: Platforms :: Spring-Boot :: Dependency Management :: Starter Parent</name> - <properties> - <!-- spring-boot --> - <spring-boot-version>2.0.0.M3</spring-boot-version> - <spring-version>5.0.0.RC3</spring-version> - <jackson2-version>2.9.1</jackson2-version> - <!-- spring-cloud --> - <spring-cloud-commons-version>2.0.0.M2</spring-cloud-commons-version> - <spring-cloud-netflix-version>2.0.0.M2</spring-cloud-netflix-version> - </properties> - <dependencies> <!-- Dependencies added for all starters --> @@ -78,7 +68,7 @@ <scope>import</scope> </dependency> - <!-- What's in the user BOM is OK for the parent --> + <!--What's in the user BOM is OK for the parent--> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring-boot-dependencies</artifactId> @@ -88,44 +78,44 @@ </dependency> <!-- Testing --> - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <version>${arquillian-version}</version> - <scope>test</scope> - </dependency> + <!--<dependency>--> + <!--<groupId>org.jboss.arquillian.junit</groupId>--> + <!--<artifactId>arquillian-junit-container</artifactId>--> + <!--<version>${arquillian-version}</version>--> + <!--<scope>test</scope>--> + <!--</dependency>--> - <!-- Forcing Hadoop in starters --> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-common</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop2-version}</version> - </dependency> + <!--<!– Forcing Hadoop in starters –>--> + <!--<dependency>--> + <!--<groupId>org.apache.hadoop</groupId>--> + <!--<artifactId>hadoop-common</artifactId>--> + <!--<version>${hadoop2-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.hadoop</groupId>--> + <!--<artifactId>hadoop-auth</artifactId>--> + <!--<version>${hadoop2-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.hadoop</groupId>--> + <!--<artifactId>hadoop-mapreduce-client-core</artifactId>--> + <!--<version>${hadoop2-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.hadoop</groupId>--> + <!--<artifactId>hadoop-yarn-common</artifactId>--> + <!--<version>${hadoop2-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.hadoop</groupId>--> + <!--<artifactId>hadoop-annotations</artifactId>--> + <!--<version>${hadoop2-version}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>org.apache.hadoop</groupId>--> + <!--<artifactId>hadoop-hdfs</artifactId>--> + <!--<version>${hadoop2-version}</version>--> + <!--</dependency>--> <!-- Netty cannot be forced at the moment --> @@ -179,85 +169,4 @@ </dependencies> </dependencyManagement> - <profiles> - - <!-- spring-boot2 experiment --> - <profile> - <id>spring-boot2</id> - <properties> - <spring-boot-version>2.0.0.M3</spring-boot-version> - <spring-version>5.0.0.RC3</spring-version> - <jackson2-version>2.9.1</jackson2-version> - <!-- spring-cloud --> - <spring-cloud-commons-version>2.0.0.M2</spring-cloud-commons-version> - <spring-cloud-netflix-version>2.0.0.M2</spring-cloud-netflix-version> - </properties> - <repositories> - <repository> - <id>spring-milestones</id> - <name>Spring Milestones</name> - <url>https://repo.spring.io/libs-milestone</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>spring-milestones</id> - <name>Spring Milestones</name> - <url>https://repo.spring.io/libs-milestone</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - - <profile> - <id>nochecks</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - - <profile> - <id>fastinstall</id> - <activation> - <property> - <name>fastinstall</name> - </property> - </activation> - <properties> - <maven.test.skip.exec>true</maven.test.skip.exec> - <assembly.skipAssembly>true</assembly.skipAssembly> - <noassembly>true</noassembly> - </properties> - </profile> - - <profile> - <id>sourcecheck</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>dependencycheck</id> - <build> - <plugins> - <plugin> - <groupId>org.owasp</groupId> - <artifactId>dependency-check-maven</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project>
