You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/02/20 10:23:59 UTC
[camel] 01/02: Revert "Swagger-java now uses Jackson 2.9.x for his
Karaf feature"
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8aef51349ea739eb4f1fbc7067663b845c7bfda2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 20 11:21:09 2018 +0100
Revert "Swagger-java now uses Jackson 2.9.x for his Karaf feature"
This reverts commit a9ed4f9784bb32dba462bd766bc95ac60a6ddc31.
---
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 16 ++++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e4401be..62cf81c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -681,7 +681,6 @@
<swagger-java-version>1.5.18</swagger-java-version>
<swagger-java-parser-version>1.0.33</swagger-java-parser-version>
<swagger-java-guava-version>20.0</swagger-java-guava-version>
- <swagger-jackson-version>2.9.0</swagger-jackson-version>
<swagger-ui-version>2.2.10</swagger-ui-version>
<stax-api-version>1.0.1</stax-api-version>
<stax2-api-bundle-version>3.1.4</stax2-api-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index da7db9a..c05130e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2163,14 +2163,14 @@
<feature>http</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${swagger-jackson-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${swagger-jackson-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${swagger-jackson-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${swagger-jackson-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${swagger-jackson-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${swagger-jackson-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${swagger-jackson-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${swagger-jackson-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle>
<bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.