Repository: servicemix Updated Branches: refs/heads/servicemix-5.4.x 76e8ac184 -> 54d503efe
SM-2472: Upgrade to Scala 2.11 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/54d503ef Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/54d503ef Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/54d503ef Branch: refs/heads/servicemix-5.4.x Commit: 54d503efe170ce49985a889209c60ed11588e511 Parents: 76e8ac1 Author: Krzysztof Sobkowiak <[email protected]> Authored: Wed May 6 21:21:03 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Wed May 6 21:21:03 2015 +0200 ---------------------------------------------------------------------- .../src/main/filtered-resources/examples.xml | 2 +- .../src/main/filtered-resources/features.xml | 46 +++++++++++++++----- examples/akka/akka-camel/pom.xml | 8 ++-- examples/cxf/cxf-jaxrs-blueprint/pom.xml | 2 +- parent/pom.xml | 6 ++- pom.xml | 3 +- 6 files changed, 46 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/54d503ef/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 9ba6061..a31559e 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</feature> + <feature version="${version}">swagger-2.10</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/54d503ef/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 0f18f48..1ca9726 100644 --- a/assembly/src/main/filtered-resources/features.xml +++ b/assembly/src/main/filtered-resources/features.xml @@ -74,27 +74,51 @@ <feature name="akka" version="${akka.version}" resolver="(obr)"> <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala.version}</bundle> <bundle dependency="true">mvn:com.typesafe/config/${typesafe-config.version}</bundle> - <bundle>mvn:com.typesafe.akka/akka-actor_2.10/${akka.version}</bundle> - <bundle>mvn:com.typesafe.akka/akka-osgi_2.10/${akka.version}</bundle> - <bundle>mvn:com.typesafe.akka/akka-camel_2.10/${akka.version}</bundle> + <bundle>mvn:com.typesafe.akka/akka-actor_2.11/${akka.version}</bundle> + <bundle>mvn:com.typesafe.akka/akka-osgi_2.11/${akka.version}</bundle> + <bundle>mvn:com.typesafe.akka/akka-camel_2.11/${akka.version}</bundle> </feature> - <feature name="swagger" version="${version}" resolver="(obr)"> - <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala.version}</bundle> + <feature name="swagger-2.10" version="${version}" resolver="(obr)"> + <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-2.10.version}</bundle> + <bundle>mvn:org.scala-lang/scala-reflect/${scala-2.10.version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle> <bundle>mvn:com.google.guava/guava/${google.guava.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-databind/${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.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle> + <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-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.swagger-jaxrs/${swagger.bundle.version}</bundle> <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>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> + </feature> + + <feature name="swagger-2.11" version="${version}" resolver="(obr)"> + <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala.version}</bundle> + <bundle dependency='true'>mvn:org.scala-lang/scala-reflect/${scala.version}</bundle> + <bundle dependency='true'>mvn:org.scala-lang.modules/scala-xml_2.11/${scala-xml.version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle> + <bundle dependency='true'>mvn:com.google.guava/guava/${google.guava.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.core/jackson-annotations/${fasterxml.jackson.version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${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.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-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> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle> </feature> <feature name="drools" version="${drools.version}" resolver="(obr)" start-level='50'> http://git-wip-us.apache.org/repos/asf/servicemix/blob/54d503ef/examples/akka/akka-camel/pom.xml ---------------------------------------------------------------------- diff --git a/examples/akka/akka-camel/pom.xml b/examples/akka/akka-camel/pom.xml index 0ce9c91..d0026c0 100644 --- a/examples/akka/akka-camel/pom.xml +++ b/examples/akka/akka-camel/pom.xml @@ -38,17 +38,17 @@ </dependency> <dependency> <groupId>com.typesafe.akka</groupId> - <artifactId>akka-actor_2.10</artifactId> + <artifactId>akka-actor_2.11</artifactId> <version>${akka.version}</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> - <artifactId>akka-osgi_2.10</artifactId> + <artifactId>akka-osgi_2.11</artifactId> <version>${akka.version}</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> - <artifactId>akka-camel_2.10</artifactId> + <artifactId>akka-camel_2.11</artifactId> <version>${akka.version}</version> </dependency> <dependency> @@ -75,7 +75,7 @@ </dependency> <dependency> <groupId>com.typesafe.akka</groupId> - <artifactId>akka-slf4j_2.10</artifactId> + <artifactId>akka-slf4j_2.11</artifactId> <version>${akka.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/servicemix/blob/54d503ef/examples/cxf/cxf-jaxrs-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/examples/cxf/cxf-jaxrs-blueprint/pom.xml b/examples/cxf/cxf-jaxrs-blueprint/pom.xml index 001ded8..d2ca6c7 100644 --- a/examples/cxf/cxf-jaxrs-blueprint/pom.xml +++ b/examples/cxf/cxf-jaxrs-blueprint/pom.xml @@ -43,7 +43,7 @@ </dependency> <dependency> <groupId>com.wordnik</groupId> - <artifactId>swagger-jaxrs_2.10</artifactId> + <artifactId>swagger-jaxrs_2.11</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/servicemix/blob/54d503ef/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8ad7ec7..748f113 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -51,7 +51,9 @@ <pax.logging.version>1.8.1</pax.logging.version> <akka.version>2.3.9</akka.version> - <scala.version>2.10.4</scala.version> + <scala.version>2.11.5</scala.version> + <scala-2.10.version>2.10.4</scala-2.10.version> + <scala-xml.version>1.0.4</scala-xml.version> <google.guava.version>15.0</google.guava.version> <fasterxml.jackson.version>2.4.1</fasterxml.jackson.version> <typesafe-config.version>1.2.0</typesafe-config.version> @@ -431,7 +433,7 @@ </dependency> <dependency> <groupId>com.wordnik</groupId> - <artifactId>swagger-jaxrs_2.10</artifactId> + <artifactId>swagger-jaxrs_2.11</artifactId> <version>${swagger.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/servicemix/blob/54d503ef/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 92e47dc..35d5970 100644 --- a/pom.xml +++ b/pom.xml @@ -84,8 +84,7 @@ <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.11_1</swagger.bundle.version> - <swagger.jaxrs.bundle.version>1.3.11_1</swagger.jaxrs.bundle.version> + <swagger.bundle.version>1.3.12_1</swagger.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.11_1</json4s.bundle.version>
