Release notes + migration docs changed for Activiti 6 Beta 1 release

distro/build.xml

@@ -86,6 +86,12 @@
 			<fileset dir="../modules/activiti5-engine/target">
 				<include name="activiti5-engine-*.jar" />
 			</fileset>
+			<fileset dir="../modules/activiti5-spring-compatibility/target">
+				<include name="activiti5-spring-compatibility-*.jar" />
+			</fileset>
+			<fileset dir="../modules/activiti5-spring/target">
+				<include name="activiti5-spring-*.jar" />
+			</fileset>
 			<fileset dir="../modules/activiti-bpmn-layout/target">
 				<include name="activiti-bpmn-layout-*.jar" />
 			</fileset>

distro/src/readme.html

@@ -36,10 +36,9 @@ <h1>Activiti Release Notes</h1>
 
 <h3>Release Notes - Activiti - 6.0.0.Beta1</h3>
 
-<h4>Backwards incompatible changes</h4>
-<ul>
-    <li><a href="https://activiti.atlassian.net/browse/ACT-2186">https://activiti.atlassian.net/browse/ACT-2186</a> : When variables are removed, the historic variable entry is also removed. In earlier versions, the value of the historic variable was set to <i>null</i>.</li>
-</ul>
+<p>First public release of the new major version of Activiti. We are looking for feedback from the community, particularly to test the Activiti 5 compatibility.
+We removed the Vaadin based Activiti Explorer from this release and it's replaced with a fully new Angular UI application.
+For more details about the Activiti 5 to 6 migration you can read the migration.html file in the docs/userguide folder.</p>
 
 <h3>Release Notes - Activiti - Version 5.18.0</h3>
 

modules/activiti-ui/activiti-app-rest/pom.xml

@@ -73,6 +73,18 @@
 		</dependency>
 
 		<!-- JSON -->
+		<dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+		<dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+		<dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-json-org</artifactId>

modules/activiti-ui/pom.xml

@@ -211,6 +211,11 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>

pom.xml

@@ -767,6 +767,8 @@
         <module>modules/activiti-spring</module>
         <module>modules/activiti5-engine</module>
         <module>modules/activiti5-compatibility</module>
+        <module>modules/activiti5-spring</module>
+        <module>modules/activiti5-spring-compatibility</module>
         <module>modules/activiti-spring-boot</module>
         <module>modules/activiti-cxf</module>
         <module>modules/activiti-mule</module>
@@ -908,6 +910,8 @@
         <module>modules/activiti-spring</module>
         <module>modules/activiti5-engine</module>
         <module>modules/activiti5-compatibility</module>
+        <module>modules/activiti5-spring</module>
+        <module>modules/activiti5-spring-compatibility</module>
         <module>modules/activiti-spring-boot</module>
         <module>modules/activiti-common-rest</module>
         <module>modules/activiti-rest</module>
@@ -972,6 +976,9 @@
     </profile>
     <profile>
         <id>java8</id>
+        <activation>
+            <jdk>1.8</jdk>                
+        </activation>
         <build>
             <plugins>
               <plugin>

userguide/src/en/migration.adoc

@@ -1,5 +1,5 @@
 = Activiti Migraton Guide : Activiti v5 to Activiti v6
-v  6.0.0-SNAPSHOT
+v  6.0.0.Beta1
 :doctype: book
 :toc: left
 :toclevels: 5
@@ -58,6 +58,12 @@ ProcessDefinitionUtil.getBpmnModel(String processDefinitionId);
 ProcessDefinitionUtil.getProcess(String processDefinitionId);
 ----
 
+=== ActivityExecution is replaced by DelegateExecution
+
+We removed ActivityExecution and replaced it where used with the DelegateExecution class.
+
+All methods from the ActivityExecution class are copied to the DelegateExecution class. 
+
 === Signaling an execution
 
 In version 5, there always was confusion about _signaling an execution_, when using for example _runtimeService.signal(executionI);_. As a _signal_ is a valid BPMN 2.0 concept and feature, it conflicts conceptually.
@@ -74,7 +80,7 @@ In version 5, the delegate classes like _JavaDelegate_ and _ActivityBevior_ had
 
 _org.activiti.engine.impl.pvm.delegate.ActivityBehavior_ has changed package and lives now in _org.activiti.engine.impl.delegate_.
 
-The following methods have been removed from _ActivityExecution_:
+The following methods have been removed from _DelegateExecution_:
 
 * end()
 * createdExecution()
@@ -103,7 +109,6 @@ All related classes that used the term 'persistent object' have been refactored
 
 The following changes will most likely be applied in a next beta release of Activiti v6:
 
-* _org.activiti.engine.impl.delegate.ActivityExecution_ (which is passed for example in ActivityBehaviour) will be removed and replaced by _org.activiti.engine.delegate.DelegateExecution_. The original idea was that ActivityBehavior and JavaDelegate would have different use cases and thus the need for different interfaces, but practice has shown that this does not matter.
 * The entity cache that is created and used during the execution of a command will be moved up the hierarchy, to be at the same level as the entity managers.
 * The persistence operations will be moved to a separate interface out of the EntityManager classes to allow pluggability.
 
@@ -134,3 +139,16 @@ repositoryService.createDeployment()
       .deploymentProperty(DeploymentProperties.DEPLOY_AS_ACTIVITI5_PROCESS_DEFINITION, Boolean.TRUE)
       .deploy();
 ----
+
+If you are using the Activiti Spring module additional configuration is needed if you want Activiti 5 compatibility:
+
+----
+<property name="activiti5CompatibilityEnabled" value="true" />
+<property name="activiti5CompatibilityHandlerFactory" ref="activiti5CompabilityFactory" />
+
+....
+
+<bean id="activiti5CompabilityFactory" class="org.activiti.compatibility.spring.SpringActiviti5CompatibilityHandlerFactory" />
+----
+
+*and* add the *activiti5-spring* and *activiti5-spring-compatibility* jars to your classpath (manually or through a dependency mechanism like Maven)..