diff --git a/distro/build.xml b/distro/build.xml index b4d6d0b7d05ef426d800860fd23c0a5510dbf751..2b5aa563bc5a2b04c21198c6ca1f7d01e2f75694 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 c0cd0f1a9e32d9da7e504762417e113b6f6605ce..2daba72ff07ef65f36fc560947a608a5d8cf45fb 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.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 index c3c42dedc27e90ebefaa6a7df8ced92e6733ebfd..d62f6c04545ab67024734c69a6dfe5b06e122b1b 100644 --- a/distro/src/readme.html +++ b/distro/src/readme.html @@ -20,12 +20,11 @@

Links for demo setup

-

After running the demo setup, +

After installing the Activiti distribution, you can open the Activiti Explorer

@@ -45,7 +44,12 @@

Highlights

    +
  • Added Activiti Modeler to the Activiti Explorer web application
    • +
  • Removed buggy demo script and replaced with simpler distribution
  • Enhanced ability to query for history variable values
    • +
  • Improved functionality to suspend and activate process definitions and instances
    • +
  • Improved Activiti QA and added DB2 and MSSQL servers
    • +
  • Lots of bug fixes

Important upgrade note

@@ -53,7 +57,7 @@ that you can run to generate historic variables for existing process instances. This is optional because the engine will just create those records upon update of the variable if they don't exist.

-

The files can be found in the activiti-engine-5.11.jar file in directory +

The files can be found in the database directory of the Activiti distribution org/activiti/db/upgrade/optional.

@@ -65,6 +69,307 @@ parameter 'suspendProcessInstances' which can be used to get the same behavior: when set to 'true', all the associated process instances will be suspended. This will avoid process instance continuation, including the execution of jobs related to the process instance.

+ +

Bug fixes and various smaller improvements

+

Check out the Release notes for more details

+ +

Sub-task +

+
    +
  • [ACT-1406] - Extend Activiti BPMN XML Schema +
    • +
  • [ACT-1407] - Marshall ID to BPMN when saving +
    • +
  • [ACT-1408] - Read and use ID when parsing BPMN model +
    • +
+ +

Bug +

