servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject servicemix git commit: SM-2393: Upgrade to Activiti 5.16.4
Date Sun, 09 Nov 2014 19:19:15 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.3.x 7566ca8e2 -> b66f24b91


SM-2393: Upgrade to Activiti 5.16.4


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/b66f24b9
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/b66f24b9
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/b66f24b9

Branch: refs/heads/servicemix-5.3.x
Commit: b66f24b917d286bbda42a2a4871939223d300e83
Parents: 7566ca8
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Sun Nov 9 20:03:42 2014 +0100
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Sun Nov 9 20:08:18 2014 +0100

----------------------------------------------------------------------
 assembly/src/main/filtered-resources/features.xml | 12 ++++++++++++
 parent/pom.xml                                    |  2 +-
 pom.xml                                           |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/b66f24b9/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 4ea20a4..316ef8c 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -45,6 +45,9 @@
         <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
         <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
         <bundle dependency="true">mvn:org.mvel/mvel2/${mvel2.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>mvn:org.activiti/activiti-engine/${activiti.version}</bundle>
         <bundle>mvn:org.activiti/activiti-bpmn-converter/${activiti.version}</bundle>
         <bundle>mvn:org.activiti/activiti-spring/${activiti.version}</bundle>
@@ -52,6 +55,15 @@
         <bundle>mvn:org.activiti/activiti-osgi/${activiti.version}</bundle>
         <bundle>mvn:org.activiti/activiti-process-validation/${activiti.version}</bundle>
         <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 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.apache.servicemix.activiti/org.apache.servicemix.activiti.config/${project.version}</bundle>
     </feature>
 

http://git-wip-us.apache.org/repos/asf/servicemix/blob/b66f24b9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 10002d6..2599d9d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,7 +38,7 @@
   <!-- Properties -->
   <properties>
     <activemq.version>5.10.0</activemq.version>
-    <activiti.version>5.15.1</activiti.version>
+    <activiti.version>5.16.4</activiti.version>
     <camel.version>2.13.3</camel.version>
     <cxf.version>2.7.13</cxf.version>
     <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/b66f24b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dc10c1f..3178f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
         <!-- Other Dependencies -->
         <commons-fileupload.version>1.3.1</commons-fileupload.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <commons-lang3.version>3.1</commons-lang3.version>
+        <commons-lang3.version>3.3</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>


Mime
View raw message