Updated to 5.16.4

jbarrez · Oct 29, 2014 · 05e94c9 · 05e94c9
1 parent aff48f4
commit 05e94c9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 14 deletions.
diff --git a/.classpath b/.classpath
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/README b/README
@@ -4,4 +4,8 @@ Run 'mvn clean package shade:shade' to build the executable jar.
 
 Execute the jar to get more info about the command line params.
 
-You can pass db connection params as system properties: -DjdbcUrl | -DjdbcDriver | -DjdbcUsername | -DjdbcPassword
+You can pass db connection params as system properties: -DjdbcUrl | -DjdbcDriver | -DjdbcUsername | -DjdbcPassword
+
+eg:
+
+java -DjdbcUrl=jdbc:mysql://localhost:3306/activiti_benchmark?characterEncoding=UTF-8 -DjdbcUsername=activiti -DjdbcPassword=activiti -DjdbcDriver=com.mysql.jdbc.Driver -Dhistory=none -Dconfig=spring -jar activiti-basic-benchmark.jar 2500 16
diff --git a/pom.xml b/pom.xml
@@ -9,12 +9,12 @@
 		<dependency>
 			<groupId>org.activiti</groupId>
 			<artifactId>activiti-engine</artifactId>
-			<version>5.15.1</version>
+			<version>5.16.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.activiti</groupId>
 			<artifactId>activiti-spring</artifactId>
-			<version>5.15.1</version>
+			<version>5.16.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
@@ -34,22 +34,22 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>3.2.7.RELEASE</version>
+            <version>4.0.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>3.2.7.RELEASE</version>
+            <version>4.0.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
-            <version>3.2.7.RELEASE</version>
+            <version>4.0.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
-            <version>3.2.7.RELEASE</version>
+            <version>4.0.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/src/main/java/be/jorambarrez/activiti/benchmark/Benchmark.java b/src/main/java/be/jorambarrez/activiti/benchmark/Benchmark.java
@@ -104,7 +104,7 @@ private static void executeBenchmarks(int nrOfProcessExecutions, int maxNrOfThre
 
 	private static void writeHtmlReport() {
 		BenchmarkOuput output = new BenchmarkOuput();
-		output.start("Activiti 5.10-SNAPSHOT basic benchmark results");
+		output.start("Activiti " + ProcessEngineHolder.getInstance().VERSION + " basic benchmark results");
 
 		for (int i = 1; i <= maxNrOfThreadsInThreadPool; i++) {
 			output.addBenchmarkResult("Fixed thread pool (" + i + "threads), sequential", fixedPoolSequentialResults.get(i - 1));