Moved version to 5.14

distro/build.xml

@@ -4,7 +4,7 @@
 
 	<property file="${user.home}/.activiti/build.properties" />
 
-	<property name="activiti.version" value="5.14-SNAPSHOT" />
+	<property name="activiti.version" value="5.14" />
 	<property name="target.distro.root" value="target/zip/activiti-${activiti.version}" />
 	<property name="activiti.website" value="../../activiti-website" />
 

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.14-SNAPSHOT.jar in package org.activiti.engine.impl.juel
+ * Included in activiti-engine-5.14.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.14-SNAPSHOT.jar in package org.activiti.engine.impl.calendar
+ * CronExpression is included in activiti-engine-5.14.jar in package org.activiti.engine.impl.calendar
  * License: Apache V2
 
 JSON
  * Location: http://www.JSON.org/java
- * Included in activiti-engine-5.14-SNAPSHOT.jar in package org.activiti.engine.impl.json
+ * Included in activiti-engine-5.14.jar in package org.activiti.engine.impl.json
  * License:
 ===============================================================================
 Copyright (c) 2002 JSON.org

modules/activiti-bpmn-converter/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
   
   <properties>

modules/activiti-bpmn-layout/pom.xml

@@ -10,7 +10,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.14-SNAPSHOT</version>
+		<version>5.14</version>
 	</parent>
 
 	<build>

modules/activiti-bpmn-model/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
   
   <properties>

modules/activiti-cactus/pom.xml

@@ -12,7 +12,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <dependencies>

modules/activiti-camel/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
 

modules/activiti-cdi/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
 

modules/activiti-common-rest/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <properties>

modules/activiti-cxf/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
 
   </parent>
 

modules/activiti-diagram-rest/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <properties>

modules/activiti-engine/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <dependencies>

modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java