+
    +
  • [ACT-234] - CompetingJobAcquisitionTest does not work on windows +
    • +
  • [ACT-454] - Variables not being escaped when mail is sent as HTML +
    • +
  • [ACT-700] - Bug in DB2 supporting. +
    • +
  • [ACT-734] - Schema creation in mssql 2005 +
    • +
  • [ACT-785] - User Task Assignments are not handled correctly if the value of an expression holds more than one group-id or user-id +
    • +
  • [ACT-820] - Serializable values altered in scriptTask aren't persisted to DB +
    • +
  • [ACT-847] - activiti:field not injected for tasklistener on event="create" +
    • +
  • [ACT-865] - timeCycle requires seconds to be in the startDate +
    • +
  • [ACT-866] - couldn't deduct database type from database product name 'DB2/LINUXX8664' +
    • +
  • [ACT-870] - Multiple documentation elements not supported +
    • +
  • [ACT-876] - Activiti Designer creates NPE when dragging tab to second window +
    • +
  • [ACT-920] - ActivityException thrown on ProcessEngineConfiguration.buildProcessEngine() +
    • +
  • [ACT-927] - nullpointer on empty sourceref in datainputassociation +
    • +
  • [ACT-934] - Inconsistent procvar behaviour +
    • +
  • [ACT-940] - When starting the demo, support Windows 7 for "explorer.browser.open" +
    • +
  • [ACT-1002] - The Database Specific Statement is not applied in some cases +
    • +
  • [ACT-1057] - Custom tasks in Designer with only BOOLEAN_CHOICE do not write proper XML +
    • +
  • [ACT-1063] - Typo in org.activiti.engine.impl.jobexecutor.TimerDeclarationType#caledarName +
    • +
  • [ACT-1070] - activiti explorer shows mistakenly non-activiti tables if their name starts with 'ACT*' +
    • +
  • [ACT-1083] - Variables stored inside a subprocess are not linked to activity-id's. +
    • +
  • [ACT-1090] - There is not async attribute in activiti XML schema +
    • +
  • [ACT-1102] - Beans specified in activiti.cfg.xml not available in expressions +
    • +
  • [ACT-1130] - Removing identity link does not remove owner in task entity. +
    • +
  • [ACT-1147] - Posting a comment to a task causes an exception (Bad value for type long) (After updating from 5.8 to 5.9) +
    • +
  • [ACT-1174] - historyLevel property not found when creating tables manually +
    • +
  • [ACT-1180] - Add version fixing after running activiti.postgres.upgradestep.58.to.59.engine.sql to avoid the application try to autoupdate schema at restart +
    • +
  • [ACT-1187] - Default image for CustomServiceTasks is not loaded correctly +
    • +
  • [ACT-1189] - displayHelpLong of a custom property is not displayed +
    • +
  • [ACT-1239] - Exclusive gateway: Condition on default flow is not ignored +
    • +
  • [ACT-1251] - Manual upgrade throwing ActivitiWrongDbException +
    • +
  • [ACT-1252] - Signal Events and None intermediate event not rendered during Diagram Generation +
    • +
  • [ACT-1259] - Finishing last task (or signal last receive-task) of process doesn't do optimistic locking +
    • +
  • [ACT-1295] - Error BoundaryEvent in multiInstance call activity does not work as intended +
    • +
  • [ACT-1304] - EnumFormType always returns null when converting model value to form value +
    • +
  • [ACT-1316] - org.activiti.spring.SpringTransactionContext#addTransactionListener, TransactionState.ROLLED_BACK registers listener that is also invoked for successful commit +
    • +
  • [ACT-1320] - Start Timer is executed for suspended process definitions +
    • +
  • [ACT-1321] - Add NOT NULL constraint to PROCDEF table +
    • +
  • [ACT-1328] - Typo : "evalutaing" in JuelExpression +
    • +
  • [ACT-1329] - Add NOT NULL constraint on VERSION_ in PROCDEF table +
    • +
  • [ACT-1331] - RuntimeService.getVariables(String, Collection) retrieves more than the specified variables +
    • +
  • [ACT-1338] - SetProcessDefinitionVersionCmd should update TaskEntity.processDefinitionId as well +
    • +
  • [ACT-1340] - BusinessProcess.isAssociated throws NPE if no execution is associated +
    • +
  • [ACT-1341] - Activiti engine drop statement for MSSQL misses a foreign key constraint +
    • +
  • [ACT-1342] - Suspending a process with active timer can cause AcquireJobsRunnable to get into a loop that causes heavy load on database +
    • +
  • [ACT-1353] - do not generates eventBasedGateway with ProcessDiagramGenerator.generateDiagram +
    • +
  • [ACT-1361] - Broken Build: Activiti webapp REST uses junit but does not declare dependency using maven +
    • +
  • [ACT-1370] - DB2 upgrade failed from 5.9 to 5.10 because missing NOT NULL +
    • +
  • [ACT-1375] - Remove workspace with examples from distribution (maybe replace with website) +
    • +
  • [ACT-1380] - Engine should throw exception when flow out of XOR-Gateway neither has condition nor is default flow +
    • +
  • [ACT-1381] - Add support for SQL pagination in DB2 & MSSQL +
    • +
  • [ACT-1390] - Activiti incorrectly logs SEVERE level messages for expected lock collisions +
    • +
  • [ACT-1391] - Deploying a process with illegal expression doesn't cause deployment to fail +
    • +
  • [ACT-1394] - NullPointerException in UserTaskAssignmentHandler +
    • +
  • [ACT-1402] - Interrupting boundary events don't cancel all parallel sub-process instances in case sub-process is multi-instance +
    • +
  • [ACT-1410] - Executing the TaskService.deleteAttachments(String attachmentId) does not remove the file data from ACT_GE_BYTEARRAY table +
    • +
  • [ACT-1415] - TimeCycle expression is not evaluated on timer-start event +
    • +
  • [ACT-1416] - RepositoryService startableByUser() method not identity-implementation agnostic, using ACT_ID_MEMBERSHIP +
    • +
  • [ACT-1421] - Error Boundary Event - execution not closed properly +
    • +
  • [ACT-1423] - BusinessRuleTask are not converted/exported in between Activiti Modeler and Activiti Engine +
    • +
  • [ACT-1424] - Job timestamp defaults to current date when set to null (MySQL) +
    • +
  • [ACT-1429] - Remaining flowNodeRef when deleting BPMN elements within lanes +
    • +
  • [ACT-1431] - Invalid warning with exception thrown when di information is missing +
    • +
  • [ACT-1434] - Rest call contains incorrect mimetype for resource service +
    • +
  • [ACT-1435] - Exception for Expressions with 2 params in BusinessRule ruleVariablesInput +
    • +
  • [ACT-1436] - Activiti-Rest : Binding error with form properties +
    • +
  • [ACT-1440] - Activiti Explorer : Null Pointer Exception for Users with a Picture +
    • +
  • [ACT-1441] - Eclipse Plugin : Missing a parentheses on a text label. +
    • +
  • [ACT-1442] - EventBasedGateway not drawn in diagram +
    • +
  • [ACT-1444] - Race condition in CallActivityBehavior +
    • +
  • [ACT-1449] - Boundary events in designer are not deleted properly +
    • +
  • [ACT-1455] - Add support to filter on HistoricVariables values on HistoricProcessInstanceQuery +
    • +
  • [ACT-1456] - Add support for processVariableValueEquals(value) +
    • +
  • [ACT-1459] - Add support for filtering queries based on string variable values, ignoring case +
    • +
  • [ACT-1461] - The startableByUser method on the ProcessDefinitionQuery object does not return process definitions records for "candidate starter groups" when a custom session factory has been implemented +
    • +
  • [ACT-1468] - Task query: can't query by process id with ordering by due date +
    • +
+ +

Improvement +

