Skip to content

Commit

Permalink
Merge branch 'release/2.1.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
zambrovski committed Apr 1, 2021
2 parents 97d51ba + 91da138 commit 47f5dc1
Show file tree
Hide file tree
Showing 45 changed files with 83 additions and 81 deletions.
2 changes: 1 addition & 1 deletion bom/datapool-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>camunda-bpm-taskpool</artifactId>
<groupId>io.holunda.taskpool</groupId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions bom/taskpool-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>camunda-bpm-taskpool</artifactId>
<groupId>io.holunda.taskpool</groupId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool-collector</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</dependency>
<dependency>
<groupId>io.holunda.taskpool</groupId>
Expand Down
2 changes: 1 addition & 1 deletion datapool/datapool-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-datapool-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-datapool-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion datapool/datapool-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-datapool-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-datapool-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion datapool/datapool-event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-datapool-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-datapool-event</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion datapool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-datapool-root</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-taskpool-docs</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions docs/src/orchid/resources/changelog/2.1/2.1.6.ad
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
version: 2.1.6
---

== Feature

* Fix Mongo connection problems, see #307
* Provide current DB scripts for examples
2 changes: 1 addition & 1 deletion engine/camunda-engine-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool-engine-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-engine-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion engine/datapool-collector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool-engine-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-datapool-collector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-taskpool-engine-root</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion engine/property-taskurl-resolver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool-engine-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-property-taskurl-resolver</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion engine/taskpool-collector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool-engine-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-taskpool-collector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion engine/taskpool-engine-springboot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool-engine-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-taskpool-engine-springboot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion engine/variable-serializer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool-engine-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>camunda-bpm-taskpool-variable-serializer</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/components/process-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-examples-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/components/process-forms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-examples-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/components/tasklist-angular/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-examples-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/components/tasklist-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-examples-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/components/tasklist-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-examples-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/components/tasklist-reactive-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-examples-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/components/users/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-examples-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-examples-root</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-scenario-distributed-axon-server</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>example-distributed-axon-server-webapp-application</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-cockpit-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-example-cockpit</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-cockpit-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-example-cockpit-backend</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-cockpit-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-example-cockpit-frontend</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-scenario-distributed-axon-server</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-example-cockpit-root</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/scenarios/distributed-axon-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-scenario-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-example-scenario-distributed-axon-server</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-scenario-distributed-axon-server</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>example-distributed-axon-server-process-application</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ values ('history.cleanup.job.lock', '0', 1);
insert into ACT_GE_PROPERTY
values ('startup.lock', '0', 1);

insert into ACT_GE_PROPERTY
values ('telemetry.lock', '0', 1);

insert into ACT_GE_PROPERTY
values ('installationId.lock', '0', 1);

create table ACT_GE_BYTEARRAY (
ID_ varchar(64),
REV_ integer,
Expand All @@ -63,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
);

insert into ACT_GE_SCHEMA_LOG
values ('0', CURRENT_TIMESTAMP, '7.13.0');
values ('0', CURRENT_TIMESTAMP, '7.14.0');

create table ACT_RE_DEPLOYMENT (
ID_ varchar(64),
Expand Down Expand Up @@ -210,6 +216,7 @@ create table ACT_RU_VARIABLE (
CASE_EXECUTION_ID_ varchar(64),
CASE_INST_ID_ varchar(64),
TASK_ID_ varchar(64),
BATCH_ID_ varchar(64),
BYTEARRAY_ID_ varchar(64),
DOUBLE_ double precision,
LONG_ bigint,
Expand Down Expand Up @@ -334,13 +341,17 @@ create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_);
create index ACT_IDX_EXEC_TENANT_ID on ACT_RU_EXECUTION(TENANT_ID_);
create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
create index ACT_IDX_TASK_ASSIGNEE on ACT_RU_TASK(ASSIGNEE_);
create index ACT_IDX_TASK_OWNER on ACT_RU_TASK(OWNER_);
create index ACT_IDX_TASK_TENANT_ID on ACT_RU_TASK(TENANT_ID_);
create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
create index ACT_IDX_EVENT_SUBSCR_TENANT_ID on ACT_RU_EVENT_SUBSCR(TENANT_ID_);

create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_);
create index ACT_IDX_VARIABLE_TENANT_ID on ACT_RU_VARIABLE(TENANT_ID_);
create index ACT_IDX_VARIABLE_TASK_NAME_TYPE on ACT_RU_VARIABLE(TASK_ID_, NAME_, TYPE_);

create index ACT_IDX_INC_CONFIGURATION on ACT_RU_INCIDENT(CONFIGURATION_);
create index ACT_IDX_INC_TENANT_ID on ACT_RU_INCIDENT(TENANT_ID_);
-- CAM-5914
Expand Down Expand Up @@ -528,6 +539,12 @@ alter table ACT_RU_EXT_TASK
foreign key (ERROR_DETAILS_ID_)
references ACT_GE_BYTEARRAY (ID_);

create index ACT_IDX_BATCH_ID ON ACT_RU_VARIABLE(BATCH_ID_);
alter table ACT_RU_VARIABLE
add constraint ACT_FK_VAR_BATCH
foreign key (BATCH_ID_)
references ACT_RU_BATCH (ID_);

-- indexes for deadlock problems - https://app.camunda.com/jira/browse/CAM-2567 --
create index ACT_IDX_INC_CAUSEINCID on ACT_RU_INCIDENT(CAUSE_INCIDENT_ID_);
create index ACT_IDX_INC_EXID on ACT_RU_INCIDENT(EXECUTION_ID_);
Expand Down Expand Up @@ -804,7 +821,7 @@ create table ACT_HI_ACTINST (
CALL_CASE_INST_ID_ varchar(64),
ACT_NAME_ varchar(255),
ACT_TYPE_ varchar(255) not null,
ASSIGNEE_ varchar(64),
ASSIGNEE_ varchar(255),
START_TIME_ timestamp not null,
END_TIME_ timestamp,
DURATION_ bigint,
Expand Down Expand Up @@ -1147,6 +1164,8 @@ create index ACT_IDX_HI_INCIDENT_PROC_DEF_KEY on ACT_HI_INCIDENT(PROC_DEF_KEY_);
create index ACT_IDX_HI_INCIDENT_ROOT_PI on ACT_HI_INCIDENT(ROOT_PROC_INST_ID_);
create index ACT_IDX_HI_INCIDENT_PROCINST on ACT_HI_INCIDENT(PROC_INST_ID_);
create index ACT_IDX_HI_INCIDENT_RM_TIME on ACT_HI_INCIDENT(REMOVAL_TIME_);
create index ACT_IDX_HI_INCIDENT_CREATE_TIME on ACT_HI_INCIDENT(CREATE_TIME_);
create index ACT_IDX_HI_INCIDENT_END_TIME on ACT_HI_INCIDENT(END_TIME_);

create index ACT_IDX_HI_JOB_LOG_ROOT_PI on ACT_HI_JOB_LOG(ROOT_PROC_INST_ID_);
create index ACT_IDX_HI_JOB_LOG_PROCINST on ACT_HI_JOB_LOG(PROCESS_INSTANCE_ID_);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-scenario-distributed-axon-server</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>example-distributed-axon-server-taskpool-application</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/scenarios/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-examples-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-example-scenario-root</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/scenarios/single-node/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.taskpool</groupId>
<artifactId>taskpool-example-scenario-root</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
</parent>

<artifactId>taskpool-example-scenario-single-node</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.holunda.taskpool</groupId>
<artifactId>camunda-bpm-taskpool</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
Expand Down
Loading

0 comments on commit 47f5dc1

Please sign in to comment.