fixing some dependencies after rebase
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/251be6e4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/251be6e4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/251be6e4 Branch: refs/heads/boot2 Commit: 251be6e4807994d4bed1cf77eb32af8314d570fe Parents: 52e53f1 Author: Nicola Ferraro <[email protected]> Authored: Tue Sep 12 16:20:57 2017 +0200 Committer: Nicola Ferraro <[email protected]> Committed: Tue Sep 12 16:20:57 2017 +0200 ---------------------------------------------------------------------- .../components-starter/camel-amqp-starter/pom.xml | 8 -------- .../components-starter/camel-bam-starter/pom.xml | 8 -------- .../components-starter/camel-core-starter/pom.xml | 3 ++- .../components-starter/camel-cxf-starter/pom.xml | 8 -------- .../camel-cxf-transport-starter/pom.xml | 8 -------- .../components-starter/camel-drill-starter/pom.xml | 8 -------- .../components-starter/camel-elsql-starter/pom.xml | 8 -------- .../camel-guava-eventbus-starter/pom.xml | 10 +++++----- .../camel-hystrix-starter/pom.xml | 12 ++++++------ .../components-starter/camel-jms-starter/pom.xml | 16 ++++------------ .../components-starter/camel-jpa-starter/pom.xml | 16 ++++------------ .../components-starter/camel-ribbon-starter/pom.xml | 12 ++++++------ .../components-starter/camel-sjms-starter/pom.xml | 9 ++++----- .../components-starter/camel-sjms2-starter/pom.xml | 8 ++++---- .../camel-spring-batch-starter/pom.xml | 8 -------- .../camel-spring-cloud-starter/pom.xml | 8 -------- .../camel-spring-integration-starter/pom.xml | 8 -------- .../camel-spring-javaconfig-starter/pom.xml | 8 -------- .../camel-spring-redis-starter/pom.xml | 8 -------- .../components-starter/camel-spring-starter/pom.xml | 8 -------- .../components-starter/camel-sql-starter/pom.xml | 8 -------- .../pom.xml | 1 + .../camel-spring-boot-dependencies/pom.xml | 5 ----- .../spring-boot-fix-dependencies.properties | 1 + 24 files changed, 37 insertions(+), 160 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 ed8f494..47f3f0c 100644 --- a/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml @@ -38,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 80c4b10..18ad7d5 100644 --- a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml @@ -38,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 d67b47e..a17103f 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,12 @@ <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/251be6e4/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 f8d4a19..12a0485 100644 --- a/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml @@ -38,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 9d0366c..df3dc9f 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,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 2ed1711..316823e 100644 --- a/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml @@ -38,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 f492853..2fef60e 100644 --- a/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml @@ -38,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml b/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml index 98077c8..b2d995a 100644 --- a/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml @@ -39,6 +39,11 @@ <artifactId>camel-guava-eventbus</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${google-guava-version}</version> + </dependency> <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> @@ -50,10 +55,5 @@ <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${google-guava-version}</version> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml index 02c75ef..e7b28aa 100644 --- a/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml @@ -53,6 +53,12 @@ <version>${spring-boot-version}</version> <optional>true</optional> </dependency> + <!-- needed for spring-boot 2 --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>test</scope> + </dependency> <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> @@ -64,11 +70,5 @@ <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> - <!-- needed for spring-boot 2 --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml index c56c7a5..c65bad5 100644 --- a/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml @@ -38,14 +38,10 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jms</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.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> </dependency> <!--START OF GENERATED CODE--> <dependency> @@ -58,9 +54,5 @@ <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml index 9fb8201..886732a 100644 --- a/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml @@ -38,14 +38,10 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jpa</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.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.1_spec</artifactId> </dependency> <!--START OF GENERATED CODE--> <dependency> @@ -58,9 +54,5 @@ <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.1_spec</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml index fc23822..ce0199d 100644 --- a/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml @@ -52,6 +52,12 @@ <artifactId>camel-jetty</artifactId> <scope>test</scope> </dependency> + <!-- needed by spring boot 2 --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>test</scope> + </dependency> <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> @@ -63,11 +69,5 @@ <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> - <!-- needed by spring boot 2 --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 fd7c0e9..274ca87 100644 --- a/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml @@ -39,6 +39,10 @@ <artifactId>camel-sjms</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + </dependency> <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> @@ -50,10 +54,5 @@ <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - </dependency> - </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 1692ee6..6bcd0eb 100644 --- a/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml @@ -39,6 +39,10 @@ <artifactId>camel-sjms2</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + </dependency> <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> @@ -50,9 +54,5 @@ <optional>true</optional> </dependency> <!--END OF GENERATED CODE--> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 802570e..f8c5733 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,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 5a5a574..2864de1 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,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 25738cd..5e8d719 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,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 9c6a122..243190a 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,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 78b96d5..422d876 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,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 9fe0a7f..b270e00 100644 --- a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml @@ -38,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 1c1f643..9a1c345 100644 --- a/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml @@ -38,14 +38,6 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 2f76fab..c8fd14c 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 @@ -190,6 +190,7 @@ <exclude>org.apache.httpcomponents:httpclient-cache</exclude> <exclude>org.apache.httpcomponents:httpclient-osgi</exclude> <exclude>org.apache.httpcomponents:httpcore</exclude> + <exclude>org.apache.httpcomponents:httpcore-nio</exclude> <exclude>org.apache.httpcomponents:httpmime</exclude> <exclude>org.apache.derby:derby</exclude> <exclude>org.apache.logging.log4j:*</exclude> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/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 e6a512b..7dcec69 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 @@ -3099,11 +3099,6 @@ <version>1.1.1</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-nio</artifactId> - <version>4.4.6</version> - </dependency> - <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> <version>0.11.0.0</version> http://git-wip-us.apache.org/repos/asf/camel/blob/251be6e4/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties index 5d1e8c6..788fc90 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties @@ -21,6 +21,7 @@ # Global dependencies included in all modules (except the ones in the list) global=org.apache.camel:camel-core-starter,org.apache.camel:camel-spring-boot optional=org.apache.camel:camel-spring-boot +camel-core=org.apache.camel:camel-spring-boot # Specific configurations should be done in the starters