+
    +
  • [ACT-716] - Add log guards to org.activiti.engine.impl.interceptor.LogInterceptor +
    • +
  • [ACT-721] - Usage of Collections.synchronizedMap might cause performance degradation or java deadlock in DbSqlSessionFactory +
    • +
  • [ACT-877] - Allowing expressions in properties of CustomServiceTask +
    • +
  • [ACT-900] - TaskService.deleteTask should allow a reason to be specified +
    • +
  • [ACT-969] - Add description of JavaDelegate implementation for CustomServiceTasks to the user guide +
    • +
  • [ACT-998] - Add a ScripTaskListener +
    • +
  • [ACT-1015] - Process formKey as an expression +
    • +
  • [ACT-1023] - random order in enum fields +
    • +
  • [ACT-1064] - Remove 'selectNextJobsToExecute_mysql' and remove duplicate criterion where clause +
    • +
  • [ACT-1067] - Make BpmnDeployer#addTimerDeclarations and BpmnDeployer#removeObsoleteTimers protected +
    • +
  • [ACT-1112] - Ease integration of Activit Explorer / Split up explorer into a JAR and a WAR example application +
    • +
  • [ACT-1122] - databaseSchemaUpdate should not downgrade, it leads to inconsistent databases +
    • +
  • [ACT-1134] - Reduce number of compensate event subscription queries when a subprocess is completed +
    • +
  • [ACT-1138] - Optimize job acquisition (exclusive jobs / maxJobsPerAcquisition) +
    • +
  • [ACT-1162] - activiti-spring pom.xml contains dependencies that should have scope 'test' +
    • +
  • [ACT-1169] - Redundant RETRIES predicate in 'selectExclusiveJobsToExecute' +
    • +
  • [ACT-1206] - GroupManager.findGroupsByUser called twice +
    • +
  • [ACT-1224] - Remove Eclipse IDE Artifacts (.classpath,...) from SVN +
    • +
  • [ACT-1273] - In the TaskService it is possible to removing variables +
    • +
  • [ACT-1279] - Add foreign key to PROC_DEF_ID_ on ACT_RU_EXECUTION +
    • +
  • [ACT-1291] - Allow subtask filtering +
    • +
  • [ACT-1301] - Refactoring BpmnParse class +
    • +
  • [ACT-1327] - activiti-osgi add blueprint context EL resolver +
    • +
  • [ACT-1336] - Support start authorization in Designer +
    • +
  • [ACT-1350] - Can not send mail use gmail smtp with ssl +
    • +
  • [ACT-1352] - Reduce the log level when a job could not found due to cancelActiviti +
    • +
  • [ACT-1383] - Enable specialization of BusinessProcess bean by moving producer methods into separate bean +
    • +
  • [ACT-1392] - Activities rendered by DiagramGenerator should show task-names on multiple lines, if too big for single line. +
    • +
  • [ACT-1405] - CustomServiceTask ID is not stored in model +
    • +
  • [ACT-1430] - Add faster and more convenient methods for retrieving form keys +
    • +
  • [ACT-1443] - Use the standard Activiti classloading mechanism for resolving serialized classes +
    • +
  • [ACT-1445] - Improve documentation for creating Designer Extensions +
    • +
  • [ACT-1447] - in Designer, The cancelActivity should not be shown for errorEventDefinition and cancelEventDefinition +
    • +
  • [ACT-1450] - Modification on ProcessInstanceResource to insert taskDefinitionKey in results +
    • +
  • [ACT-1451] - Rest API to see startableByUser process definitions +
    • +
  • [ACT-1453] - Rest API to list groups +
    • +
+ +

New Feature +

+
    +
  • [ACT-933] - orderByDueDate for HistoricTaskInstanceQuery +
    • +
  • [ACT-936] - Provide custom navigator for Activiti projects +
    • +
  • [ACT-1020] - Get Process Documentation +
    • +
  • [ACT-1293] - Add SQL Query extensions +
    • +
  • [ACT-1300] - Add own History table for HistoricProcessVariable +
    • +
  • [ACT-1302] - Add more information to HistoricActivityInstance +
    • +
  • [ACT-1322] - Interrupting Message Event Sub-Process +
    • +
  • [ACT-1330] - Imporve History Queries +
    • +
  • [ACT-1374] - Add "processVariableValueEquals" to ExecutionQuery +
    • +
  • [ACT-1378] - Change behavior with HistoricProcessVariable +
    • +
  • [ACT-1379] - Add field injection to delegateExpression +
    • +
  • [ACT-1387] - Allow service invocation in a JavaDelegate/ActivityBehavior +
    • +
  • [ACT-1457] - Suspend/Activate a process instance +
    • +
  • [ACT-1458] - Allow to suspend/activate a process definition at a given date +
    • +
+ +

Task +

+
    +
  • [ACT-840] - Userguide refers to JPAVariableTest, but isn't present in examples anymore +
    • +
  • [ACT-1332] - Remove servlet api jar from activiti-explorer +
    • +
  • [ACT-1333] - Fix upgrade script +
    • +
  • [ACT-1334] - ad hoc task has 2 owners +
    • +
  • [ACT-1347] - Clean up cycle references +
    • +
  • [ACT-1355] - Clean up jira issues +
    • +
  • [ACT-1369] - Fix docs on starting h2 test console +
    • +
  • [ACT-1425] - Add category to deployment +
    • +
+

Release Notes - Activiti - Version 5.10

