Merge branch 'master' of github.com:Activiti/Activiti

billhongs · Nov 29, 2012 · 9663f5e · 9663f5e
2 parents b9bf912 + 83b5fb6
commit 9663f5e
Show file tree

Hide file tree

Showing 41 changed files with 590 additions and 74 deletions.
diff --git a/distro/build.xml b/distro/build.xml
@@ -4,7 +4,7 @@
 
 	<property file="${user.home}/.activiti/build.properties" />
 
-	<property name="activiti.version" value="5.11-SNAPSHOT" />
+	<property name="activiti.version" value="5.12-SNAPSHOT" />
 	<property name="target.distro.root" value="target/zip/activiti-${activiti.version}" />
 	<property name="activiti.website" value="../../activiti-website" />
 

diff --git a/distro/src/notice.txt b/distro/src/notice.txt
@@ -16,17 +16,17 @@ This software package includes changed source code of the following libraries:
 
 JUEL
  * Location: http://juel.sourceforge.net/
- * Included in activiti-engine-5.11-SNAPSHOT.jar in package org.activiti.engine.impl.juel
+ * Included in activiti-engine-5.12-SNAPSHOT.jar in package org.activiti.engine.impl.juel
  * License: Apache V2
 
 Quartz
  * Location: http://www.quartz-scheduler.org/
- * CronExpression is included in activiti-engine-5.11-SNAPSHOT.jar in package org.activiti.engine.impl.calendar
+ * CronExpression is included in activiti-engine-5.12-SNAPSHOT.jar in package org.activiti.engine.impl.calendar
  * License: Apache V2
 
 JSON
  * Location: http://www.JSON.org/java
- * Included in activiti-engine-5.11-SNAPSHOT.jar in package org.activiti.engine.impl.json
+ * Included in activiti-engine-5.12-SNAPSHOT.jar in package org.activiti.engine.impl.json
  * License:
 ===============================================================================
 Copyright (c) 2002 JSON.org

diff --git a/distro/src/readme.html b/distro/src/readme.html
diff --git a/modules/activiti-bpmn-converter/pom.xml b/modules/activiti-bpmn-converter/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -46,6 +46,30 @@
     </dependency>          
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <repositories>
     <!-- This repo declaration is here for as this will be part of the distro -->
     <repository>

diff --git a/modules/activiti-bpmn-model/pom.xml b/modules/activiti-bpmn-model/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -20,6 +20,30 @@
     </dependency>         
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <repositories>
     <!-- This repo declaration is here for as this will be part of the distro -->
     <repository>

diff --git a/modules/activiti-cactus/pom.xml b/modules/activiti-cactus/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/modules/activiti-camel/pom.xml b/modules/activiti-camel/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
 

diff --git a/modules/activiti-cdi/pom.xml b/modules/activiti-cdi/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
 

diff --git a/modules/activiti-cxf/pom.xml b/modules/activiti-cxf/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
 
   </parent>
 

diff --git a/modules/activiti-engine/pom.xml b/modules/activiti-engine/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java b/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java
@@ -49,7 +49,7 @@
 public interface ProcessEngine extends EngineServices {
 
   /** the version of the activiti library */
-  public static String VERSION = "5.11-SNAPSHOT";
+  public static String VERSION = "5.12-SNAPSHOT";
 
   /** The name as specified in 'process-engine-name' in 
    * the activiti.cfg.xml configuration file.

diff --git a/.../activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql b/.../activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

diff --git a/...s/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql b/...s/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

diff --git a/...ctiviti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql b/...ctiviti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

diff --git a/...ctiviti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql b/...ctiviti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

diff --git a/...tiviti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql b/...tiviti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

diff --git a/...viti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql b/...viti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

diff --git a/modules/activiti-explorer/pom.xml b/modules/activiti-explorer/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -141,6 +141,30 @@
     </dependency>
 
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
   <repositories>
     <repository>