@@ -49,7 +49,7 @@ package org.activiti.engine;
 public interface ProcessEngine extends EngineServices {
 
   /** the version of the activiti library */
-  public static String VERSION = "5.14-SNAPSHOT";
+  public static String VERSION = "5.14";
 
   /** The name as specified in 'process-engine-name' in 
    * the activiti.cfg.xml configuration file.

modules/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.14-SNAPSHOT', 1);
+values ('schema.version', '5.14', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.14-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.14)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/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.14-SNAPSHOT', 1);
+values ('schema.version', '5.14', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.14-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.14)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-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.14-SNAPSHOT', 1);
+values ('schema.version', '5.14', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.14-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.14)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-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.14-SNAPSHOT', 1);
+values ('schema.version', '5.14', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.14-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.14)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-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.14-SNAPSHOT', 1);
+values ('schema.version', '5.14', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.14-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.14)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-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.14-SNAPSHOT', 1);
+values ('schema.version', '5.14', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.14-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.14)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowBean.java

+package org.activiti.examples.bpmn.executionlistener;
+
+import java.io.Serializable;
+
+import org.activiti.engine.delegate.DelegateExecution;
+
+public class CustomFlowBean implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  public boolean executeLogic(String flowId, DelegateExecution execution) {
+    Object conditionsObject = execution.getVariable(flowId + "_activiti_conditions");
+    if (conditionsObject != null) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+}

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.java

+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.activiti.examples.bpmn.executionlistener;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.history.HistoricVariableInstance;
+import org.activiti.engine.impl.test.ResourceActivitiTestCase;
+import org.activiti.engine.test.Deployment;
+
+/**
+ * @author Tijs Rademakers
+ */
+public class CustomFlowExecutionListenerTest extends ResourceActivitiTestCase {
+  
+  public CustomFlowExecutionListenerTest() {
+    super("org/activiti/examples/bpmn/executionlistener/custom.flow.parse.handler.activiti.cfg.xml");
+  }
+
+	@Deployment(resources = { "org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.bpmn20.xml" })
+	public void testScriptExecutionListener() {
+	  Map<String, Object> variableMap = new HashMap<String, Object>();
+	  variableMap.put("customFlowBean", new CustomFlowBean());
+		runtimeService.startProcessInstanceByKey("scriptExecutionListenerProcess", variableMap);
+		HistoricVariableInstance variable = historyService.createHistoricVariableInstanceQuery().variableName("flow1_activiti_conditions").singleResult();
+		assertNotNull(variable);
+		assertEquals("flow1_activiti_conditions", variable.getVariableName());
+		@SuppressWarnings("unchecked")
+    List<String> conditions = (List<String>) variable.getValue();
+		assertEquals(2, conditions.size());
+		assertEquals("hello", conditions.get(0));
+		assertEquals("world", conditions.get(1));
+	}
+}

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomSequenceFlowBpmnParseHandler.java

+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.activiti.examples.bpmn.executionlistener;
+
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.bpmn.model.ExtensionElement;
+import org.activiti.bpmn.model.SequenceFlow;
+import org.activiti.engine.impl.bpmn.parser.BpmnParse;
+import org.activiti.engine.impl.bpmn.parser.handler.SequenceFlowParseHandler;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+
+
+/**
+ * @author Tijs Rademakers
+ */
+public class CustomSequenceFlowBpmnParseHandler extends SequenceFlowParseHandler {
+  
+  protected void executeParse(BpmnParse bpmnParse, SequenceFlow flow) {
+    
+    // Do the regular stuff
+    super.executeParse(bpmnParse, flow);
+    
+    // Add extension element conditions
+    Map<String, List<ExtensionElement>> extensionElements = flow.getExtensionElements();
+    if (extensionElements.containsKey("activiti_custom_condition")) {
+      List<ExtensionElement> conditionsElements = extensionElements.get("activiti_custom_condition");
+      CustomSetConditionsExecutionListener customFlowListener = new CustomSetConditionsExecutionListener();
+      customFlowListener.setFlowId(flow.getId());
+      for (ExtensionElement conditionElement : conditionsElements) {
+        customFlowListener.addCondition(conditionElement.getElementText());
+      }
+      ActivityImpl activity = findActivity(bpmnParse, flow.getSourceRef());
+      activity.addExecutionListener("start", customFlowListener);
+    }
+  }
+
+}

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomSetConditionsExecutionListener.java

+package org.activiti.examples.bpmn.executionlistener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+
+public class CustomSetConditionsExecutionListener implements ExecutionListener {
+
+  private static final long serialVersionUID = 1L;
+  
+  protected List<String> conditions = new ArrayList<String>();
+  protected String flowId;
+
+  @Override
+  public void notify(DelegateExecution execution) throws Exception {
+    execution.setVariable(flowId + "_activiti_conditions", conditions);
+  }
+
+  public List<String> getConditions() {
+    return conditions;
+  }
+
+  public void setConditions(List<String> conditions) {
+    this.conditions = conditions;
+  }
+  
+  public void addCondition(String condition) {
+    this.conditions.add(condition);
+  }
+
+  public String getFlowId() {
+    return flowId;
+  }
+
+  public void setFlowId(String flowId) {
+    this.flowId = flowId;
+  }
+  
+}

modules/activiti-engine/src/test/resources/log4j.properties

-log4j.rootLogger=DEBUG, CA
+log4j.rootLogger=INFO, CA
 
 # ConsoleAppender
 log4j.appender.CA=org.apache.log4j.ConsoleAppender

modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.bpmn20.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" 
+   xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
+   xmlns:test="http://activiti.org/test" 
+   typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="Examples">
+
+	<process id="scriptExecutionListenerProcess" name="Script Execution Listener Example">
+		<startEvent id="startevent1" name="Start"></startEvent>
+			
+		<sequenceFlow id="flow1" name="Flow 1" sourceRef="startevent1" targetRef="endevent1">
+      <extensionElements>
+				<test:activiti_custom_condition>hello</test:activiti_custom_condition>
+        <test:activiti_custom_condition>world</test:activiti_custom_condition>
+			</extensionElements>
+      <conditionExpression xsi:type="tFormalExpression">
+        <![CDATA[${customFlowBean.executeLogic('flow1', execution)}]]>
+      </conditionExpression>
+		</sequenceFlow>
+		
+		<endEvent id="endevent1" name="End"></endEvent>
+	  
+	</process>
+</definitions>
\ No newline at end of file

modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/executionlistener/custom.flow.parse.handler.activiti.cfg.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+  <bean id="processEngineConfiguration" class="org.activiti.engine.impl.cfg.StandaloneInMemProcessEngineConfiguration">
+  
+    <!-- Database configurations -->
+    <property name="history" value="audit" />
+    <property name="databaseSchemaUpdate" value="true" />
+    
+    <!-- job executor configurations -->
+    <property name="jobExecutorActivate" value="false" />
+    
+    <property name="customDefaultBpmnParseHandlers">
+      <list>
+        <bean class="org.activiti.examples.bpmn.executionlistener.CustomSequenceFlowBpmnParseHandler" />
+      </list>
+    </property>
+    
+  </bean>
+
+</beans>

modules/activiti-explorer/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <properties>

modules/activiti-json-converter/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <dependencies>

modules/activiti-ldap/pom.xml

@@ -10,7 +10,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.14-SNAPSHOT</version>
+		<version>5.14</version>
 	</parent>
   
   <properties>

modules/activiti-modeler/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <properties>

modules/activiti-mule/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
 
   </parent>
 

modules/activiti-osgi/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <build>

modules/activiti-rest/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <properties>

modules/activiti-simple-workflow-alfresco/pom.xml

@@ -10,7 +10,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.14-SNAPSHOT</version>
+		<version>5.14</version>
 	</parent>
 
 	<dependencies>

modules/activiti-simple-workflow/pom.xml

@@ -10,7 +10,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.14-SNAPSHOT</version>
+		<version>5.14</version>
 	</parent>
 
 	<dependencies>

modules/activiti-spring/pom.xml

@@ -9,7 +9,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.14-SNAPSHOT</version>
+		<version>5.14</version>
 	</parent>
 
 	<dependencies>

modules/activiti-webapp-angular/pom.xml

@@ -10,7 +10,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.14-SNAPSHOT</version>
+		<version>5.14</version>
 	</parent>
 
 	<build>

modules/activiti-webapp-explorer2/pom.xml

@@ -11,7 +11,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.14-SNAPSHOT</version>
+		<version>5.14</version>
 	</parent>
 
 	<properties>

modules/activiti-webapp-rest2/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <build>

pom.xml

@@ -8,7 +8,7 @@
   <artifactId>activiti-root</artifactId>
 
   <packaging>pom</packaging>
-  <version>5.14-SNAPSHOT</version>
+  <version>5.14</version>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spring.framework.version>3.1.2.RELEASE</spring.framework.version>

qa/build.xml

@@ -4,7 +4,7 @@
   	
   <property file="${user.home}/.activiti/build.properties" />
   <property file="../distro/src/setup/build.properties" />
-  <property name="activiti.version" value="5.14-SNAPSHOT" />
+  <property name="activiti.version" value="5.14" />
   <property name="activiti.home" value="../distro/target/activiti-${activiti.version}" /> 
   <property name="macos.browser" value="/usr/bin/open" />
   <property name="windows.browser" value="C:/Program Files/Mozilla Firefox/firefox.exe" />

qa/dbclean/pom.xml

@@ -8,7 +8,7 @@
   <artifactId>activiti-dbclean</artifactId>
 
   <packaging>pom</packaging>
-  <version>5.14-SNAPSHOT</version>
+  <version>5.14</version>
 
   <dependencies>
     <dependency>

qa/upgrade/build.xml

@@ -2,7 +2,7 @@
 <project name="activiti.qa.upgrade" default="upgrade">
 	
   <property file="${user.home}/.activiti/build.properties" />
-  <property name="activiti.version" value="5.14-SNAPSHOT" />
+  <property name="activiti.version" value="5.14" />
   <property name="database" value="h2" />
   <property name="activiti.old.version" value="5.0" />
   <property name="downloads.dir" value="${user.home}/.activiti/downloads" />

qa/upgrade/pom.xml

@@ -6,13 +6,13 @@
   <name>Activiti - Upgrade Fetcher</name>
   <groupId>org.activiti</groupId>
   <artifactId>activiti-upgrade-fetcher</artifactId>
-  <version>5.14-SNAPSHOT</version>
+  <version>5.14</version>
 
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.14-SNAPSHOT</version>
+    <version>5.14</version>
   </parent>
 
   <dependencies>

userguide/src/en/chapters/ch14-REST.xml

@@ -9438,8 +9438,8 @@ Only the attachment name is required to create a new attachment.
             <programlisting>
 {
    "next.dbid":"101",
-   "schema.history":"create(5.14-SNAPSHOT)",
-   "schema.version":"5.14-SNAPSHOT"
+   "schema.history":"create(5.14)",
+   "schema.version":"5.14"
 }</programlisting>
           <table>
               <title>Get engine properties - Response codes</title>
@@ -9473,7 +9473,7 @@ Only the attachment name is required to create a new attachment.
             <programlisting>
 {
    "name":"default",
-   "version":"5.14-SNAPSHOT",
+   "version":"5.14",
    "resourceUrl":"file://activiti/activiti.cfg.xml",
    "exception":null
 }</programlisting>
@@ -11128,7 +11128,7 @@ Only the attachment name is required to create a new attachment.
   <section>
 
     <title>Legacy REST - General Usage</title>
-    <para><emphasis role="bold">The folowing section contains documentation of the Legacy REST-api, which has been deprecated since the 5.14-SNAPSHOT release. The REST-urls will not be removed in the future but will not be maintained. Any future additions and improvements will be done to the new REST API.</emphasis></para>
+    <para><emphasis role="bold">The folowing section contains documentation of the Legacy REST-api, which has been deprecated since the 5.14 release. The REST-urls will not be removed in the future but will not be maintained. Any future additions and improvements will be done to the new REST API.</emphasis></para>
     <para>
       Activiti includes a REST API to the Activiti Engine that can be installed by deploying the activiti-rest.war file to a servlet container like Apache Tomcat.
       By default the Activiti Engine will connect to a standalone H2 database. You can change the database settings in the db.properties file in the WEB-INF/classes folder.

userguide/src/en/chapters/ch16-Ldap.xml

@@ -6,13 +6,13 @@
 
     <para>
         Companies often already have a user and group store in the form of an LDAP system.
-        Since version 5.14-SNAPSHOT, Activiti offers an out-of-the-box solution for easily configuring 
+        Since version 5.14, Activiti offers an out-of-the-box solution for easily configuring 
         how Activiti should connect with an LDAP system.  
     </para>
     
     <para>
-       Before Activiti 5.14-SNAPSHOT, it was already possible to integrate LDAP with Activiti.
-       However, as of 5.14-SNAPSHOT, the configuration has been simplified a lot. However, the 'old' way
+       Before Activiti 5.14, it was already possible to integrate LDAP with Activiti.
+       However, as of 5.14, the configuration has been simplified a lot. However, the 'old' way
        of configuring LDAP still works. More specifically, the simplified configuration is
        just a wrapper on top of the 'old' infrastructure.
     </para>

userguide/src/en/index.xml

@@ -22,7 +22,7 @@
 
 <book>
 
-  <bookinfo><title>Activiti 5.14-SNAPSHOT User Guide</title></bookinfo>
+  <bookinfo><title>Activiti 5.14 User Guide</title></bookinfo>
   
   <toc />