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:32 UTC
[3/3] servicemix git commit: SM-2469: Upgrade to Activiti 5.17.0
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>