Repository: camel Updated Branches: refs/heads/master 8a1501d67 -> cc7dd1059
Removing non-existing codehaus jackson-core and fixing com.fasterxml.jackson Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b5b947f3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b5b947f3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b5b947f3 Branch: refs/heads/master Commit: b5b947f3310172ad25632d0152b7bbd15c6bcfec Parents: 8a1501d Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Wed Sep 20 10:48:51 2017 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Wed Sep 20 10:54:28 2017 +0200 ---------------------------------------------------------------------- .../pom.xml | 26 +------ .../camel-spring-boot-dependencies/pom.xml | 77 ++++++++------------ 2 files changed, 32 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b5b947f3/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 ddb30d9..522cd9d 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 @@ -54,11 +54,6 @@ <!-- Add a uniform jackson 1 (version from Camel) --> <dependency> <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> <version>${jackson-version}</version> </dependency> @@ -129,14 +124,6 @@ <version>${jetty-version}</version> </dependency> - <!-- Added to match the version of related libraries provided by Spring-boot --> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-scala_2.11</artifactId> - <version>${scala-jackson2-version}</version> - </dependency> - - <!-- Dependencies from Camel parent at the end --> <dependency> <groupId>org.apache.camel</groupId> @@ -236,18 +223,7 @@ <exclude>com.github.ben-manes.caffeine:caffeine</exclude> <exclude>com.datastax.cassandra:*</exclude> - <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude> - <exclude>com.fasterxml.jackson.core:jackson-core</exclude> - <exclude>com.fasterxml.jackson.core:jackson-databind</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-smile</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jaxrs</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-joda</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</exclude> + <exclude>com.fasterxml.jackson.*:*</exclude> <exclude>com.google.code.gson:*</exclude> <exclude>javax.servlet:javax.servlet-api</exclude> http://git-wip-us.apache.org/repos/asf/camel/blob/b5b947f3/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 42a8ae8..61ab2e3 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 @@ -43,7 +43,7 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.37</version> + <version>1.2.35</version> </dependency> <dependency> <groupId>com.atlassian.jira</groupId> @@ -61,16 +61,6 @@ <version>1.8.2</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-jsonSchema</artifactId> - <version>2.8.10</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-scala_2.11</artifactId> - <version>2.8.9</version> - </dependency> - <dependency> <groupId>com.github.dozermapper</groupId> <artifactId>dozer-core</artifactId> <version>6.1.0</version> @@ -2937,137 +2927,137 @@ <dependency> <groupId>org.apache.cxf.services.sts</groupId> <artifactId>cxf-services-sts-core</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf.services.ws-discovery</groupId> <artifactId>cxf-services-ws-discovery-api</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-core</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-xml</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-databinding-jaxb</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-features-clustering</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-simple</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-management</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-oauth2</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-service-description-swagger</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-jms</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-local</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-addr</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-mex</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-rm</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security-oauth2</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-wsdl</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-testutils</artifactId> - <version>3.2.0</version> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.apache.ftpserver</groupId> @@ -3117,17 +3107,17 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore-nio</artifactId> - <version>4.4.7</version> + <version>4.4.6</version> </dependency> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> - <version>0.11.0.1</version> + <version>0.11.0.0</version> </dependency> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.11</artifactId> - <version>0.11.0.1</version> + <version>0.11.0.0</version> </dependency> <dependency> <groupId>org.apache.mina</groupId> @@ -3187,11 +3177,6 @@ </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core</artifactId> - <version>1.9.12</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> <version>1.9.12</version> </dependency>
