You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/07/20 07:58:09 UTC
[2/2] camel git commit: Get rid of Scala 2.10 and upgrade last man to
2.11
Get rid of Scala 2.10 and upgrade last man to 2.11
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c103d84
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c103d84
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c103d84
Branch: refs/heads/master
Commit: 4c103d84d7864c45b99a575c0bff669bbaa3bd15
Parents: 5549003
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 20 09:57:49 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 20 09:57:49 2017 +0200
----------------------------------------------------------------------
components/camel-swagger/pom.xml | 8 ++++----
parent/pom.xml | 5 ++---
.../karaf/features/src/main/resources/features.xml | 14 +++++++-------
3 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4c103d84/components/camel-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index f65e040..b22e9f5 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -37,7 +37,7 @@
<label>rest,api</label>
<camel.osgi.import.before.defaults>
- scala.*;version="[2.10,2.11)"
+ scala.*;version="[2.11,2.12)"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.swagger.*</camel.osgi.export.pkg>
</properties>
@@ -59,18 +59,18 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala-2.10-version}</version>
+ <version>${scala-version}</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
- <artifactId>swagger-jaxrs_2.10</artifactId>
+ <artifactId>swagger-jaxrs_2.11</artifactId>
<version>${swagger-scala-version}</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
- <artifactId>swagger-servlet_2.10</artifactId>
+ <artifactId>swagger-servlet_2.11</artifactId>
<version>${swagger-scala-version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/4c103d84/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d4e6df9..450c3cb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -576,10 +576,9 @@
<saxon-bundle-version>9.7.0-18_1</saxon-bundle-version>
<saxon-version>9.7.0-18</saxon-version>
<scala-version>2.11.7</scala-version>
- <scala-2.10-version>2.10.6</scala-2.10-version>
<scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>
<scalatest-version>2.2.5</scalatest-version>
- <scalaxml-version>1.0.4</scalaxml-version>
+ <scalaxml-version>1.0.6</scalaxml-version>
<scribe-version>1.3.7</scribe-version>
<scribe-bundle-version>1.3.7_1</scribe-bundle-version>
<scriptengines-version>1.1.1</scriptengines-version>
@@ -652,7 +651,7 @@
<stompjms-version>1.19</stompjms-version>
<swagger-scala-version>1.3.12</swagger-scala-version>
<swagger-scala-guava-version>15.0</swagger-scala-guava-version>
- <swagger-scala-bundle-version>1.3.12_1</swagger-scala-bundle-version>
+ <swagger-scala-bundle-version>1.3.12_2</swagger-scala-bundle-version>
<swagger-java-version>1.5.16</swagger-java-version>
<swagger-java-parser-version>1.0.30</swagger-java-parser-version>
<swagger-java-guava-version>20.0</swagger-java-guava-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/4c103d84/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c32f670..7e4a776 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1908,9 +1908,9 @@
<details>camel-swagger is deprecated, use camel-swagger-java instead</details>
<feature>http</feature>
<feature version='${project.version}'>camel-core</feature>
- <!-- must use Scala 2.10 -->
- <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-2.10-version}</bundle>
- <bundle dependency='true'>mvn:org.scala-lang/scala-reflect/${scala-2.10-version}</bundle>
+ <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/${scalaxml-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
<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:commons-lang/commons-lang/${commons-lang-version}</bundle>
@@ -1922,11 +1922,11 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-scala-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-scala-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-paranamer/${jackson2-scala-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.10/${jackson2-scala-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${jackson2-scala-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger-scala-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core/${swagger-scala-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger-scala-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/1.3.12_1</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core_2.11/${swagger-scala-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs_2.11/${swagger-scala-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}</bundle>