Skip to content

Commit

Permalink
Upgraded to 5.12-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
tijsrademakers committed Nov 29, 2012
1 parent 7997ef0 commit 3f9e57e
Show file tree
Hide file tree
Showing 39 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion distro/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<property file="${user.home}/.activiti/build.properties" />

<property name="activiti.version" value="5.11-SNAPSHOT" />
<property name="activiti.version" value="5.12-SNAPSHOT" />
<property name="target.distro.root" value="target/zip/activiti-${activiti.version}" />
<property name="activiti.website" value="../../activiti-website" />

Expand Down
6 changes: 3 additions & 3 deletions distro/src/notice.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-bpmn-converter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-bpmn-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-cactus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-camel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-cxf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>

</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
public interface ProcessEngine extends EngineServices {

/** the version of the activiti library */
public static String VERSION = "5.11-SNAPSHOT";
public static String VERSION = "5.12-SNAPSHOT";

/** The name as specified in 'process-engine-name' in
* the activiti.cfg.xml configuration file.
Expand Down
4 changes: 2 additions & 2 deletions .../activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...s/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...ctiviti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...ctiviti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...tiviti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...viti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-explorer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-json-converter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-modeler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-mule/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>

</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-osgi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-upgrade/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<name>Activiti - Upgrade</name>
<groupId>org.activiti</groupId>
<artifactId>activiti-upgrade</artifactId>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>

<properties>
<skipTests>true</skipTests>
Expand Down
4 changes: 2 additions & 2 deletions ...iti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...viti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...i-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...i-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...pgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-webapp-explorer2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/activiti-webapp-rest2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<artifactId>activiti-root</artifactId>

<packaging>pom</packaging>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
<properties>
<spring.framework.version>3.1.2.RELEASE</spring.framework.version>
<mule.version>3.3.0</mule.version>
Expand Down
2 changes: 1 addition & 1 deletion qa/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<property file="${user.home}/.activiti/build.properties" />
<property file="../distro/src/setup/build.properties" />
<property name="activiti.version" value="5.11-SNAPSHOT" />
<property name="activiti.version" value="5.12-SNAPSHOT" />
<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" />
Expand Down
2 changes: 1 addition & 1 deletion qa/dbclean/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<artifactId>activiti-dbclean</artifactId>

<packaging>pom</packaging>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion qa/upgrade/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project name="activiti.qa.upgrade" default="upgrade">

<property file="${user.home}/.activiti/build.properties" />
<property name="activiti.version" value="5.11-SNAPSHOT" />
<property name="activiti.version" value="5.12-SNAPSHOT" />
<property name="database" value="h2" />
<property name="activiti.old.version" value="5.0" />
<property name="downloads.dir" value="${user.home}/.activiti/downloads" />
Expand Down
4 changes: 2 additions & 2 deletions qa/upgrade/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<name>Activiti - Upgrade Fetcher</name>
<groupId>org.activiti</groupId>
<artifactId>activiti-upgrade-fetcher</artifactId>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>

<parent>
<groupId>org.activiti</groupId>
<artifactId>activiti-root</artifactId>
<relativePath>../..</relativePath>
<version>5.11-SNAPSHOT</version>
<version>5.12-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
Loading

0 comments on commit 3f9e57e

Please sign in to comment.