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 2014/04/11 23:23:26 UTC
[1/3] git commit: SM-2229 Upgrade to activiti version 5.15.1 Thanks
to Filippo Balicchia for the patch!
Repository: servicemix
Updated Branches:
refs/heads/servicemix-5.0.x 9741d69a9 -> 589c163ec
SM-2229 Upgrade to activiti version 5.15.1
Thanks to Filippo Balicchia for the patch!
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/f9dd4365
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f9dd4365
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f9dd4365
Branch: refs/heads/servicemix-5.0.x
Commit: f9dd4365e8868120bc6095c5d4e6ef90f5c98f50
Parents: 9741d69
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Apr 11 21:01:51 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Apr 11 21:01:51 2014 +0200
----------------------------------------------------------------------
activiti/activiti-config/pom.xml | 1 -
activiti/pom.xml | 17 -----------------
assembly/src/main/filtered-resources/features.xml | 17 +++++++++++++++--
assembly/src/main/filtered-resources/pom.xml | 12 ------------
examples/activiti/activiti-camel/pom.xml | 17 +----------------
parent/pom.xml | 17 +++++++++--------
pom.xml | 1 -
7 files changed, 25 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f9dd4365/activiti/activiti-config/pom.xml
----------------------------------------------------------------------
diff --git a/activiti/activiti-config/pom.xml b/activiti/activiti-config/pom.xml
index 9a445a3..12c83d4 100644
--- a/activiti/activiti-config/pom.xml
+++ b/activiti/activiti-config/pom.xml
@@ -43,7 +43,6 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-osgi</artifactId>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f9dd4365/activiti/pom.xml
----------------------------------------------------------------------
diff --git a/activiti/pom.xml b/activiti/pom.xml
index 8879594..11a183d 100644
--- a/activiti/pom.xml
+++ b/activiti/pom.xml
@@ -32,24 +32,7 @@
<artifactId>activiti</artifactId>
<packaging>pom</packaging>
<name>Apache ServiceMix :: Activiti Support</name>
-
<modules>
<module>activiti-config</module>
</modules>
-
- <repositories>
- <!-- Alfresco repository contains Activiti artifacts -->
- <repository>
- <id>alfresco.public</id>
- <name>Alfresco Public Repository</name>
- <url>https://maven.alfresco.com/nexus/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f9dd4365/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 1dd6d60..ed30377 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -41,16 +41,29 @@
<!-- Activiti support -->
<feature name="activiti" version="${activiti.version}" resolver="(obr)">
+ <feature version="${jpa.version}">jpa</feature>
<feature version="${cxf.version}">cxf-specs</feature>
<feature version="${aries.transaction.version}">transaction</feature>
<feature version="${camel.version}">camel</feature>
+ <feature version="${spring.version}">spring-orm</feature>
+ <feature version="${spring.version}">spring-test</feature>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.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.mybatis/mybatis/${mybatis.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>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang.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:org.drools/drools-core/${drools.version}</bundle>
+ <bundle dependency="true">mvn:org.drools/knowledge-internal-api/${drools.version}</bundle>
+ <bundle dependency="true">mvn:org.drools/knowledge-api/${drools.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>
+ <bundle>mvn:org.activiti/activiti-bpmn-model/${activiti.version}</bundle>
<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.apache.servicemix.activiti/org.apache.servicemix.activiti.config/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f9dd4365/assembly/src/main/filtered-resources/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/pom.xml b/assembly/src/main/filtered-resources/pom.xml
index 5d3f684..2d1c650 100644
--- a/assembly/src/main/filtered-resources/pom.xml
+++ b/assembly/src/main/filtered-resources/pom.xml
@@ -158,18 +158,6 @@
<enabled>false</enabled>
</releases>
</repository>
- <!-- Alfresco repository contains Activiti artifacts -->
- <repository>
- <id>alfresco.public</id>
- <name>Alfresco Public Repository</name>
- <url>https://maven.alfresco.com/nexus/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f9dd4365/examples/activiti/activiti-camel/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activiti/activiti-camel/pom.xml b/examples/activiti/activiti-camel/pom.xml
index 1fc3950..74da4c1 100644
--- a/examples/activiti/activiti-camel/pom.xml
+++ b/examples/activiti/activiti-camel/pom.xml
@@ -40,22 +40,7 @@
<artifactId>activiti-camel</artifactId>
</dependency>
</dependencies>
-
- <repositories>
- <!-- Alfresco repository contains Activiti artifacts -->
- <repository>
- <id>alfresco.public</id>
- <name>Alfresco Public Repository</name>
- <url>https://maven.alfresco.com/nexus/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f9dd4365/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 51a4e72..03c2470 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,25 +38,28 @@
<!-- Properties -->
<properties>
<activemq.version>5.9.0</activemq.version>
- <activiti.version>5.10</activiti.version>
+ <activiti.version>5.15.1</activiti.version>
<camel.version>2.12.3</camel.version>
<cxf.version>2.7.10</cxf.version>
-
<felix.obr.version>1.6.6</felix.obr.version>
-
<karaf.version>2.3.4</karaf.version>
<aries.proxy.version>1.0.2</aries.proxy.version>
<aries.util.version>1.1.0</aries.util.version>
<aries.blueprint.core.version>1.3.0</aries.blueprint.core.version>
<aries.transaction.version>1.0.1</aries.transaction.version>
<pax.logging.version>1.7.2</pax.logging.version>
-
<akka.version>2.2.3</akka.version>
<scala.version>2.10.2</scala.version>
<google.guava.version>14.0.1</google.guava.version>
<fasterxml.jackson.version>2.2.1</fasterxml.jackson.version>
<typesafe-config.version>1.0.2</typesafe-config.version>
-
+ <drools.version>5.5.0.Final</drools.version>
+ <h2.version>1.3.170</h2.version>
+ <mvel2.version>2.1.3.Final</mvel2.version>
+ <mybatis.version>3.2.5</mybatis.version>
+ <commons-lang.version>3.1</commons-lang.version>
+ <jodatime.bundle.version>2.3_1</jodatime.bundle.version>
+ <jpa.version>1.0.1</jpa.version>
<servicemix.specs.version>2.4.0</servicemix.specs.version>
</properties>
@@ -100,7 +103,7 @@
<artifactId>activemq-broker</artifactId>
<version>${activemq.version}</version>
</dependency>
-
+ <!-- Activiti-->
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-camel</artifactId>
@@ -116,7 +119,6 @@
<artifactId>activiti-osgi</artifactId>
<version>${activiti.version}</version>
</dependency>
-
<!-- Apache Karaf -->
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -137,7 +139,6 @@
<version>${karaf.version}</version>
<type>zip</type>
</dependency>
-
<!-- Apache CXF -->
<dependency>
<groupId>org.apache.cxf</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f9dd4365/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e252b18..37566c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,6 @@
<xerces.version>2.11.0</xerces.version>
<xml.api.version>2.11.0-20110622</xml.api.version>
<xalan.version>2.7.1</xalan.version>
- <mybatis.version>3.1.1</mybatis.version>
<pax.exam.version>3.4.0</pax.exam.version>
<pax.url.version>1.3.6</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
[3/3] git commit: SM-2280 Activiti test case fails after upgrade to
5.15.1
Posted by ks...@apache.org.
SM-2280 Activiti test case fails after upgrade to 5.15.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/589c163e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/589c163e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/589c163e
Branch: refs/heads/servicemix-5.0.x
Commit: 589c163ec8b276563817dca54ce043fa6d02b508
Parents: 170b370
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Apr 11 23:21:37 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Apr 11 23:21:37 2014 +0200
----------------------------------------------------------------------
.../servicemix/examples/activiti/ActivitiRouteBuilder.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/589c163e/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java b/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java
index 5c097a6..179afd4 100644
--- a/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java
+++ b/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java
@@ -64,12 +64,12 @@ public class ActivitiRouteBuilder extends RouteBuilder {
* you added to the process are available as Exchange properties. The next two routes will be triggered while
* processing the order and the order delivery.
*/
- from("activiti:OrderProcess:processOrder")
- .log("Processing order ${property.orderid} created on ${property:timestamp}")
+ from("activiti:OrderProcess:processOrder?copyVariablesToProperties=true")
+ .log("Processing order ${property.orderid} created on ${property.timestamp}")
.log(" original message: ${property.message}");
- from("activiti:OrderProcess:processDelivery")
- .log("Processing delivery for order ${property.orderid} created on ${property:timestamp}")
+ from("activiti:OrderProcess:processDelivery?copyVariablesToProperties=true")
+ .log("Processing delivery for order ${property.orderid} created on ${property.timestamp}")
.log(" original message: ${property.message}");
}
[2/3] git commit: SM-2277 activiti-camel thrown ActivitiException
when put document in delivery folder Thanks to Filippo Balicchia for the
patch!
Posted by ks...@apache.org.
SM-2277 activiti-camel thrown ActivitiException when put document in delivery folder
Thanks to Filippo Balicchia for the patch!
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/170b370d
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/170b370d
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/170b370d
Branch: refs/heads/servicemix-5.0.x
Commit: 170b370d6e3650a2efad691762ff181382a08975
Parents: f9dd436
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Apr 11 21:03:51 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Apr 11 21:03:51 2014 +0200
----------------------------------------------------------------------
.../apache/servicemix/examples/activiti/ActivitiRouteBuilder.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/170b370d/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java b/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java
index f8b8bd6..5c097a6 100644
--- a/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java
+++ b/examples/activiti/activiti-camel/src/main/java/org/apache/servicemix/examples/activiti/ActivitiRouteBuilder.java
@@ -55,6 +55,7 @@ public class ActivitiRouteBuilder extends RouteBuilder {
*/
from("file:var/activiti-camel/delivery")
.log("Notifying process about delivery for order ${file:name}")
+ .setBody(bean(helper))
.setProperty(PROCESS_KEY_PROPERTY, simple("file:name"))
.to("activiti:OrderProcess:receiveDelivery");