diff --git a/distro/build.xml b/distro/build.xml index 013378a8ea84941bd198d1b0eade95a0be2766fc..dc4477b1d40ccdc2194c6fa1bdc42938a6fa4b06 100644 --- a/distro/build.xml +++ b/distro/build.xml @@ -4,7 +4,7 @@ - + diff --git a/distro/src/notice.txt b/distro/src/notice.txt index 0aae911cd2c93d17afb9318f3444d944d72c68fd..1af4f04fae158db0cf554c5e65ece8ab5146678d 100644 --- 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.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 diff --git a/modules/activiti-bpmn-converter/pom.xml b/modules/activiti-bpmn-converter/pom.xml index a62f27fd023d8c570b984e603100468ad045f206..838cd335d8b995781b446dd366c29866e85b0cce 100644 --- a/modules/activiti-bpmn-converter/pom.xml +++ b/modules/activiti-bpmn-converter/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-bpmn-layout/pom.xml b/modules/activiti-bpmn-layout/pom.xml index 8e9ab5b1eb7df13663122296c1888121b2532135..988a5c0a8eb1192e7fac52ff9311598959db3d7c 100644 --- a/modules/activiti-bpmn-layout/pom.xml +++ b/modules/activiti-bpmn-layout/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-bpmn-model/pom.xml b/modules/activiti-bpmn-model/pom.xml index d3d9e6d1267456a78faa58b224261ce571a80c6d..4feb93b2ff8b7011812bb0530f0775773c5b1cf8 100644 --- a/modules/activiti-bpmn-model/pom.xml +++ b/modules/activiti-bpmn-model/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-cactus/pom.xml b/modules/activiti-cactus/pom.xml index f2eb189d785c5fc35a95895055296420af0efb82..2752a3d8a9e1c1652bace70c9355af5579c5ecac 100644 --- a/modules/activiti-cactus/pom.xml +++ b/modules/activiti-cactus/pom.xml @@ -12,7 +12,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-camel/pom.xml b/modules/activiti-camel/pom.xml index fa292915244afe0a95fe61b6141a2d7b7c97560f..7a5078331ea3b7025f0d1c873b80cf78fcf901e1 100644 --- a/modules/activiti-camel/pom.xml +++ b/modules/activiti-camel/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-cdi/pom.xml b/modules/activiti-cdi/pom.xml index 7e1bc6c2fedecde7fa2fd2c15e7f2b84e4fefa78..511186fecc05ec8ca6f2c90e7c37a8d01f9d7468 100644 --- a/modules/activiti-cdi/pom.xml +++ b/modules/activiti-cdi/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-common-rest/pom.xml b/modules/activiti-common-rest/pom.xml index 2b98c4653d35b4194b64688ab3a9eb7ddaed4645..eb7f9f580a67abda9f2764efec90b262eaf1a933 100644 --- a/modules/activiti-common-rest/pom.xml +++ b/modules/activiti-common-rest/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-cxf/pom.xml b/modules/activiti-cxf/pom.xml index 67a4653f4685522f009b40281e59205265c8e4fe..a3943c61c6be49158a1d047f993c605150ea9920 100644 --- a/modules/activiti-cxf/pom.xml +++ b/modules/activiti-cxf/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-diagram-rest/pom.xml b/modules/activiti-diagram-rest/pom.xml index 44e2b9eea11b7407871f739d315a70836bf37b5c..dff17d43e72a076613856954c9b8eabbb0a2d6ff 100644 --- a/modules/activiti-diagram-rest/pom.xml +++ b/modules/activiti-diagram-rest/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-engine/pom.xml b/modules/activiti-engine/pom.xml index 149177db4071902bca676318e9a8b4839d01292e..5839cb07e5500b61ddca7ea254e0764f6f29a59f 100644 --- a/modules/activiti-engine/pom.xml +++ b/modules/activiti-engine/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 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 index 7b70946aa8165f9217deff8decbe1ef9046c4f10..4925ad3bfa990412b153e16facc7ecf5ec86c50d 100644 --- 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 @@ 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. diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql index d248f9ebbad9fc600bab5f4a2c3fca9b38459226..913355bea28744dcb6592ec7e35b1037a0b47cd4 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql +++ b/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); diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql index 2863d890112e7fb0f488a0667a07e162895e46cd..1557a7c4ac024162b2a57be2439e3488b9726b8d 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql +++ b/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); diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql index 56bc8d05c08e99403195187aee2567199869126b..ee4e8001651f31def417ff386678d8369b1f4385 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql +++ b/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); diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql index e2ef73eba49f849d3a358eca8c40409ec7affea3..394ee1f9a8de84c2ddfb00f102010372d56e2dc2 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql +++ b/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); diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql index c5a97608caa1357aa4074f57e52b54dc19a40bca..952fede721a5283ac5beb0cddcb1067c0bcd7b4d 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql +++ b/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); diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql index c5f099c4cafab29b32073dd2d63c0471108eaff7..f76917a5f4d6ee3b650bad781849903beae5a149 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql +++ b/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); diff --git a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowBean.java b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowBean.java new file mode 100644 index 0000000000000000000000000000000000000000..d223631137a8573cbfa0a6525235968a19244ce9 --- /dev/null +++ b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowBean.java @@ -0,0 +1,19 @@ +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; + } + } +} diff --git a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.java b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.java new file mode 100644 index 0000000000000000000000000000000000000000..d5eea42701f4e7d77d2d23ab2c6976376bffc915 --- /dev/null +++ b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.java @@ -0,0 +1,46 @@ +/* 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 variableMap = new HashMap(); + 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 conditions = (List) variable.getValue(); + assertEquals(2, conditions.size()); + assertEquals("hello", conditions.get(0)); + assertEquals("world", conditions.get(1)); + } +} diff --git a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomSequenceFlowBpmnParseHandler.java b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomSequenceFlowBpmnParseHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..358e6f9daa3aa5994e637874021c1188ce1e68ba --- /dev/null +++ b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomSequenceFlowBpmnParseHandler.java @@ -0,0 +1,49 @@ +/* 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> extensionElements = flow.getExtensionElements(); + if (extensionElements.containsKey("activiti_custom_condition")) { + List 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); + } + } + +} diff --git a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomSetConditionsExecutionListener.java b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomSetConditionsExecutionListener.java new file mode 100644 index 0000000000000000000000000000000000000000..7babd483cb23540c1b756cc11a56b751b9229f60 --- /dev/null +++ b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomSetConditionsExecutionListener.java @@ -0,0 +1,41 @@ +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 conditions = new ArrayList(); + protected String flowId; + + @Override + public void notify(DelegateExecution execution) throws Exception { + execution.setVariable(flowId + "_activiti_conditions", conditions); + } + + public List getConditions() { + return conditions; + } + + public void setConditions(List 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; + } + +} diff --git a/modules/activiti-engine/src/test/resources/log4j.properties b/modules/activiti-engine/src/test/resources/log4j.properties index 44b10c43d037452fd5e895f48d931c7ca00b5f66..8dba0edd4070c0cd021d895c1c55f33eae44f4e0 100644 --- a/modules/activiti-engine/src/test/resources/log4j.properties +++ b/modules/activiti-engine/src/test/resources/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootLogger=DEBUG, CA +log4j.rootLogger=INFO, CA # ConsoleAppender log4j.appender.CA=org.apache.log4j.ConsoleAppender diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.bpmn20.xml new file mode 100644 index 0000000000000000000000000000000000000000..403f860f66f345a06dc108e101ce57c0198689b4 --- /dev/null +++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/executionlistener/CustomFlowExecutionListenerTest.bpmn20.xml @@ -0,0 +1,23 @@ + + + + + + + + + hello + world + + + + + + + + + + \ No newline at end of file diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/executionlistener/custom.flow.parse.handler.activiti.cfg.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/executionlistener/custom.flow.parse.handler.activiti.cfg.xml new file mode 100644 index 0000000000000000000000000000000000000000..5f618d447835ff3c63b5c393dea25847d275c111 --- /dev/null +++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/executionlistener/custom.flow.parse.handler.activiti.cfg.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/activiti-explorer/pom.xml b/modules/activiti-explorer/pom.xml index 33378a8f033090335adf68853ded2fe8d0ab3ef2..64b19df3734c88e3bd7c317334755ad0e9657c8b 100644 --- a/modules/activiti-explorer/pom.xml +++ b/modules/activiti-explorer/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-json-converter/pom.xml b/modules/activiti-json-converter/pom.xml index 31d9fb9cfb76381c153de1adf160511275994044..e76f93aae01386c14e8fad715f881d2cacf151be 100644 --- a/modules/activiti-json-converter/pom.xml +++ b/modules/activiti-json-converter/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-ldap/pom.xml b/modules/activiti-ldap/pom.xml index c7f604a3b96bc35aa300ebc1d11b43a2cdf92705..2ac82c4c33a46a78a4ef981108a02f6474c55a25 100644 --- a/modules/activiti-ldap/pom.xml +++ b/modules/activiti-ldap/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-modeler/pom.xml b/modules/activiti-modeler/pom.xml index 151f3d7769f93ddb3f2c06f6eceb143fa9be45fe..f91aa672c4d80eb608d4c3bdb28f10c2b2fe4bf4 100644 --- a/modules/activiti-modeler/pom.xml +++ b/modules/activiti-modeler/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-mule/pom.xml b/modules/activiti-mule/pom.xml index 746ce06d5d752265a34f17e47241c30af93d24bc..90be0f49260442254417b66d90b27dc4db6a6bbe 100644 --- a/modules/activiti-mule/pom.xml +++ b/modules/activiti-mule/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-osgi/pom.xml b/modules/activiti-osgi/pom.xml index 2de6e7dd89191e6daa5f1ee91112e0cd167c96b7..f950f03ad1df5cdc2ecc061cf8b4216e45841e5b 100644 --- a/modules/activiti-osgi/pom.xml +++ b/modules/activiti-osgi/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-rest/pom.xml b/modules/activiti-rest/pom.xml index 85b1abf3ee5aded100713164fc448bf3dd9bad8f..57f52e09ed3a762525ea76cee7527f6b46d63387 100644 --- a/modules/activiti-rest/pom.xml +++ b/modules/activiti-rest/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-simple-workflow-alfresco/pom.xml b/modules/activiti-simple-workflow-alfresco/pom.xml index fe0ce1eb147095aa75bb845f2c38211b33e2e8ab..7941a10df60d0f0ef94ebcac04cd85f2ddbf744e 100644 --- a/modules/activiti-simple-workflow-alfresco/pom.xml +++ b/modules/activiti-simple-workflow-alfresco/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-simple-workflow/pom.xml b/modules/activiti-simple-workflow/pom.xml index 499fe7efbc77496c74215e8123ab46d83df64dae..72d7c0b353d61d4d885da4077c9ba0bc1d424405 100644 --- a/modules/activiti-simple-workflow/pom.xml +++ b/modules/activiti-simple-workflow/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-spring/pom.xml b/modules/activiti-spring/pom.xml index 19920b15f8c686816d3a4d3eb92c01168e49a774..95a0066289edf40d195e03a1ab180abaccd0d6aa 100644 --- a/modules/activiti-spring/pom.xml +++ b/modules/activiti-spring/pom.xml @@ -9,7 +9,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-webapp-angular/pom.xml b/modules/activiti-webapp-angular/pom.xml index 32ddcb957820e4ea0044c274a097fe385095f359..10c54e6f9c7a5731bbccc91e5f7277930afe39fc 100644 --- a/modules/activiti-webapp-angular/pom.xml +++ b/modules/activiti-webapp-angular/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-webapp-explorer2/pom.xml b/modules/activiti-webapp-explorer2/pom.xml index 839327cabecafbda139d1d8022f90e72f75e6d42..eeda9ef2f81c99d3bb18bac11889100b5180d115 100644 --- a/modules/activiti-webapp-explorer2/pom.xml +++ b/modules/activiti-webapp-explorer2/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/modules/activiti-webapp-rest2/pom.xml b/modules/activiti-webapp-rest2/pom.xml index 78284e8f18ecd942a046915a27d67bdcefff3384..175aece981638339545703b4cdc3b97bc4180f85 100644 --- a/modules/activiti-webapp-rest2/pom.xml +++ b/modules/activiti-webapp-rest2/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/pom.xml b/pom.xml index 8761e7cac47d897bf7c2d031e0e15ec54e61a213..d4b9c5bb123b9d66d3c60698bf127791501fdac2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ activiti-root pom - 5.14-SNAPSHOT + 5.14 UTF-8 3.1.2.RELEASE diff --git a/qa/build.xml b/qa/build.xml index 2097419154295b513b92975a35eef0b326a702e6..71a12c9e8a910d2af873ccd97129cbe9c2cbac83 100644 --- a/qa/build.xml +++ b/qa/build.xml @@ -4,7 +4,7 @@ - + diff --git a/qa/dbclean/pom.xml b/qa/dbclean/pom.xml index bd4a8a78dc163320c763998ab39d2aa4506052c3..b5981500c8b6a09618514e08aaba2cc01de248da 100644 --- a/qa/dbclean/pom.xml +++ b/qa/dbclean/pom.xml @@ -8,7 +8,7 @@ activiti-dbclean pom - 5.14-SNAPSHOT + 5.14 diff --git a/qa/upgrade/build.xml b/qa/upgrade/build.xml index 2582911f09baa0d7079d0bd50974233429073701..0f032f18186f69f6fb60d85d392b2354557e3079 100644 --- a/qa/upgrade/build.xml +++ b/qa/upgrade/build.xml @@ -2,7 +2,7 @@ - + diff --git a/qa/upgrade/pom.xml b/qa/upgrade/pom.xml index 3f81229036be11be2bff73920b919936da6ee931..fb4c6ab4cb91e1aed2a29d5fd66b1523ec4e4cfd 100644 --- a/qa/upgrade/pom.xml +++ b/qa/upgrade/pom.xml @@ -6,13 +6,13 @@ Activiti - Upgrade Fetcher org.activiti activiti-upgrade-fetcher - 5.14-SNAPSHOT + 5.14 org.activiti activiti-root ../.. - 5.14-SNAPSHOT + 5.14 diff --git a/userguide/src/en/chapters/ch14-REST.xml b/userguide/src/en/chapters/ch14-REST.xml index b444f9681540e0761a7b5f5850c41b7b526b9d05..4343715c6feac114c9c2e1d964ce3d14ab520c4c 100644 --- a/userguide/src/en/chapters/ch14-REST.xml +++ b/userguide/src/en/chapters/ch14-REST.xml @@ -9438,8 +9438,8 @@ Only the attachment name is required to create a new attachment. { "next.dbid":"101", - "schema.history":"create(5.14-SNAPSHOT)", - "schema.version":"5.14-SNAPSHOT" + "schema.history":"create(5.14)", + "schema.version":"5.14" } Get engine properties - Response codes @@ -9473,7 +9473,7 @@ Only the attachment name is required to create a new attachment. { "name":"default", - "version":"5.14-SNAPSHOT", + "version":"5.14", "resourceUrl":"file://activiti/activiti.cfg.xml", "exception":null } @@ -11128,7 +11128,7 @@ Only the attachment name is required to create a new attachment.
Legacy REST - General Usage - 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. + 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. 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. diff --git a/userguide/src/en/chapters/ch16-Ldap.xml b/userguide/src/en/chapters/ch16-Ldap.xml index 989fc6b52474859b0628afb2be78330eec07b848..b1718e57cb5f4f2a12badae2649ca90eb638dcef 100644 --- a/userguide/src/en/chapters/ch16-Ldap.xml +++ b/userguide/src/en/chapters/ch16-Ldap.xml @@ -6,13 +6,13 @@ 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. - 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. diff --git a/userguide/src/en/index.xml b/userguide/src/en/index.xml index d41f1b5457e4b25ab1a3890d64bbbed1206491c2..2f0ca21f5665075df000250b9deedf4b79fb1ab8 100644 --- a/userguide/src/en/index.xml +++ b/userguide/src/en/index.xml @@ -22,7 +22,7 @@ - Activiti 5.14-SNAPSHOT User Guide + Activiti 5.14 User Guide