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/03/08 23:33:58 UTC
servicemix git commit: SM-2469: Upgrade to Activiti 5.17.0
Repository: servicemix
Updated Branches:
refs/heads/master 207f7ad6c -> 5542f6765
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/5542f676
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/5542f676
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/5542f676
Branch: refs/heads/master
Commit: 5542f6765555adfe949c44c3c8141ef929a92f2b
Parents: 207f7ad
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Mar 8 23:32:58 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Mar 8 23:32:58 2015 +0100
----------------------------------------------------------------------
assembly/pom.xml | 1 +
assembly/src/main/filtered-resources/features.xml | 6 ++++--
assembly/src/main/filtered-resources/internal.xml | 5 +++++
assembly/src/main/filtered-resources/startup-obr.properties | 9 +++++++++
parent/pom.xml | 4 ++--
pom.xml | 2 +-
6 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5542f676/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 18b51d8..9e84704 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/5542f676/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 e95cb07..bdb4293 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -37,7 +37,7 @@
<feature version="${camel.version}">camel</feature>
<feature version="[3.2,3.3)">spring-orm</feature>
<feature version="${drools.version}">drools</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
+ <bundle dependency="true">mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.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.mybatis/mybatis/${mybatis.version}</bundle>
@@ -57,12 +57,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/5542f676/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 6febb59..7f6a160 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -27,4 +27,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-2301 -->
+ <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/5542f676/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 1e81fe0..4b52a5d 100644
--- a/assembly/src/main/filtered-resources/startup-obr.properties
+++ b/assembly/src/main/filtered-resources/startup-obr.properties
@@ -18,3 +18,12 @@
# enabling features OBR resolver support
org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=30
org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30
+
+# 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/5542f676/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 41337a9..877669e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,7 +38,7 @@
<!-- Properties -->
<properties>
<activemq.version>5.10.2</activemq.version>
- <activiti.version>5.16.4</activiti.version>
+ <activiti.version>5.17.0</activiti.version>
<camel.version>2.14.1</camel.version>
<cxf.version>3.0.3</cxf.version>
<cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
@@ -58,7 +58,7 @@
<typesafe-config.version>1.0.2</typesafe-config.version>
<mvel2.version>2.1.7.Final</mvel2.version>
<mybatis.version>3.2.7</mybatis.version>
- <jodatime.bundle.version>2.3_1</jodatime.bundle.version>
+ <jodatime2.bundle.version>2.6</jodatime2.bundle.version>
<jpa.version>2.1.0</jpa.version>
<servicemix.specs.version>2.4.0</servicemix.specs.version>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5542f676/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ccab0e..91c84b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
<!-- Other Dependencies -->
<commons-fileupload.version>1.3.1</commons-fileupload.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>
<drools.version>5.6.0.Final</drools.version>
<felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version>
<h2.version>1.3.170</h2.version>