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/05/06 19:32:59 UTC
[1/2] servicemix git commit: SM-2535: Upgrade to Apache Camel 2.15.2
Repository: servicemix
Updated Branches:
refs/heads/master 532cfb48c -> 6f61273c6
SM-2535: Upgrade to Apache Camel 2.15.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d0651088
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d0651088
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d0651088
Branch: refs/heads/master
Commit: d0651088d6e1ce1073a47de86eeac1d6b6d100d4
Parents: 532cfb4
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue May 5 21:50:04 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue May 5 21:50:04 2015 +0200
----------------------------------------------------------------------
assembly/src/main/filtered-resources/examples.xml | 6 +++---
parent/pom.xml | 2 +-
pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d0651088/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 5ec1730..a91514c 100644
--- a/assembly/src/main/filtered-resources/examples.xml
+++ b/assembly/src/main/filtered-resources/examples.xml
@@ -58,21 +58,21 @@
</feature>
<feature name="examples-camel-sql-derby" version="${version}" resolver="(obr)">
<feature version="${camel.version}">camel-sql</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
+ <bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.derby/${derby.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-derby/${version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
</feature>
<feature name="examples-camel-sql-pgsql" version="${version}" resolver="(obr)">
<feature version="${camel.version}">camel-sql</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
+ <bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle dependency="true">wrap:mvn:postgresql/postgresql/${postgresql.version}.jdbc4</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-pgsql/${version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
</feature>
<feature name="examples-camel-sql-h2" version="${version}" resolver="(obr)">
<feature version="${camel.version}">camel-sql</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
+ <bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.compendium/${osgi.version}</bundle>
<bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-h2/${version}</bundle>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d0651088/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index dcc8791..2b16ed3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -39,7 +39,7 @@
<properties>
<activemq.version>5.11.1</activemq.version>
<activiti.version>5.17.0</activiti.version>
- <camel.version>2.15.1</camel.version>
+ <camel.version>2.15.2</camel.version>
<cxf.version>3.0.4</cxf.version>
<cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d0651088/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db6dc64..e549f6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
<!-- ServiceMix Bundles -->
<commons-codec.bundle.version>1.10</commons-codec.bundle.version>
- <commons-dbcp.bundle.version>1.4_3</commons-dbcp.bundle.version>
+ <commons-dbcp.version>1.4</commons-dbcp.version>
<commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version>
<commons-io.version>2.4</commons-io.version>
<derby.bundle.version>10.11.1.1_1</derby.bundle.version>
@@ -135,7 +135,7 @@
<pax.exam.version>4.5.0</pax.exam.version>
<pax.url.version>2.3.0</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
- <slf4j.version>1.7.10</slf4j.version>
+ <slf4j.version>1.7.12</slf4j.version>
<spring.version>3.2.11.RELEASE_1</spring.version>
</properties>
[2/2] servicemix git commit: SM-2472: Upgrade to Scala 2.11
Posted by ks...@apache.org.
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/6f61273c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/6f61273c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/6f61273c
Branch: refs/heads/master
Commit: 6f61273c6326f677f702545a3458026841b16084
Parents: d065108
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed May 6 19:32:05 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed May 6 19:32:05 2015 +0200
----------------------------------------------------------------------
.../src/main/filtered-resources/examples.xml | 2 +-
.../src/main/filtered-resources/features.xml | 47 +++++++++++++++-----
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(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/6f61273c/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 a91514c..b3dfdba 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/6f61273c/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 8a261b5..5ebbe8b 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -76,29 +76,52 @@
<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: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>
- <bundle>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.10/${fasterxml.jackson.version}</bundle>
+ <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>
- </feature>
+ <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/1.3.12_2-SNAPSHOT</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)">
<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/6f61273c/examples/akka/akka-camel/pom.xml
----------------------------------------------------------------------
diff --git a/examples/akka/akka-camel/pom.xml b/examples/akka/akka-camel/pom.xml
index 2da2f99..72f574d 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/6f61273c/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 0921375..3b70925 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/6f61273c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2b16ed3..597737a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,7 +52,9 @@
<pax.logging.version>1.8.1</pax.logging.version>
<akka.version>2.3.9</akka.version>
- <scala.version>2.10.2</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.3</fasterxml.jackson.version>
<typesafe-config.version>1.2.0</typesafe-config.version>
@@ -417,7 +419,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/6f61273c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e549f6a..a470cb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,8 +85,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>