diff --git a/modules/activiti-bpmn-converter/pom.xml b/modules/activiti-bpmn-converter/pom.xml index 878f14f3263ead126d0d68db59071865a8799ce7..3c86a554ff036cb099c2cf957eaf686dcce14026 100644 --- a/modules/activiti-bpmn-converter/pom.xml +++ b/modules/activiti-bpmn-converter/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT @@ -46,6 +46,30 @@ + + + distro + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + + + attach-sources + package + + jar-no-fork + + + + + + + + + diff --git a/modules/activiti-bpmn-model/pom.xml b/modules/activiti-bpmn-model/pom.xml index ceaf79e5e84d74cd2a5b902ae82eb59a01f92816..5c13f0e2c7cf908b38afc2419102de07e9a3eee4 100644 --- a/modules/activiti-bpmn-model/pom.xml +++ b/modules/activiti-bpmn-model/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT @@ -20,6 +20,30 @@ + + + distro + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + + + attach-sources + package + + jar-no-fork + + + + + + + + + diff --git a/modules/activiti-cactus/pom.xml b/modules/activiti-cactus/pom.xml index 6034a3a9cc8a904ac635af5c9331e945544b6cbd..67bff8e1d0b983827df135d3cc67e300a11dc366 100644 --- a/modules/activiti-cactus/pom.xml +++ b/modules/activiti-cactus/pom.xml @@ -12,7 +12,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/modules/activiti-camel/pom.xml b/modules/activiti-camel/pom.xml index fc5b0a1362c35e469796a6e9c455a3def5048172..22afdbaed993b3395ba36800f37af7f54a28d2f3 100644 --- a/modules/activiti-camel/pom.xml +++ b/modules/activiti-camel/pom.xml @@ -12,7 +12,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/modules/activiti-cdi/pom.xml b/modules/activiti-cdi/pom.xml index 8feea5c2a7d4abecae2dd0f7160f0762f6ee3758..608e2c9b374af07973220b4256a4cda927a40667 100644 --- a/modules/activiti-cdi/pom.xml +++ b/modules/activiti-cdi/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/modules/activiti-cxf/pom.xml b/modules/activiti-cxf/pom.xml index 5f2a07b241341c5da4f76fdee0091e60eb402078..ad8798d6bc08de2abd4a71cb296622569d0ad5eb 100644 --- a/modules/activiti-cxf/pom.xml +++ b/modules/activiti-cxf/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/modules/activiti-engine/pom.xml b/modules/activiti-engine/pom.xml index aa2baa84d1ddc45d8dd48e2afa28ee85dc00cdf6..f6a18edc7b4d68f4f5795641428eeab200f2554a 100644 --- a/modules/activiti-engine/pom.xml +++ b/modules/activiti-engine/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT 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 e33755d2d7bffe75e2b0dae68f7dc74e4d61d5cb..62dc61f8a5b7723fdcdd9314176adc452dfd75e8 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.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/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 e66d12053f236e42d25c3656180551075487e945..5358d39aba1315560623a67b06701dfa56c467cc 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.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-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 971a7796a25794f522a01cd5aa2b0b893e4bf143..8fe06352e5108443f4dbcb04d099dda80c29d4d1 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.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-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 a90c952ca84cdd431cb4f501d26d2067967482bf..d924ac8af3317deb0e84b85994449af0050fa6d8 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.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-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 402b4b21245169110f7f5ff8cc552bc77ce9f8b3..82e106db0c66bf3e43ee525a2ac2b634962d3e61 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.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-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 fc544fd842ff8439bdc45ec48bfa3e14b16c790b..7ef35e5c0dfb8c57eba6f1e23bd48f0ce685135e 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.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-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 a038203cedf01a6734a22de70912e1f65104371d..b0165196a3e1864a03dd5ee33223acc68474f410 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.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 index e498bce03dc390bcfa5e92eec4a659c159df2c9e..86524662d0c16d37f87b93dae6324a08bcd827ce 100644 --- a/modules/activiti-explorer/pom.xml +++ b/modules/activiti-explorer/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT @@ -141,6 +141,30 @@ + + + + distro + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + + + attach-sources + package + + jar-no-fork + + + + + + + + diff --git a/modules/activiti-explorer/src/main/resources/messages_zh_CN.properties b/modules/activiti-explorer/src/main/resources/messages_zh_CN.properties index ca55d0de9f37ab637c0af4867b9362807eebcfa1..ba3708fee01fa953a2c9656fd789f949aaa0a7de 100644 --- a/modules/activiti-explorer/src/main/resources/messages_zh_CN.properties +++ b/modules/activiti-explorer/src/main/resources/messages_zh_CN.properties @@ -7,6 +7,7 @@ confirmation.dialog.no= \u5426 button.ok = \u786e\u5b9a button.create = \u521b\u5efa button.cancel = \u53d6\u6d88 +uncaught.exception = \u8b66\u544a # Navigation navigation.error.not.involved.title = \u65e0\u6cd5\u67e5\u770b\u6b64\u4efb\u52a1 @@ -35,7 +36,7 @@ main.menu.repositories = \u4ed3\u5e93 # Password password.change = \u4fee\u6539\u5bc6\u7801 -password.change.input.required = \u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a +password.change.input.required = \u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a password.change.input.match = \u4e24\u6b21\u8f93\u5165\u7684\u5bc6\u7801\u5fc5\u987b\u4e00\u81f4 password.changed.notification = \u5bc6\u7801\u5df2\u66f4\u65b0 @@ -93,10 +94,10 @@ task.name.required = \u4efb\u52a1\u540d\u4e3a\u5fc5\u586b\u9879 # Task menu task.menu.tasks = \u6211\u7684\u4efb\u52a1 -task.menu.inbox = \u6536\u4ef6\u7bb1 +task.menu.inbox = \u5f85\u529e\u4efb\u52a1 task.menu.queued = \u961f\u5217 -task.menu.involved = \u9080\u8bf7 -task.menu.archived = \u5f52\u6863 +task.menu.involved = \u53d7\u9080 +task.menu.archived = \u5df2\u5f52\u6863 # Task details task.id = ID @@ -117,7 +118,7 @@ task.create.time = \u521b\u5efa\u65f6\u95f4 task.complete.time = \u5b8c\u6210 task.duedate = \u5230\u671f\u65e5 task.duedate.unknown = \u672a\u8bbe\u7f6e\u5230\u671f\u65e5 -task.duedate.short = Due {0} +task.duedate.short = Due {0} task.complete = \u5b8c\u6210\u4efb\u52a1 task.task.completed = \u4efb\u52a1 {0} \u5df2\u529e\u7406\u5b8c\u6210 task.form.reset = \u91cd\u7f6e\u8868\u5355 @@ -130,7 +131,7 @@ task.priority.low= \u4f4e task.priority.medium= \u4e2d task.priority.high= \u9ad8 task.part.of.process = \u4efb\u52a1\u5c5e\u4e8e\u6d41\u7a0b: ''{0}'' -task.subtask.of.parent.task = \u5c5e\u4e8e ''{0}'' \u7684\u5b50\u4efb\u52a1 +task.subtask.of.parent.task = \u5c5e\u4e8e ''{0}'' \u7684\u5b50\u4efb\u52a1 task.jump.to.process = \u8df3\u8f6c\u5230\u6d41\u7a0b task.claim= \u7b7e\u6536 task.claim.failed= \u7b7e\u6536\u4efb\u52a1\u5931\u8d25 @@ -170,23 +171,41 @@ process.menu.editor.definitions = \u6d41\u7a0b\u8bbe\u8ba1\u5de5\u4f5c\u533a process.menu.instances = \u6d41\u7a0b\u5b9e\u4f8b # Process page -process.category = \u7c7b\u522b: +process.category = \u7c7b\u522b: process.version = \u7248\u672c {0} process.deploy.time = \u90e8\u7f72\u4e8e {0} process.header.diagram = \u6d41\u7a0b\u56fe process.no.diagram = \u6b64\u6d41\u7a0b\u6ca1\u6709\u5bf9\u5e94\u7684\u6d41\u7a0b\u56fe\u3002 +process.header.suspension.state = \u6302\u8d77\u72b6\u6001\u66f4\u6539 +process.scheduled.suspend = \u6b64\u6d41\u7a0b\u5b9a\u4e49\u8ba1\u5212\u4e8e{0} \u6302\u8d77 +process.scheduled.activate = \u6b64\u6d41\u7a0b\u5b9a\u4e49\u8ba1\u5212\u4e8e{0} \u6fc0\u6d3b process.start = \u542f\u52a8\u6d41\u7a0b process.edit = \u7f16\u8f91\u6a21\u578b +process.copy = \u590d\u5236\u6a21\u578b process.delete = \u5220\u9664\u6a21\u578b process.new = \u65b0\u5efa\u6a21\u578b -process.deploy = \u90e8\u7f72\u4e3a\u6d41\u7a0b\u5b9a\u4e49 +process.import = \u5bfc\u5165 +process.deploy = \u90e8\u7f72 +process.activate = \u6fc0\u6d3b +process.activate.popup = \u6fc0\u6d3b\u6d41\u7a0b\u5b9a\u4e49 +process.activate.popup.time.description = \u4f55\u65f6\u6fc0\u6d3b\u6b64\u6d41\u7a0b\u5b9a\u4e49\uff1f +process.activate.popup.process.instances.description = \u540c\u65f6\u6fc0\u6d3b\u548c\u6b64\u6d41\u7a0b\u5b9a\u4e49\u76f8\u5173\u7684\u6d41\u7a0b\u5b9e\u4f8b +process.suspend = \u6302\u8d77 +process.suspend.popup = \u6302\u8d77\u6d41\u7a0b\u5b9a\u4e49 +process.suspend.popup.time.description = \u4f55\u65f6\u6302\u8d77\u6b64\u6d41\u7a0b\u5b9a\u4e49\uff1f +process.suspend.popup.time.now = \u73b0\u5728 +process.suspend.popup.time.date = \u8bbe\u5b9a\u65f6\u95f4 +process.suspend.popup.process.instances.description = \u540c\u65f6\u6302\u8d77\u548c\u6b64\u6d41\u7a0b\u5b9a\u4e49\u76f8\u5173\u7684\u6d41\u7a0b\u5b9e\u4f8b process.convert = \u8f6c\u6362\u4e3a\u53ef\u7f16\u8f91\u6a21\u578b +process.export = \u5bfc\u51fa\u6a21\u578b +process.toxml.failed = \u521b\u5efaBPMN\u6587\u4ef6\u5931\u8d25 process.instance.delete = \u5220\u9664 process.instance.delete.popup.title = \u5220\u9664\u6d41\u7a0b\u5b9e\u4f8b {0}? process.instance.delete.popup.description = \u60a8\u786e\u5b9a\u8981\u5220\u9664\u6d41\u7a0b\u5b9e\u4f8b\u5417\uff1f
\u6b64\u64cd\u4f5c\u4f1a\u5220\u9664\u548c\u6d41\u7a0b\u5b9e\u4f8b\u76f8\u5173\u7684\u4efb\u52a1\u548c\u6570\u636e\u3002 process.start.time = \u5df2\u542f\u52a8 {0} process.started.notification = \u6d41\u7a0b {0} \u5df2\u542f\u52a8 process.instance.started.on = \u5df2\u542f\u52a8 {0} +process.instance.started = \u5df2\u542f\u52a8 process.instance.header.tasks = \u4efb\u52a1 process.instance.no.tasks= \u6ca1\u6709\u67e5\u8be2\u5230\u548c\u6b64\u6d41\u7a0b\u5b9e\u4f8b\u76f8\u5173\u7684\u4efb\u52a1 process.instance.header.variables = \u53d8\u91cf @@ -195,6 +214,7 @@ process.instances = \u6d41\u7a0b\u5b9e\u4f8b process.no.instances = \u6ca1\u6709\u67e5\u8be2\u5230\u548c\u6b64\u6d41\u7a0b\u5b9a\u4e49\u76f8\u5173\u7684\u6d41\u7a0b\u5b9e\u4f8b process.action.view = \u67e5\u770b process.instance.id = ID +process.instance.name = \u540d\u79f0 process.instance.businesskey = \u4e1a\u52a1ID process.instance.actions = \u64cd\u4f5c process.instance.variable.name = \u540d\u79f0 @@ -204,6 +224,7 @@ process.convert.popup.message = \u60a8\u786e\u5b9a\u8981\u7528\u6b64\u6d41\u7a0b process.convert.popup.convert.button = \u8f6c\u6362 process.new.popup.caption = \u65b0\u6a21\u578b process.new.popup.create.button = \u521b\u5efa +process.copy.popup.caption = \u590d\u5236\u6a21\u578b process.delete.popup.caption = \u5220\u9664 {0} process.delete.popup.message = \u60a8\u786e\u5b9a\u4ece\u5f53\u524d\u5de5\u4f5c\u533a\u5220\u9664\u6a21\u578b\u5417\uff1f process.delete.popup.delete.button = \u5220\u9664 @@ -213,26 +234,35 @@ management.menu.database = \u6570\u636e\u5e93 management.menu.deployments = \u90e8\u7f72\u5305 management.menu.deployments.show.all = \u67e5\u770b\u5168\u90e8 management.menu.deployments.upload = \u6dfb\u52a0\u65b0\u7684\u90e8\u7f72\u5305 +management.menu.active.processdefinitions = \u6d3b\u52a8\u7684\u6d41\u7a0b +management.menu.suspended.processdefinitions = \u6302\u8d77\u7684\u6d41\u7a0b management.menu.jobs = \u4f5c\u4e1a management.menu.users = \u7528\u6237 management.menu.groups = \u7ec4 +management.menu.admin = \u7ba1\u7406 # Job page job.execute = \u6267\u884c -job.header.execution = \u4f5c\u4e1a\u6267\u884c +job.delete = \u5220\u9664 +job.deleted = \u5220\u9664\u4f5c\u4e1a +job.header.execution = \u6267\u884c\u4f5c\u4e1a job.retries = \u91cd\u8bd5 : {0} job.no.retries = \u91cd\u8bd5\u5931\u8d25\u3002 job.default.name = \u4f5c\u4e1a {0} job.timer = \u5b9a\u65f6\u4f5c\u4e1a {0} -job.message = \u6d88\u606f\u4f5c\u4e1a {0} +job.message = \u6d88\u606f\u4f5c\u4e1a {0} job.duedate = \u5230\u671f\u65e5 {0} job.no.dudedate = \u65e0\u5230\u671f\u65e5 job.error = \u6267\u884c\u4f5c\u4e1a\u65f6\u7cfb\u7edf\u62a5\u9519 job.not.executed = \u4f5c\u4e1a\u8fd8\u672a\u6267\u884c\u3002 +job.error = \u6267\u884c\u4f5c\u4e1a\u662f\u51fa\u9519 +job.not.executed = \u4f5c\u4e1a\u8fd8\u672a\u6267\u884c\u3002 +job.suspend.processdefinition = \u6b64\u4f5c\u4e1a\u5c06\u6302\u8d77\u6d41\u7a0b\u5b9a\u4e49\u3002 +job.activate.processdefinition = \u6b64\u4f5c\u4e1a\u5c06\u6fc0\u6d3b\u6d41\u7a0b\u5b9a\u4e49\u3002 # Deployment page deployment.delete = \u5220\u9664 -deployment.create.time = \u90e8\u7f72\u4e8e +deployment.create.time = \u90e8\u7f72\u4e8e deployment.header.definitions = \u5305\u542b\u7684\u6d41\u7a0b\u5b9a\u4e49 deployment.header.resources = \u76f8\u5173\u8d44\u6e90 deployment.upload = \u65b0\u7684\u90e8\u7f72\u5305 @@ -248,21 +278,33 @@ deployment.delete.popup.caption = \u5220\u9664\u5df2\u90e8\u7f72\u7684 {0}? deployment.delete.popup.warning = \u67e5\u8be2\u5230\u6709 {0} \u4e2a\u5904\u4e8e\u8fd0\u884c\u4e2d\u7684\u6d41\u7a0b\u5b9e\u4f8b\u3002
\u786e\u5b9a\u7ee7\u7eed\u5220\u9664\u5417\uff1f deployment.delete.popup.delete.button = \u5220\u9664 +# Import to model workspace +model.import = \u5bfc\u5165\u6a21\u578b +model.import.description = \u9009\u62e9\u4e00\u4e2a\u5305\u542b\u56fe\u7247\u4fe1\u606f\uff08\u7528\u4e8e\u5750\u6807\u5b9a\u4f4d\uff09\u7684\u6587\u4ef6 (.bpmn20.xml \u6216 .bpmn)\u3002 +model.import.failed = \u5bfc\u5165\u5931\u8d25 +model.import.invalid.file = \u4e0d\u80fd\u5bfc\u5165\u6587\u4ef6 +model.import.invalid.file.explanation = \u4ec5\u652f\u6301.bpmn \u6216 .bpmn20.xml\u7c7b\u578b\u7684\u6587\u4ef6 +model.import.invalid.bpmndi = \u672a\u627e\u5230 BPMN DI \u5143\u7d20 +model.import.invalid.bpmndi.explanation = \u8bf7\u786e\u8ba4\u6587\u4ef6\u4e2d\u5305\u542bBPMN DI\u4fe1\u606f +model.import.invalid.bpmn.explanation = \u8bf7\u786e\u8ba4\u6587\u4ef6\u4e2d\u5305\u542b\u6709\u6548\u7684BPMN\u5b9a\u4e49 + +model.action = \u5904\u7406\u6a21\u578b: + # Database page database.no.rows = \u65e0\u6570\u636e\u3002 # User page user.header.details = \u8be6\u7ec6\u8d44\u6599 user.header.groups = \u7ec4 -user.id = \u5de5\u53f7 +user.id = Id user.id.required = \u6dfb\u52a0\u65b0\u7528\u6237\u65f6\u5de5\u53f7\u4e3a\u5fc5\u586b\u9879 user.id.unique = \u6b64\u7528\u6237\u5df2\u7ecf\u5b58\u5728 user.firstname = \u540d user.lastname = \u59d3 -user.email = \u7535\u5b50\u90ae\u7bb1 +user.email = Email user.password = \u5bc6\u7801 user.password.required = \u521b\u5efa\u7528\u6237\u65f6\u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a -user.password.min.lenth = \u5bc6\u7801\u957f\u5ea6\u592a\u77ed\uff1a \u5bc6\u7801\u81f3\u5c11 {0} \u4e2a\u5b57\u7b26 +user.password.min.lenth = \u5bc6\u7801\u957f\u5ea6\u592a\u77ed\uff1a \u5bc6\u7801\u81f3\u5c11 {0} \u4e2a\u5b57\u7b26 user.reset.password = (\u8bf7\u6ce8\u610f\uff0c\u5982\u679c\u586b\u5199\u4f1a\u91cd\u7f6e\u5bc6\u7801\uff01) user.create = \u6dfb\u52a0\u7528\u6237 user.edit = \u7f16\u8f91\u8be6\u7ec6\u8d44\u6599 @@ -270,7 +312,7 @@ user.delete = \u5220\u9664\u7528\u6237 user.save = \u4fdd\u5b58\u8be6\u7ec6\u8d44\u6599 user.no.picture = \u65e0\u5934\u50cf user.no.groups = \u6b64\u7528\u6237\u4e0d\u5c5e\u4e8e\u4efb\u4f55\u7ec4 -user.confirm.delete = \u60a8\u786e\u5b9a\u8981\u5220\u9664 {0}? +user.confirm.delete = \u60a8\u786e\u5b9a\u8981\u5220\u9664 {0}? user.confirm.delete.group = \u4ece\u7ec4 {1} \u4e2d\u79fb\u9664\u7528\u6237 {0} \uff1f user.select.groups = \u9009\u62e9 user.select.groups.popup = \u4e3a\u7528\u6237 {0} \u9009\u62e9\u7ec4 @@ -289,6 +331,30 @@ group.no.members = \u6b64\u7ec4\u8fd8\u6ca1\u6709\u6210\u5458 group.select.members = \u9009\u62e9 {0} \u7ec4\u7684\u6210\u5458 group.delete = \u5220\u9664\u7ec4 +# Running process instances page +admin.menu.running = \u6d3b\u52a8\u7684\u6d41\u7a0b\u5b9e\u4f8b +admin.menu.completed = \u5df2\u5b8c\u6210\u6d41\u7a0b\u5b9e\u4f8b +admin.menu.database = \u6570\u636e\u5e93\u914d\u7f6e +admin.running.title = \u5305\u542b\u8fd0\u884c\u4e2d\u6d41\u7a0b\u5b9e\u4f8b\u7684\u6d41\u7a0b\u5b9a\u4e49 +admin.definitions = \u6d41\u7a0b\u5b9a\u4e49\u5217\u8868 +admin.running.none.found = \u65e0\u8fd0\u884c\u4e2d\u6d41\u7a0b\u5b9e\u4f8b +admin.completed.title = \u5305\u542b\u5df2\u5b8c\u6210\u6d41\u7a0b\u5b9e\u4f8b\u7684\u6d41\u7a0b\u5b9a\u4e49 +admin.completed.none.found = \u65e0\u5df2\u5b8c\u6210\u6d41\u7a0b\u5b9e\u4f8b +admin.nr.instances = \u5b9e\u4f8b\u6570\u91cf +admin.started.by = \u53d1\u8d77\u4eba +admin.start.activity = \u542f\u52a8\u6d41\u7a0b\u7684\u6d3b\u52a8ID +admin.finished = \u5df2\u5b8c\u6210 + +# Database settings page +database.title = \u6570\u636e\u5e93\u914d\u7f6e +database.type = \u6570\u636e\u5e93\u7c7b\u578b +database.update = \u66f4\u65b0\u6570\u636e\u5e93Schema +database.config.type = Database configuration +database.jndi = JNDI\u540d\u79f0 +database.datasource.class = \u6570\u636e\u6e90\u7c7b +database.datasource.url = \u6570\u636e\u6e90URL +database.jdbc.url = JDBC URL + # Upload upload.select = \u9009\u62e9\u4e00\u4e2a\u6587\u4ef6 upload.drop = \u62d6\u52a8\u6587\u4ef6\u5230\u8fd9\u91cc @@ -339,6 +405,6 @@ time.unit.month=\u4e00\u4e2a\u6708 time.unit.months={0} \u6708 time.unit.year=\u4e00\u5e74 time.unit.years={0} \u5e74 -time.unit.future={0} \u672a\u6765 +time.unit.future={0} \u5c06\u6765 time.unit.past={0} \u4e4b\u524d -time.unit.just.now=\u521a\u521a +time.unit.just.now=\u521a\u521a \ No newline at end of file diff --git a/modules/activiti-json-converter/pom.xml b/modules/activiti-json-converter/pom.xml index c31129dfe46252aef2d25946d13ecc78a6800c22..21f1067cca994a00bd954e2a63ff66754088319e 100644 --- a/modules/activiti-json-converter/pom.xml +++ b/modules/activiti-json-converter/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT @@ -41,6 +41,30 @@ + + + distro + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + + + attach-sources + package + + jar-no-fork + + + + + + + + + diff --git a/modules/activiti-modeler/pom.xml b/modules/activiti-modeler/pom.xml index b59eeafa2936d9fa359d540f48b740e3c7cc9a85..0569bcc3205b74dd2255b7e76ef9a14a32153e01 100644 --- a/modules/activiti-modeler/pom.xml +++ b/modules/activiti-modeler/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT @@ -86,6 +86,30 @@ + + + distro + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + + + attach-sources + package + + jar-no-fork + + + + + + + + + buzzmedia diff --git a/modules/activiti-mule/pom.xml b/modules/activiti-mule/pom.xml index c5cd17b5dd5db612fabcda876ed4317be9a6f6e0..edb85676f2b75aada18fd95fadc20bd4c4bc61bf 100644 --- a/modules/activiti-mule/pom.xml +++ b/modules/activiti-mule/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/modules/activiti-osgi/pom.xml b/modules/activiti-osgi/pom.xml index 029ef7d136f9c340bb0e70e07117376461568077..996d3b8bdb402deacb821a286f59bdb4568990be 100644 --- a/modules/activiti-osgi/pom.xml +++ b/modules/activiti-osgi/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/modules/activiti-rest/pom.xml b/modules/activiti-rest/pom.xml index f030b182260765730b8b77f84e29f440a796e2cc..4d2295c9e058c87c7c19327810a634995c3455a6 100644 --- a/modules/activiti-rest/pom.xml +++ b/modules/activiti-rest/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT @@ -82,4 +82,29 @@ + + + + distro + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + + + attach-sources + package + + jar-no-fork + + + + + + + + + diff --git a/modules/activiti-spring/pom.xml b/modules/activiti-spring/pom.xml index 26ba361ea1bdbb570897dc7c4c20b531a887b7dd..7833d222e9ffa5deff1036f45831d591fde8ebc5 100644 --- a/modules/activiti-spring/pom.xml +++ b/modules/activiti-spring/pom.xml @@ -9,7 +9,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/modules/activiti-upgrade/pom.xml b/modules/activiti-upgrade/pom.xml index b1420fa7b47479483a538b9b13ac27cc61befee0..ecdc68b02cda57c113eb488fdbe7a60093befc51 100644 --- a/modules/activiti-upgrade/pom.xml +++ b/modules/activiti-upgrade/pom.xml @@ -6,7 +6,7 @@ Activiti - Upgrade org.activiti activiti-upgrade - 5.11-SNAPSHOT + 5.12-SNAPSHOT true diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.engine.sql index 9d3fbabf14195e65461ca1d9973330f5003b2d95..583c27afc0550cf2fdc784d3580ea7bdc0b83c1c 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/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/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.engine.sql index fe224d320e63ea256a6ddd8452ec05713572acc4..b6076cba7c837131b455a28f7b4cd31f2ce7064b 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/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/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.engine.sql index c77aee38264f7693b89e8acc8fcdc0f82339f246..a37318bedd020d7b00bd43fda55f64555a56ae3f 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/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/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.engine.sql index 73f2105ee0343086eaee8bc84d61e97240824961..0ebe6dfd44eb2e0f2fda3cc8d4d47d34a2f8c576 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/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/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.engine.sql index f78f954896520e237ed4fd18d4e1e3fe66350b77..a0acd022caffb1b40da8f4237075d2b483c5a3aa 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/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/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.engine.sql index fb580e1169331d8649b898a7c017809850b37f60..6e735f493c97d4cff0bfee988559a37084a37634 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/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-webapp-explorer2/pom.xml b/modules/activiti-webapp-explorer2/pom.xml index a50f68474cc8c861c8a1048bb012b67b268bcd45..5ac41ccec1cd2c821ff8d587c3928954a7a9b583 100644 --- a/modules/activiti-webapp-explorer2/pom.xml +++ b/modules/activiti-webapp-explorer2/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/modules/activiti-webapp-rest2/pom.xml b/modules/activiti-webapp-rest2/pom.xml index 9f63c22966fd7581ddccdcc5aab689ce363d08ef..e554219ac20f65043aabbe3bfbb7c89763e5e495 100644 --- a/modules/activiti-webapp-rest2/pom.xml +++ b/modules/activiti-webapp-rest2/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/pom.xml b/pom.xml index 22a733e90926d828c31f409382877a65785e8870..a93192046fafff28f24a2d5a20a7c168743bbe12 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ activiti-root pom - 5.11-SNAPSHOT + 5.12-SNAPSHOT 3.1.2.RELEASE 3.3.0 diff --git a/qa/build.xml b/qa/build.xml index fc0cb9d249eb8de57b6b242ca9ce8ab7d92311d8..0bea7f67eff7ef434f421195e1d22ce5f9895068 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 14d323821a480c74e36cf3f387116a70edf809a4..0a4eafc2da4ceca3b354fb686de213c37499336f 100644 --- a/qa/dbclean/pom.xml +++ b/qa/dbclean/pom.xml @@ -8,7 +8,7 @@ activiti-dbclean pom - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/qa/upgrade/build.xml b/qa/upgrade/build.xml index ef7997cc4a8fe976e9d52b20b9a9da715ed6d2f9..350638b5dc2f5d80ce69aa4b1d144da7d162d029 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 79742e15442dffe1de14c3fb8bfa47ef93ba221c..8649012111f791df8b66198f5e0243e3cd3cbdc5 100644 --- a/qa/upgrade/pom.xml +++ b/qa/upgrade/pom.xml @@ -6,13 +6,13 @@ Activiti - Upgrade Fetcher org.activiti activiti-upgrade-fetcher - 5.11-SNAPSHOT + 5.12-SNAPSHOT org.activiti activiti-root ../.. - 5.11-SNAPSHOT + 5.12-SNAPSHOT diff --git a/userguide/src/en/chapters/ch02-GettingStarted.xml b/userguide/src/en/chapters/ch02-GettingStarted.xml index 1d78624955f4d22ab1e1acea5132e8b8bea1f2ab..9dd5ba8d933efff0451cc09dd17ca2d91506f65d 100644 --- a/userguide/src/en/chapters/ch02-GettingStarted.xml +++ b/userguide/src/en/chapters/ch02-GettingStarted.xml @@ -142,7 +142,7 @@ contain all the Activiti jars (and the source jars). The dependencies are not shipped this way. The required dependencies of the Activiti engine are (generated using mvn dependency:tree): -org.activiti:activiti-engine:jar:5.11-SNAPSHOT +org.activiti:activiti-engine:jar:5.12-SNAPSHOT +- org.apache.commons:commons-email:jar:1.2:compile | +- javax.mail:mail:jar:1.4.1:compile | \- javax.activation:activation:jar:1.1:compile diff --git a/userguide/src/en/index.xml b/userguide/src/en/index.xml index 58d0961196ad4d5f30f11c290d9dbef209366f35..00832fbd83bbdae9f8a40f3e184b794fa08c0f65 100644 --- a/userguide/src/en/index.xml +++ b/userguide/src/en/index.xml @@ -20,7 +20,7 @@ - Activiti 5.11-SNAPSHOT User Guide + Activiti 5.12-SNAPSHOT User Guide