Repository: camel Updated Branches: refs/heads/master 8609efb8a -> df3777f09
CAMEL-10371 - Add Apache HttpComponents dependencies to BOM Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df3777f0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df3777f0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df3777f0 Branch: refs/heads/master Commit: df3777f09352d034a4ec70d626c9414f31c4873e Parents: 8609efb Author: James Netherton <jamesnether...@gmail.com> Authored: Wed Oct 5 09:32:35 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Oct 7 10:15:24 2016 -0500 ---------------------------------------------------------------------- components/camel-aws/pom.xml | 1 - components/camel-box/pom.xml | 4 --- components/camel-cm-sms/pom.xml | 1 - components/camel-couchdb/pom.xml | 1 - components/camel-cxf-transport/pom.xml | 1 - components/camel-cxf/pom.xml | 2 -- components/camel-hipchat/pom.xml | 1 - components/camel-http4/pom.xml | 1 - components/camel-jetty9/pom.xml | 1 - .../camel-olingo2/camel-olingo2-api/pom.xml | 1 - components/camel-slack/pom.xml | 1 - components/camel-solr/pom.xml | 2 -- parent/pom.xml | 32 +++++++++++++++++++- .../camel-spring-boot-generator-bom/pom.xml | 6 ++++ 14 files changed, 37 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-aws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml index 6c38233..2b2d0eb 100644 --- a/components/camel-aws/pom.xml +++ b/components/camel-aws/pom.xml @@ -106,7 +106,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> </dependency> <dependency> <groupId>commons-codec</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-box/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-box/pom.xml b/components/camel-box/pom.xml index 0595471..08e771a 100644 --- a/components/camel-box/pom.xml +++ b/components/camel-box/pom.xml @@ -49,7 +49,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> </dependency> <dependency> <groupId>net.box</groupId> @@ -113,17 +112,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>${httpcore4-version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>${httpclient4-version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-cache</artifactId> - <version>${httpclient4-version}</version> </dependency> <dependency> <groupId>commons-io</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-cm-sms/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml index 09435cc..e04d25c 100644 --- a/components/camel-cm-sms/pom.xml +++ b/components/camel-cm-sms/pom.xml @@ -52,7 +52,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> - <version>${httpclient4-version}</version> </dependency> <dependency> <groupId>org.jsoup</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-couchdb/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml index 696c11a..cc475c8 100644 --- a/components/camel-couchdb/pom.xml +++ b/components/camel-couchdb/pom.xml @@ -50,7 +50,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 9dd199e..9f0e07f 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -127,7 +127,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 0740f7e..ecf4990 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -227,14 +227,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>${httpclient4-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-hipchat/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml index 7e8992b..c7dd914 100644 --- a/components/camel-hipchat/pom.xml +++ b/components/camel-hipchat/pom.xml @@ -44,7 +44,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-http4/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml index 0aa842a..1f580a2 100644 --- a/components/camel-http4/pom.xml +++ b/components/camel-http4/pom.xml @@ -60,7 +60,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> </dependency> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-jetty9/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml index 472066c..f03a46d 100644 --- a/components/camel-jetty9/pom.xml +++ b/components/camel-jetty9/pom.xml @@ -162,7 +162,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-olingo2/camel-olingo2-api/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml index 05a5f19..df9e29b 100644 --- a/components/camel-olingo2/camel-olingo2-api/pom.xml +++ b/components/camel-olingo2/camel-olingo2-api/pom.xml @@ -55,7 +55,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpasyncclient</artifactId> - <version>${httpasyncclient-version}</version> </dependency> <!-- logging --> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-slack/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml index bc1228c..2b111f6 100644 --- a/components/camel-slack/pom.xml +++ b/components/camel-slack/pom.xml @@ -51,7 +51,6 @@ limitations under the License. <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/components/camel-solr/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml index 076875f..4a0d611 100644 --- a/components/camel-solr/pom.xml +++ b/components/camel-solr/pom.xml @@ -53,12 +53,10 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>${httpclient4-version}</version> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f051a00..adbc456 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3747,7 +3747,7 @@ <version>${slf4j-version}</version> </dependency> - <!-- optional jakarta http core support --> + <!-- httpcomponents httpcore dependencies --> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> @@ -3759,6 +3759,36 @@ <version>${httpcore4-version}</version> </dependency> + <!-- httpcomponents httpclient dependencies --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpclient4-version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-cache</artifactId> + <version>${httpclient4-version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> + <version>${httpclient4-version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>${httpclient4-version}</version> + </dependency> + + <!-- httpcomponents httpasyncclient dependencies --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpasyncclient</artifactId> + <version>${httpasyncclient-version}</version> + </dependency> + + <!-- optional scripting support --> <dependency> <groupId>org.codehaus.groovy</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/df3777f0/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml ---------------------------------------------------------------------- diff --git a/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml b/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml index ffabf94..c1e7b06 100644 --- a/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml +++ b/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml @@ -209,9 +209,15 @@ <exclude>de.flapdoodle*:*</exclude> <exclude>org.apache.activemq:*</exclude> <exclude>org.apache.commons:commons-pool2</exclude> + <exclude>org.apache.httpcomponents:httpasyncclient</exclude> + <exclude>org.apache.httpcomponents:httpclient</exclude> + <exclude>org.apache.httpcomponents:httpclient-cache</exclude> + <exclude>org.apache.httpcomponents:httpclient-osgi</exclude> <exclude>org.apache.httpcomponents:httpcore</exclude> + <exclude>org.apache.httpcomponents:httpmime</exclude> <exclude>org.apache.derby:derby</exclude> <exclude>org.apache.logging.log4j:*</exclude> + <exclude>org.cassandraunit:*</exclude> <exclude>org.codehaus.groovy:*</exclude> <exclude>org.hibernate:hibernate-entitymanager</exclude> <exclude>org.hsqldb:*</exclude>
