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/16 21:00:30 UTC
[1/3] servicemix git commit: SM-2535: Upgrade to Apache Camel 2.15.2
Repository: servicemix
Updated Branches:
refs/heads/servicemix-5.5.x 07d353b71 -> e79f3f547
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/e79f3f54
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/e79f3f54
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/e79f3f54
Branch: refs/heads/servicemix-5.5.x
Commit: e79f3f54729793139c26f2b129471270f78156b5
Parents: 17dfbd3
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat May 16 20:49:55 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat May 16 20:59:27 2015 +0200
----------------------------------------------------------------------
assembly/src/main/filtered-resources/examples.xml | 6 +++---
parent/pom.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/e79f3f54/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 a31559e..bfa8d50 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/e79f3f54/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cdd08ab..3bac0de 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -45,9 +45,9 @@
<aries.blueprint.core.version>1.4.3</aries.blueprint.core.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.util.version>1.1.0</aries.util.version>
- <camel.version>2.15.1</camel.version>
+ <camel.version>2.15.2</camel.version>
<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-fileupload.version>1.3.1</commons-fileupload.version>
<commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version>
<commons-io.version>2.4</commons-io.version>
@@ -86,7 +86,7 @@
<scala-xml.version>1.0.4</scala-xml.version>
<scala.version>2.11.5</scala.version>
<servicemix.specs.version>2.5.0</servicemix.specs.version>
- <slf4j.version>1.7.10</slf4j.version>
+ <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.version>1.3.12</swagger.version>
[3/3] servicemix git commit: SM-2469: Upgrade to Activiti 5.17.0
Posted by ks...@apache.org.
SM-2469: Upgrade to Activiti 5.17.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/555526c2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/555526c2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/555526c2
Branch: refs/heads/servicemix-5.5.x
Commit: 555526c2bd972aac31b45f2eaaf5ca6710f7165f
Parents: 07d353b
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat May 16 20:42:06 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat May 16 20:59:27 2015 +0200
----------------------------------------------------------------------
assembly/pom.xml | 1 +
assembly/src/main/filtered-resources/features.xml | 4 +++-
assembly/src/main/filtered-resources/internal.xml | 5 +++++
assembly/src/main/filtered-resources/startup-obr.properties | 9 +++++++++
parent/pom.xml | 4 ++--
5 files changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/555526c2/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ee89639..face3fc 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -154,6 +154,7 @@
<descriptor>file:${basedir}/target/classes/examples.xml</descriptor>
</descriptors>
<features>
+ <feature>joda-time</feature>
<feature>cxf</feature>
<feature>obr</feature>
<feature>config</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/555526c2/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 1ca9726..6d0b4e6 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -60,12 +60,14 @@
<bundle>mvn:org.activiti/activiti-camel/${activiti.version}</bundle>
<bundle>mvn:org.activiti/activiti-image-generator/${activiti.version}</bundle>
<bundle>mvn:org.activiti/activiti-ldap/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-jmx/${activiti.version}</bundle>
<!--
<bundle dependency="true">wrap:mvn:org.tinyjee.jgraphx/jgraphx/1.10.4.1</bundle>
<bundle>mvn:org.activiti/activiti-bpmn-layout/${activiti.version}</bundle>
<bundle>mvn:org.activiti/activiti-simple-workflow/${activiti.version}</bundle>
<bundle dependency="true">wrap:mvn:math.geom2d/javaGeom/0.11.1</bundle>
- <bundle>mvn:org.activiti/activiti-json-converter/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-json-converter/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-hazelcast-async-executor/${activiti.version}</bundle>
-->
<bundle>mvn:org.apache.servicemix.activiti/org.apache.servicemix.activiti.config/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/555526c2/assembly/src/main/filtered-resources/internal.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml
index 994d94b..c4c6418 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -26,4 +26,9 @@
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${servicemix.specs.version}</bundle>
</feature>
+ <!-- workaround for SM-2469 -->
+ <feature name="joda-time">
+ <bundle start-level='10'>mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
+ </feature>
+
</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/555526c2/assembly/src/main/filtered-resources/startup-obr.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/startup-obr.properties b/assembly/src/main/filtered-resources/startup-obr.properties
index e9867db..5bdaa7f 100644
--- a/assembly/src/main/filtered-resources/startup-obr.properties
+++ b/assembly/src/main/filtered-resources/startup-obr.properties
@@ -24,3 +24,12 @@ org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${karaf.version}/org.
# SM-2485: Add missing wrap deployer
org/apache/karaf/deployer/org.apache.karaf.deployer.wrap/${karaf.version}/org.apache.karaf.deployer.wrap-${karaf.version}.jar=28
+
+# workaround for SM-2469
+#
+# some standard features install the version 2.2 of joda-time bundle ans bundles which depend on joda-time
+# wire to this bundle. Later installation of activiti fails, because it needs higher version of joda-time
+# and activiti tries to resolve this bundle via multiple paths. Starting this bundle as soon as possible
+# should force another bundles to wire this bundle (when compatible with the dependency requirements) instead
+# of installing another versions
+joda-time/joda-time/${jodatime2.bundle.version}/joda-time-${jodatime2.bundle.version}.jar=10
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/555526c2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c46b77d..fd17e6b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,7 +40,7 @@
<!-- Properties -->
<properties>
<activemq.version>5.11.1</activemq.version>
- <activiti.version>5.16.4</activiti.version>
+ <activiti.version>5.17.0</activiti.version>
<akka.version>2.3.9</akka.version>
<aries.blueprint.core.version>1.4.3</aries.blueprint.core.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
@@ -52,7 +52,7 @@
<commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version>
<commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
- <commons-lang3.version>3.3</commons-lang3.version>
+ <commons-lang3.version>3.3.2</commons-lang3.version>
<cxf.version>3.0.4</cxf.version>
<derby.bundle.version>10.11.1.1_1</derby.bundle.version>
<drools.bundle.version>${drools.version}_1</drools.bundle.version>
[2/3] servicemix git commit: SM-2468 Upgrade to Camel 2.15.1
Posted by ks...@apache.org.
SM-2468 Upgrade to Camel 2.15.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/17dfbd39
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/17dfbd39
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/17dfbd39
Branch: refs/heads/servicemix-5.5.x
Commit: 17dfbd39a33e673978ee51a707bbb45a407a2210
Parents: 555526c
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat May 16 20:46:03 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat May 16 20:59:27 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/17dfbd39/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fd17e6b..cdd08ab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -45,7 +45,7 @@
<aries.blueprint.core.version>1.4.3</aries.blueprint.core.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.util.version>1.1.0</aries.util.version>
- <camel.version>2.14.2</camel.version>
+ <camel.version>2.15.1</camel.version>
<commons-codec.bundle.version>1.10</commons-codec.bundle.version>
<commons-dbcp.bundle.version>1.4_3</commons-dbcp.bundle.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
@@ -57,7 +57,7 @@
<derby.bundle.version>10.11.1.1_1</derby.bundle.version>
<drools.bundle.version>${drools.version}_1</drools.bundle.version>
<drools.version>5.6.0.Final</drools.version>
- <fasterxml.jackson.version>2.4.1</fasterxml.jackson.version>
+ <fasterxml.jackson.version>2.4.3</fasterxml.jackson.version>
<felix.bundlerepository.version>2.0.4</felix.bundlerepository.version>
<felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version>
<geronimo-atinject.version>1.0</geronimo-atinject.version>
@@ -75,7 +75,7 @@
<json4s.bundle.version>3.2.11_1</json4s.bundle.version>
<karaf.version>2.4.2</karaf.version>
<mvel2.version>2.2.1.Final</mvel2.version>
- <mybatis.version>3.2.7</mybatis.version>
+ <mybatis.version>3.2.8</mybatis.version>
<osgi.version>5.0.0</osgi.version>
<pax.exam.version>4.5.0</pax.exam.version>
<pax.logging.version>1.8.2</pax.logging.version>