You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/03/30 21:26:56 UTC
[2/4] servicemix git commit: SM-2471: Upgrade to Swagger 1.3.11
SM-2471: Upgrade to Swagger 1.3.11
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d25c088e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d25c088e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d25c088e
Branch: refs/heads/servicemix-5.4.x
Commit: d25c088e5e0d91921e2af1e78abb5081c4a9e7ce
Parents: 2bdbac0
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Mar 29 22:16:59 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Mar 29 22:16:59 2015 +0200
----------------------------------------------------------------------
assembly/src/main/filtered-resources/features.xml | 16 ++++++++--------
parent/pom.xml | 4 ++--
pom.xml | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d25c088e/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index 634a65e..a9dbdc6 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -87,14 +87,14 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger.jaxrs.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jackson-module-scala/${jackson-module-scala.bundle.version}</bundle>
-
- <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
- <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
- <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
- <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
- <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
- </feature>
+ <bundle>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.10/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
+ </feature>
<feature name="drools" version="${drools.version}" resolver="(obr)" start-level='50'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d25c088e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e52029b..96caf03 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,8 +52,8 @@
<akka.version>2.2.3</akka.version>
<scala.version>2.10.4</scala.version>
- <google.guava.version>14.0.1</google.guava.version>
- <fasterxml.jackson.version>2.3.3</fasterxml.jackson.version>
+ <google.guava.version>15.0</google.guava.version>
+ <fasterxml.jackson.version>2.4.1</fasterxml.jackson.version>
<typesafe-config.version>1.0.2</typesafe-config.version>
<mvel2.version>2.2.1.Final</mvel2.version>
<mybatis.version>3.2.7</mybatis.version>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d25c088e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2662df3..220531d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,12 +84,12 @@
<jaxb.api.version>2.2</jaxb.api.version>
<osgi.version>5.0.0</osgi.version>
<wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version>
- <swagger.bundle.version>1.3.2_1</swagger.bundle.version>
- <swagger.jaxrs.bundle.version>1.3.2_2</swagger.jaxrs.bundle.version>
+ <swagger.bundle.version>1.3.11_1</swagger.bundle.version>
+ <swagger.jaxrs.bundle.version>1.3.11_1</swagger.jaxrs.bundle.version>
<javassist.bundle.version>3.12.1.GA_3</javassist.bundle.version>
<reflections.bundle.version>0.9.8_1</reflections.bundle.version>
- <json4s.bundle.version>3.2.4_1</json4s.bundle.version>
- <jackson-module-scala.bundle.version>2.1.5_2</jackson-module-scala.bundle.version>
+ <json4s.bundle.version>3.2.11_1</json4s.bundle.version>
+ <thoughtworks.paranamer.version>2.7</thoughtworks.paranamer.version>
<!-- ServiceMix legal shared resources -->
<servicemix.legal.version>1.0</servicemix.legal.version>