breaking starters transitive dependencies on camel-spring-boot
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/52e53f11 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/52e53f11 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/52e53f11 Branch: refs/heads/boot2 Commit: 52e53f11b2ea5bed897ee26702012335b3c28138 Parents: 36220ef Author: Nicola Ferraro <[email protected]> Authored: Tue Sep 12 15:14:34 2017 +0200 Committer: Nicola Ferraro <[email protected]> Committed: Tue Sep 12 15:16:36 2017 +0200 ---------------------------------------------------------------------- components/readme.adoc | 4 +- docs/user-manual/en/SUMMARY.md | 1 + .../camel-ahc-starter/pom.xml | 8 +- .../camel-ahc-ws-starter/pom.xml | 8 +- .../camel-amqp-starter/pom.xml | 11 +- .../camel-apns-starter/pom.xml | 3 +- .../camel-asn1-starter/pom.xml | 3 +- .../camel-asterisk-starter/pom.xml | 3 +- .../camel-atmos-starter/pom.xml | 3 +- .../camel-atmosphere-websocket-starter/pom.xml | 3 +- .../camel-atom-starter/pom.xml | 3 +- .../camel-atomix-starter/pom.xml | 3 +- .../camel-avro-starter/pom.xml | 3 +- .../camel-aws-starter/pom.xml | 3 +- .../camel-azure-starter/pom.xml | 3 +- .../camel-bam-starter/pom.xml | 19 +- .../camel-barcode-starter/pom.xml | 3 +- .../camel-base64-starter/pom.xml | 3 +- .../camel-bean-validator-starter/pom.xml | 3 +- .../camel-beanio-starter/pom.xml | 3 +- .../camel-beanstalk-starter/pom.xml | 3 +- .../camel-bindy-starter/pom.xml | 3 +- .../camel-bonita-starter/pom.xml | 3 +- .../camel-boon-starter/pom.xml | 3 +- .../camel-box-starter/pom.xml | 3 +- .../camel-braintree-starter/pom.xml | 3 +- .../camel-cache-starter/pom.xml | 3 +- .../camel-caffeine-starter/pom.xml | 3 +- .../camel-cassandraql-starter/pom.xml | 8 +- .../camel-castor-starter/pom.xml | 3 +- .../camel-chronicle-starter/pom.xml | 3 +- .../camel-chunk-starter/pom.xml | 3 +- .../camel-cm-sms-starter/pom.xml | 3 +- .../camel-cmis-starter/pom.xml | 3 +- .../camel-coap-starter/pom.xml | 3 +- .../camel-cometd-starter/pom.xml | 3 +- .../camel-consul-starter/pom.xml | 3 +- .../camel-context-starter/pom.xml | 3 +- .../camel-core-starter/pom.xml | 4 +- .../camel-couchbase-starter/pom.xml | 3 +- .../camel-couchdb-starter/pom.xml | 3 +- .../camel-crypto-cms-starter/pom.xml | 3 +- .../camel-crypto-starter/pom.xml | 3 +- .../camel-csv-starter/pom.xml | 3 +- .../camel-cxf-starter/pom.xml | 11 +- .../camel-cxf-transport-starter/pom.xml | 11 +- .../camel-digitalocean-starter/pom.xml | 3 +- .../camel-disruptor-starter/pom.xml | 3 +- .../camel-dns-starter/pom.xml | 3 +- .../camel-docker-starter/pom.xml | 3 +- .../camel-dozer-starter/pom.xml | 3 +- .../camel-drill-starter/pom.xml | 11 +- .../camel-dropbox-starter/pom.xml | 3 +- .../camel-eclipse-starter/pom.xml | 3 +- .../camel-ehcache-starter/pom.xml | 3 +- .../camel-elasticsearch-starter/pom.xml | 3 +- .../camel-elasticsearch5-starter/pom.xml | 3 +- .../camel-elsql-starter/pom.xml | 11 +- .../camel-etcd-starter/pom.xml | 3 +- .../camel-exec-starter/pom.xml | 3 +- .../camel-facebook-starter/pom.xml | 3 +- .../camel-fastjson-starter/pom.xml | 3 +- .../camel-flatpack-starter/pom.xml | 3 +- .../camel-flink-starter/pom.xml | 3 +- .../camel-fop-starter/pom.xml | 3 +- .../camel-freemarker-starter/pom.xml | 3 +- .../camel-ftp-starter/pom.xml | 3 +- .../camel-ganglia-starter/pom.xml | 3 +- .../camel-geocoder-starter/pom.xml | 3 +- .../camel-git-starter/pom.xml | 3 +- .../camel-github-starter/pom.xml | 8 +- .../camel-google-bigquery-starter/pom.xml | 3 +- .../camel-google-calendar-starter/pom.xml | 3 +- .../camel-google-drive-starter/pom.xml | 3 +- .../camel-google-mail-starter/pom.xml | 3 +- .../camel-google-pubsub-starter/pom.xml | 3 +- .../camel-gora-starter/pom.xml | 3 +- .../camel-grape-starter/pom.xml | 3 +- .../camel-groovy-starter/pom.xml | 3 +- .../camel-grpc-starter/pom.xml | 3 +- .../camel-gson-starter/pom.xml | 3 +- .../camel-guava-eventbus-starter/pom.xml | 13 +- .../camel-guice-starter/pom.xml | 3 +- .../camel-hawtdb-starter/pom.xml | 3 +- .../camel-hazelcast-starter/pom.xml | 3 +- .../camel-hbase-starter/pom.xml | 7 +- .../camel-hdfs-starter/pom.xml | 3 +- .../camel-hdfs2-starter/pom.xml | 3 +- .../camel-headersmap-starter/pom.xml | 3 +- .../camel-hessian-starter/pom.xml | 3 +- .../camel-hipchat-starter/pom.xml | 3 +- .../camel-hl7-starter/pom.xml | 8 +- .../camel-http-common-starter/pom.xml | 3 +- .../camel-http-starter/pom.xml | 3 +- .../camel-http4-starter/pom.xml | 3 +- .../camel-hystrix-starter/pom.xml | 3 +- .../camel-ical-starter/pom.xml | 3 +- .../camel-iec60870-starter/pom.xml | 3 +- .../camel-ignite-starter/pom.xml | 3 +- .../camel-infinispan-starter/pom.xml | 3 +- .../camel-influxdb-starter/pom.xml | 3 +- .../camel-irc-starter/pom.xml | 3 +- .../camel-ironmq-starter/pom.xml | 3 +- .../camel-jackson-starter/pom.xml | 3 +- .../camel-jacksonxml-starter/pom.xml | 3 +- .../camel-jasypt-starter/pom.xml | 3 +- .../camel-javaspace-starter/pom.xml | 3 +- .../camel-jaxb-starter/pom.xml | 3 +- .../camel-jbpm-starter/pom.xml | 7 +- .../camel-jcache-starter/pom.xml | 3 +- .../camel-jcr-starter/pom.xml | 8 +- .../camel-jdbc-starter/pom.xml | 3 +- .../camel-jetty-common-starter/pom.xml | 3 +- .../camel-jetty-starter/pom.xml | 3 +- .../camel-jetty9-starter/pom.xml | 8 +- .../camel-jgroups-starter/pom.xml | 3 +- .../camel-jibx-starter/pom.xml | 3 +- .../camel-jing-starter/pom.xml | 3 +- .../camel-jira-starter/pom.xml | 7 +- .../camel-jms-starter/pom.xml | 13 +- .../camel-jmx-starter/pom.xml | 3 +- .../camel-johnzon-starter/pom.xml | 3 +- .../camel-jolt-starter/pom.xml | 3 +- .../camel-josql-starter/pom.xml | 3 +- .../camel-jpa-starter/pom.xml | 13 +- .../camel-jsch-starter/pom.xml | 3 +- .../camel-jsonpath-starter/pom.xml | 3 +- .../camel-jt400-starter/pom.xml | 3 +- .../camel-juel-starter/pom.xml | 3 +- .../camel-jxpath-starter/pom.xml | 3 +- .../camel-kafka-starter/pom.xml | 3 +- .../camel-kestrel-starter/pom.xml | 3 +- .../camel-krati-starter/pom.xml | 3 +- .../camel-kubernetes-starter/pom.xml | 7 +- .../camel-kura-starter/pom.xml | 3 +- .../camel-ldap-starter/pom.xml | 3 +- .../camel-leveldb-starter/pom.xml | 3 +- .../camel-linkedin-starter/pom.xml | 3 +- .../camel-lucene-starter/pom.xml | 3 +- .../camel-lumberjack-starter/pom.xml | 3 +- .../camel-lzf-starter/pom.xml | 3 +- .../camel-mail-starter/pom.xml | 3 +- .../camel-metrics-starter/pom.xml | 3 +- .../camel-milo-starter/pom.xml | 3 +- .../camel-mina2-starter/pom.xml | 3 +- .../camel-mllp-starter/pom.xml | 3 +- .../camel-mongodb-gridfs-starter/pom.xml | 3 +- .../camel-mongodb-starter/pom.xml | 3 +- .../camel-mongodb3-starter/pom.xml | 3 +- .../camel-mqtt-starter/pom.xml | 3 +- .../camel-msv-starter/pom.xml | 3 +- .../camel-mustache-starter/pom.xml | 3 +- .../camel-mvel-starter/pom.xml | 3 +- .../camel-mybatis-starter/pom.xml | 3 +- .../camel-nagios-starter/pom.xml | 3 +- .../camel-nats-starter/pom.xml | 3 +- .../camel-netty-http-starter/pom.xml | 3 +- .../camel-netty-starter/pom.xml | 3 +- .../camel-netty4-http-starter/pom.xml | 3 +- .../camel-netty4-starter/pom.xml | 3 +- .../camel-ognl-starter/pom.xml | 3 +- .../camel-olingo2-starter/pom.xml | 3 +- .../camel-olingo4-starter/pom.xml | 3 +- .../camel-openshift-starter/pom.xml | 3 +- .../camel-openstack-starter/pom.xml | 3 +- .../camel-opentracing-starter/pom.xml | 3 +- .../camel-optaplanner-starter/pom.xml | 3 +- .../camel-paho-starter/pom.xml | 3 +- .../camel-pdf-starter/pom.xml | 3 +- .../camel-pgevent-starter/pom.xml | 3 +- .../camel-printer-starter/pom.xml | 3 +- .../camel-protobuf-starter/pom.xml | 3 +- .../camel-pubnub-starter/pom.xml | 3 +- .../camel-quartz2-starter/pom.xml | 3 +- .../camel-quickfix-starter/pom.xml | 3 +- .../camel-rabbitmq-starter/pom.xml | 3 +- .../camel-reactive-streams-starter/pom.xml | 3 +- .../camel-reactor-starter/pom.xml | 3 +- .../camel-rest-swagger-starter/pom.xml | 3 +- .../camel-restlet-starter/pom.xml | 3 +- .../camel-ribbon-starter/pom.xml | 3 +- .../camel-rmi-starter/pom.xml | 3 +- .../camel-routebox-starter/pom.xml | 3 +- .../camel-rss-starter/pom.xml | 3 +- .../camel-ruby-starter/pom.xml | 3 +- .../components-starter/camel-rx-starter/pom.xml | 3 +- .../camel-salesforce-starter/pom.xml | 19 +- .../camel-sap-netweaver-starter/pom.xml | 3 +- .../camel-saxon-starter/pom.xml | 3 +- .../camel-schematron-starter/pom.xml | 3 +- .../camel-script-starter/pom.xml | 3 +- .../camel-servicenow-starter/pom.xml | 3 +- .../camel-servlet-starter/pom.xml | 3 +- .../camel-servletlistener-starter/pom.xml | 7 +- .../camel-shiro-starter/pom.xml | 3 +- .../camel-sip-starter/pom.xml | 3 +- .../camel-sjms-starter/pom.xml | 6 +- .../camel-sjms2-starter/pom.xml | 5 +- .../camel-slack-starter/pom.xml | 3 +- .../camel-smpp-starter/pom.xml | 3 +- .../camel-snakeyaml-starter/pom.xml | 3 +- .../camel-snmp-starter/pom.xml | 3 +- .../camel-soap-starter/pom.xml | 3 +- .../camel-solr-starter/pom.xml | 3 +- .../camel-spark-starter/pom.xml | 3 +- .../camel-splunk-starter/pom.xml | 3 +- .../camel-spring-batch-starter/pom.xml | 11 +- .../camel-spring-boot-starter/pom.xml | 6 - .../camel-spring-boot2-starter/pom.xml | 3 +- .../camel-spring-cloud-netflix-starter/pom.xml | 3 +- .../camel-spring-cloud-starter/pom.xml | 11 +- .../camel-spring-integration-starter/pom.xml | 11 +- .../camel-spring-javaconfig-starter/pom.xml | 11 +- .../camel-spring-ldap-starter/pom.xml | 3 +- .../camel-spring-redis-starter/pom.xml | 11 +- .../camel-spring-security-starter/pom.xml | 3 +- .../camel-spring-starter/pom.xml | 11 +- .../camel-spring-ws-starter/pom.xml | 8 +- .../camel-sql-starter/pom.xml | 11 +- .../camel-ssh-starter/pom.xml | 3 +- .../camel-stax-starter/pom.xml | 3 +- .../camel-stomp-starter/pom.xml | 3 +- .../camel-stream-starter/pom.xml | 3 +- .../camel-stringtemplate-starter/pom.xml | 3 +- .../camel-swagger-java-starter/pom.xml | 7 +- .../camel-syslog-starter/pom.xml | 3 +- .../camel-tagsoup-starter/pom.xml | 3 +- .../camel-tarfile-starter/pom.xml | 3 +- .../camel-telegram-starter/pom.xml | 3 +- .../camel-thrift-starter/pom.xml | 3 +- .../camel-tika-starter/pom.xml | 3 +- .../camel-twilio-starter/pom.xml | 3 +- .../camel-twitter-starter/pom.xml | 3 +- .../camel-undertow-starter/pom.xml | 3 +- .../camel-univocity-parsers-starter/pom.xml | 3 +- .../camel-urlrewrite-starter/pom.xml | 3 +- .../camel-velocity-starter/pom.xml | 3 +- .../camel-vertx-starter/pom.xml | 3 +- .../camel-weather-starter/pom.xml | 3 +- .../camel-websocket-starter/pom.xml | 3 +- .../camel-xmlbeans-starter/pom.xml | 3 +- .../camel-xmljson-starter/pom.xml | 3 +- .../camel-xmlrpc-starter/pom.xml | 3 +- .../camel-xmlsecurity-starter/pom.xml | 3 +- .../camel-xmpp-starter/pom.xml | 3 +- .../camel-xstream-starter/pom.xml | 3 +- .../camel-yammer-starter/pom.xml | 3 +- .../camel-zendesk-starter/pom.xml | 3 +- .../camel-zipfile-starter/pom.xml | 3 +- .../camel-zipkin-starter/pom.xml | 3 +- .../camel-zookeeper-master-starter/pom.xml | 3 +- .../camel-zookeeper-starter/pom.xml | 3 +- .../spring-boot/components-starter/pom.xml | 2 +- platforms/spring-boot/pom.xml | 3 +- .../pom.xml | 213 ++++++++----------- .../camel-spring-boot-dependencies/pom.xml | 71 ------- .../spring-boot-dm/camel-starter-parent/pom.xml | 167 ++++----------- platforms/spring-boot/spring-boot-dm/pom.xml | 119 ----------- .../maven/bom/generator/BomGeneratorMojo.java | 33 ++- .../maven/packaging/SpringBootStarterMojo.java | 14 ++ .../spring-boot-fix-dependencies.properties | 97 +++++---- 261 files changed, 859 insertions(+), 846 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index 00b960a..9bb8bba 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1026,7 +1026,7 @@ Miscellaneous Components ^^^^^^^^^^^^^^^^^^^^^^^^ // others: START -Number of Miscellaneous Components: 38 in 38 JAR artifacts (13 deprecated) +Number of Miscellaneous Components: 39 in 39 JAR artifacts (14 deprecated) [width="100%",cols="4,1,5",options="header"] |======================================================================= @@ -1084,6 +1084,8 @@ Number of Miscellaneous Components: 38 in 38 JAR artifacts (13 deprecated) | link:camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc[Spring Cloud Netflix] (camel-spring-cloud-netflix) | 2.19 | Camel Cloud integration with Spring Cloud Netflix +| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring DM] (camel-spring-dm) | 2.18 | *deprecated* Camel SpringDM (OSGi) XML DSL + | link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Java Configuration] (camel-spring-javaconfig) | 2.0 | Using Camel with Spring Java Configuration | link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3 | Security using Spring Security http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/docs/user-manual/en/SUMMARY.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index ea94761..2231f1c 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -412,6 +412,7 @@ * [Spring Boot2](spring-boot2.adoc) * [Spring Cloud](spring-cloud.adoc) * [Spring Cloud Netflix](spring-cloud-netflix.adoc) + * [Spring DM](spring-dm.adoc) * [Spring Java Configuration](spring-javaconfig.adoc) * [Spring Security](spring-security.adoc) * [Swagger](swagger.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml index db544a7..fd7cb44 100644 --- a/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml @@ -41,17 +41,13 @@ </dependency> <!--START OF GENERATED CODE--> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${ahc-netty-version}</version> - </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-ahc-ws-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml index 8fdb350..db928d1 100644 --- a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml @@ -41,17 +41,13 @@ </dependency> <!--START OF GENERATED CODE--> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${ahc-netty-version}</version> - </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-amqp-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml index 60415b8..ed8f494 100644 --- a/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-amqp</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-apns-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-apns-starter/pom.xml b/platforms/spring-boot/components-starter/camel-apns-starter/pom.xml index c00a225..ad4fd7d 100644 --- a/platforms/spring-boot/components-starter/camel-apns-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-apns-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-asn1-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-asn1-starter/pom.xml b/platforms/spring-boot/components-starter/camel-asn1-starter/pom.xml index beddb35..13a0ab0 100644 --- a/platforms/spring-boot/components-starter/camel-asn1-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-asn1-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-asterisk-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-asterisk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-asterisk-starter/pom.xml index a7fa60c..c892f1f 100644 --- a/platforms/spring-boot/components-starter/camel-asterisk-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-asterisk-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-atmos-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-atmos-starter/pom.xml b/platforms/spring-boot/components-starter/camel-atmos-starter/pom.xml index 3ff96fa..60fe7a3 100644 --- a/platforms/spring-boot/components-starter/camel-atmos-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-atmos-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-atmosphere-websocket-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/pom.xml b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/pom.xml index cb5167a..a04f82d 100644 --- a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-atmosphere-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-atom-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-atom-starter/pom.xml b/platforms/spring-boot/components-starter/camel-atom-starter/pom.xml index 9f61b70..083f292 100644 --- a/platforms/spring-boot/components-starter/camel-atom-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-atom-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-atomix-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-atomix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-atomix-starter/pom.xml index b3231a5..f603420 100644 --- a/platforms/spring-boot/components-starter/camel-atomix-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-atomix-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-avro-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-avro-starter/pom.xml b/platforms/spring-boot/components-starter/camel-avro-starter/pom.xml index f4ccae9..f253edd 100644 --- a/platforms/spring-boot/components-starter/camel-avro-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-avro-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-aws-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/pom.xml b/platforms/spring-boot/components-starter/camel-aws-starter/pom.xml index 1937599..b94b2ab 100644 --- a/platforms/spring-boot/components-starter/camel-aws-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-aws-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-azure-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-azure-starter/pom.xml b/platforms/spring-boot/components-starter/camel-azure-starter/pom.xml index 1b33445..c79d974 100644 --- a/platforms/spring-boot/components-starter/camel-azure-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-azure-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-bam-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml index afb8b73..80c4b10 100644 --- a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-bam</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,15 +54,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</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-barcode-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-barcode-starter/pom.xml b/platforms/spring-boot/components-starter/camel-barcode-starter/pom.xml index c38785d..2f8fe47 100644 --- a/platforms/spring-boot/components-starter/camel-barcode-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-barcode-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-base64-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-base64-starter/pom.xml b/platforms/spring-boot/components-starter/camel-base64-starter/pom.xml index cd2c7c6..0d4f284 100644 --- a/platforms/spring-boot/components-starter/camel-base64-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-base64-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-bean-validator-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-bean-validator-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bean-validator-starter/pom.xml index 8e78b13..9332b75 100644 --- a/platforms/spring-boot/components-starter/camel-bean-validator-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-bean-validator-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-beanio-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-beanio-starter/pom.xml b/platforms/spring-boot/components-starter/camel-beanio-starter/pom.xml index 37d333a..dd738a3 100644 --- a/platforms/spring-boot/components-starter/camel-beanio-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-beanio-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-beanstalk-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-beanstalk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-beanstalk-starter/pom.xml index 9c15cba..3f07b42 100644 --- a/platforms/spring-boot/components-starter/camel-beanstalk-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-beanstalk-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-bindy-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-bindy-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bindy-starter/pom.xml index 958cc8a..8e7c05a 100644 --- a/platforms/spring-boot/components-starter/camel-bindy-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-bindy-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-bonita-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-bonita-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bonita-starter/pom.xml index 0de3254..3106c68 100644 --- a/platforms/spring-boot/components-starter/camel-bonita-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-bonita-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-boon-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-boon-starter/pom.xml b/platforms/spring-boot/components-starter/camel-boon-starter/pom.xml index 4652ce2..f807dd8 100644 --- a/platforms/spring-boot/components-starter/camel-boon-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-boon-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-box-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-box-starter/pom.xml b/platforms/spring-boot/components-starter/camel-box-starter/pom.xml index 3c3595d..1ddd784 100644 --- a/platforms/spring-boot/components-starter/camel-box-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-box-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-braintree-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-braintree-starter/pom.xml b/platforms/spring-boot/components-starter/camel-braintree-starter/pom.xml index 8297cf3..59102a0 100644 --- a/platforms/spring-boot/components-starter/camel-braintree-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-braintree-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-cache-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-cache-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cache-starter/pom.xml index a4c29ad..f4bd552 100644 --- a/platforms/spring-boot/components-starter/camel-cache-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-cache-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-caffeine-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-caffeine-starter/pom.xml b/platforms/spring-boot/components-starter/camel-caffeine-starter/pom.xml index 80357e3..9ddb2a0 100644 --- a/platforms/spring-boot/components-starter/camel-caffeine-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-caffeine-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-cassandraql-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-cassandraql-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cassandraql-starter/pom.xml index ebc4b91..6864c5d 100644 --- a/platforms/spring-boot/components-starter/camel-cassandraql-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-cassandraql-starter/pom.xml @@ -41,17 +41,13 @@ </dependency> <!--START OF GENERATED CODE--> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${cassandra-driver-guava-version}</version> - </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-castor-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-castor-starter/pom.xml b/platforms/spring-boot/components-starter/camel-castor-starter/pom.xml index 0e7104c..078841b 100644 --- a/platforms/spring-boot/components-starter/camel-castor-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-castor-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-chronicle-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-chronicle-starter/pom.xml b/platforms/spring-boot/components-starter/camel-chronicle-starter/pom.xml index 7b2d295..7a15f15 100644 --- a/platforms/spring-boot/components-starter/camel-chronicle-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-chronicle-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-chunk-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-chunk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-chunk-starter/pom.xml index dce7e29..bcf390b 100644 --- a/platforms/spring-boot/components-starter/camel-chunk-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-chunk-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-cm-sms-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-cm-sms-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cm-sms-starter/pom.xml index 5d05d2f..f2e39c9 100644 --- a/platforms/spring-boot/components-starter/camel-cm-sms-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-cm-sms-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-cmis-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-cmis-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cmis-starter/pom.xml index d35b236..56334ee 100644 --- a/platforms/spring-boot/components-starter/camel-cmis-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-cmis-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-coap-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-coap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-coap-starter/pom.xml index 9cd6ff0..c37fd5b 100644 --- a/platforms/spring-boot/components-starter/camel-coap-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-coap-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-cometd-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-cometd-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cometd-starter/pom.xml index bfe6400..678741b 100644 --- a/platforms/spring-boot/components-starter/camel-cometd-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-cometd-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-consul-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml b/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml index c45d35b..469eb91 100644 --- a/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-consul-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-context-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-context-starter/pom.xml b/platforms/spring-boot/components-starter/camel-context-starter/pom.xml index aa2d65b..a3fddb4 100644 --- a/platforms/spring-boot/components-starter/camel-context-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-context-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-core-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/pom.xml b/platforms/spring-boot/components-starter/camel-core-starter/pom.xml index 106d9c6..d67b47e 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-core-starter/pom.xml @@ -39,11 +39,11 @@ <artifactId>camel-core</artifactId> <version>${project.version}</version> </dependency> - <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring-boot</artifactId> + <version>${project.version}</version> + <optional>true</optional> </dependency> - <!--END OF GENERATED CODE--> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/52e53f11/platforms/spring-boot/components-starter/camel-couchbase-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-couchbase-starter/pom.xml b/platforms/spring-boot/components-starter/camel-couchbase-starter/pom.xml index ce342d0..8a7fc77 100644 --- a/platforms/spring-boot/components-starter/camel-couchbase-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-couchbase-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-couchdb-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-couchdb-starter/pom.xml b/platforms/spring-boot/components-starter/camel-couchdb-starter/pom.xml index 4e90170..179b885 100644 --- a/platforms/spring-boot/components-starter/camel-couchdb-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-couchdb-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-crypto-cms-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-crypto-cms-starter/pom.xml b/platforms/spring-boot/components-starter/camel-crypto-cms-starter/pom.xml index 53c0922..4b45198 100644 --- a/platforms/spring-boot/components-starter/camel-crypto-cms-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-crypto-cms-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-crypto-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-crypto-starter/pom.xml b/platforms/spring-boot/components-starter/camel-crypto-starter/pom.xml index 39c7f66..b0098c2 100644 --- a/platforms/spring-boot/components-starter/camel-crypto-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-crypto-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-csv-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-csv-starter/pom.xml b/platforms/spring-boot/components-starter/camel-csv-starter/pom.xml index 119b767..a6de88b 100644 --- a/platforms/spring-boot/components-starter/camel-csv-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-csv-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-cxf-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml index 2da2b23..f8d4a19 100644 --- a/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-cxf</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-cxf-transport-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml index 3e10f05..9d0366c 100644 --- a/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-cxf-transport</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-digitalocean-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-digitalocean-starter/pom.xml b/platforms/spring-boot/components-starter/camel-digitalocean-starter/pom.xml index f4d521c..826427a 100644 --- a/platforms/spring-boot/components-starter/camel-digitalocean-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-digitalocean-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-disruptor-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-disruptor-starter/pom.xml b/platforms/spring-boot/components-starter/camel-disruptor-starter/pom.xml index 772ce11..e14456a 100644 --- a/platforms/spring-boot/components-starter/camel-disruptor-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-disruptor-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-dns-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-dns-starter/pom.xml b/platforms/spring-boot/components-starter/camel-dns-starter/pom.xml index 16ca199..024be60 100644 --- a/platforms/spring-boot/components-starter/camel-dns-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-dns-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-docker-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml b/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml index 7db8d14..6014369 100644 --- a/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-docker-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-dozer-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-dozer-starter/pom.xml b/platforms/spring-boot/components-starter/camel-dozer-starter/pom.xml index 13560eb..96c6a12 100644 --- a/platforms/spring-boot/components-starter/camel-dozer-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-dozer-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-drill-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml b/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml index 76626cf..2ed1711 100644 --- a/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-drill</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-dropbox-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-dropbox-starter/pom.xml b/platforms/spring-boot/components-starter/camel-dropbox-starter/pom.xml index 25ee289..f945871 100644 --- a/platforms/spring-boot/components-starter/camel-dropbox-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-dropbox-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-eclipse-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-eclipse-starter/pom.xml b/platforms/spring-boot/components-starter/camel-eclipse-starter/pom.xml index c6820da..0bf845e 100644 --- a/platforms/spring-boot/components-starter/camel-eclipse-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-eclipse-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-ehcache-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ehcache-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ehcache-starter/pom.xml index 2ecd616..fd61d84 100644 --- a/platforms/spring-boot/components-starter/camel-ehcache-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ehcache-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-elasticsearch-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-elasticsearch-starter/pom.xml b/platforms/spring-boot/components-starter/camel-elasticsearch-starter/pom.xml index 5d71984..1def03b 100644 --- a/platforms/spring-boot/components-starter/camel-elasticsearch-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-elasticsearch-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-elasticsearch5-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-elasticsearch5-starter/pom.xml b/platforms/spring-boot/components-starter/camel-elasticsearch5-starter/pom.xml index b91eb02..7390296 100644 --- a/platforms/spring-boot/components-starter/camel-elasticsearch5-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-elasticsearch5-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-elsql-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml b/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml index d2dd474..f492853 100644 --- a/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-elsql</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-etcd-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-etcd-starter/pom.xml b/platforms/spring-boot/components-starter/camel-etcd-starter/pom.xml index 01e74ed..e8674bb 100644 --- a/platforms/spring-boot/components-starter/camel-etcd-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-etcd-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-exec-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-exec-starter/pom.xml b/platforms/spring-boot/components-starter/camel-exec-starter/pom.xml index 6042a6d..84c7402 100644 --- a/platforms/spring-boot/components-starter/camel-exec-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-exec-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-facebook-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-facebook-starter/pom.xml b/platforms/spring-boot/components-starter/camel-facebook-starter/pom.xml index c995b70..a8c549f 100644 --- a/platforms/spring-boot/components-starter/camel-facebook-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-facebook-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-fastjson-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml b/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml index 1fef9f0..c253fa7 100644 --- a/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-fastjson-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-flatpack-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-flatpack-starter/pom.xml b/platforms/spring-boot/components-starter/camel-flatpack-starter/pom.xml index 17fc1b3..7bd8797 100644 --- a/platforms/spring-boot/components-starter/camel-flatpack-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-flatpack-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-flink-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-flink-starter/pom.xml b/platforms/spring-boot/components-starter/camel-flink-starter/pom.xml index 09819d9..42da467 100644 --- a/platforms/spring-boot/components-starter/camel-flink-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-flink-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-fop-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-fop-starter/pom.xml b/platforms/spring-boot/components-starter/camel-fop-starter/pom.xml index 4b11c82..229f51d 100644 --- a/platforms/spring-boot/components-starter/camel-fop-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-fop-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-freemarker-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-freemarker-starter/pom.xml b/platforms/spring-boot/components-starter/camel-freemarker-starter/pom.xml index 4d154ae..3738826 100644 --- a/platforms/spring-boot/components-starter/camel-freemarker-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-freemarker-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-ftp-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ftp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ftp-starter/pom.xml index b49b5ea..358c931 100644 --- a/platforms/spring-boot/components-starter/camel-ftp-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ftp-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-ganglia-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ganglia-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ganglia-starter/pom.xml index 6686532..b5195b1 100644 --- a/platforms/spring-boot/components-starter/camel-ganglia-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ganglia-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-geocoder-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-geocoder-starter/pom.xml b/platforms/spring-boot/components-starter/camel-geocoder-starter/pom.xml index 9804049..e488a3b 100644 --- a/platforms/spring-boot/components-starter/camel-geocoder-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-geocoder-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-git-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-git-starter/pom.xml b/platforms/spring-boot/components-starter/camel-git-starter/pom.xml index 6295373..4b24659 100644 --- a/platforms/spring-boot/components-starter/camel-git-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-git-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-github-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-github-starter/pom.xml b/platforms/spring-boot/components-starter/camel-github-starter/pom.xml index fa3c7a2..7117fce 100644 --- a/platforms/spring-boot/components-starter/camel-github-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-github-starter/pom.xml @@ -46,12 +46,8 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.mylyn.github</groupId> - <artifactId>org.eclipse.egit.github.core</artifactId> - <version>${egit-github-core-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-google-bigquery-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml index ca7029c..8a3a202 100644 --- a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-google-bigquery-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-google-calendar-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-google-calendar-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-calendar-starter/pom.xml index ca47535..f2e186e 100644 --- a/platforms/spring-boot/components-starter/camel-google-calendar-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-google-calendar-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-google-drive-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-google-drive-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-drive-starter/pom.xml index 5d904c4..a45727d 100644 --- a/platforms/spring-boot/components-starter/camel-google-drive-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-google-drive-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-google-mail-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-google-mail-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-mail-starter/pom.xml index b563bf1..afe35c7 100644 --- a/platforms/spring-boot/components-starter/camel-google-mail-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-google-mail-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-google-pubsub-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml index 8abe63a..e807baa 100644 --- a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-google-pubsub-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-gora-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-gora-starter/pom.xml b/platforms/spring-boot/components-starter/camel-gora-starter/pom.xml index 328786c..34f8acb 100644 --- a/platforms/spring-boot/components-starter/camel-gora-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-gora-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-grape-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-grape-starter/pom.xml b/platforms/spring-boot/components-starter/camel-grape-starter/pom.xml index d76332e..6440c21 100644 --- a/platforms/spring-boot/components-starter/camel-grape-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-grape-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-groovy-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-groovy-starter/pom.xml b/platforms/spring-boot/components-starter/camel-groovy-starter/pom.xml index ccc4d94..08009f0 100644 --- a/platforms/spring-boot/components-starter/camel-groovy-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-groovy-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-grpc-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml index adf3d24..3d375fa 100644 --- a/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-grpc-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-gson-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-gson-starter/pom.xml b/platforms/spring-boot/components-starter/camel-gson-starter/pom.xml index 2fe8ec1..6a5e129 100644 --- a/platforms/spring-boot/components-starter/camel-gson-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-gson-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>
