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/06/19 22:42:26 UTC
servicemix git commit: SM-2546: Remove workarounds for SM-2472
Repository: servicemix
Updated Branches:
refs/heads/master 8a333c865 -> 255351e28
SM-2546: Remove workarounds for SM-2472
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/255351e2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/255351e2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/255351e2
Branch: refs/heads/master
Commit: 255351e283cbbd5cec3b78ad863e4e61c6d912cd
Parents: 8a333c8
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jun 19 22:27:52 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jun 19 22:27:52 2015 +0200
----------------------------------------------------------------------
assembly/src/main/filtered-resources/examples.xml | 2 +-
assembly/src/main/filtered-resources/features.xml | 9 +++------
parent/pom.xml | 3 ++-
3 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/255351e2/assembly/src/main/filtered-resources/examples.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/examples.xml b/assembly/src/main/filtered-resources/examples.xml
index 4cbd587..da8eced 100644
--- a/assembly/src/main/filtered-resources/examples.xml
+++ b/assembly/src/main/filtered-resources/examples.xml
@@ -43,7 +43,7 @@
</feature>
<feature name="examples-cxf-jaxrs-blueprint" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
- <feature version="${version}">swagger-2.10</feature>
+ <feature version="${version}">swagger-2.11</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/255351e2/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 39933fa..913fdf0 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -93,14 +93,11 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.10/${fasterxml.jackson.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core/${swagger.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core/${swagger.core.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger.bundle.version}</bundle>
<bundle>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
- <!-- Needs to be upgraded to 0.9.9
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
- -->
- <bundle dependency='true'>wrap:mvn:org.reflections/reflections/0.9.9</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
</feature>
<feature name="swagger-2.11" version="${version}" resolver="(obr)">
@@ -116,7 +113,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${fasterxml.jackson.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core_2.11/${swagger.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core_2.11/${swagger.core.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs_2.11/${swagger.bundle.version}</bundle>
<bundle dependency='true'>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s_2.11/${json4s.bundle.version}</bundle>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/255351e2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 596975c..e083ddc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,7 +82,7 @@
<pax.logging.version>1.8.1</pax.logging.version>
<pax.url.version>2.3.0</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
- <reflections.bundle.version>0.9.8_1</reflections.bundle.version>
+ <reflections.bundle.version>0.9.9_1</reflections.bundle.version>
<scala-2.10.version>2.10.4</scala-2.10.version>
<scala-xml.version>1.0.4</scala-xml.version>
<scala.version>2.11.5</scala.version>
@@ -90,6 +90,7 @@
<slf4j.version>1.7.12</slf4j.version>
<spring.version>3.2.11.RELEASE_1</spring.version>
<swagger.bundle.version>1.3.12_1</swagger.bundle.version>
+ <swagger.core.bundle.version>1.3.12_2</swagger.core.bundle.version>
<swagger.version>1.3.12</swagger.version>
<thoughtworks.paranamer.version>2.7</thoughtworks.paranamer.version>
<typesafe-config.version>1.2.0</typesafe-config.version>