Skip to content

Commit

Permalink
Merge branch 'release/3.14.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
zambrovski committed Jun 19, 2023
2 parents 28006ba + bf4ea80 commit df2f6ad
Show file tree
Hide file tree
Showing 41 changed files with 83 additions and 75 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![stable](https://img.shields.io/badge/lifecycle-STABLE-green.svg)](https://github.com/holisticon#open-source-lifecycle)
[![Build Status](https://github.com/holunda-io/camunda-bpm-taskpool/workflows/Development%20braches/badge.svg)](https://github.com/holunda-io/camunda-bpm-taskpool/actions)
[![Master and Snapshot release](https://github.com/holunda-io/camunda-bpm-taskpool/actions/workflows/release.yml/badge.svg)](https://github.com/holunda-io/camunda-bpm-taskpool/actions/workflows/release.yml)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.holunda.polyflow/polyflow-taskpool-dependencies/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.holunda.polyflow/polyflow-taskpool-dependencies/)
[![Code Coverage](https://codecov.io/gh/holunda-io/camunda-bpm-taskpool/branch/master/graph/badge.svg)](https://codecov.io/gh/holunda-io/camunda-bpm-taskpool)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/6e15ca2f4ab64cfe85a736f324136086)](https://www.codacy.com/gh/holunda-io/camunda-bpm-taskpool/dashboard?utm_source=github.com&utm_medium=referral&utm_content=holunda-io/camunda-bpm-taskpool&utm_campaign=Badge_Grade)
Expand Down
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>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-root</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/taskpool-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/bus-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/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.polyflow</groupId>
<artifactId>polyflow-datapool-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-datapool-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/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.polyflow</groupId>
<artifactId>polyflow-datapool-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-datapool-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/datapool/datapool-event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-datapool-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-datapool-event</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/datapool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/taskpool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/taskpool/taskpool-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-taskpool-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-taskpool-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/taskpool/taskpool-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-taskpool-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-taskpool-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/taskpool/taskpool-event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-taskpool-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-taskpool-event</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/engine-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-camunda-bpm-engine-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/springboot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-camunda-bpm-springboot-autoconfigure</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/springboot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

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

<artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/camunda-bpm/taskpool-job-sender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-camunda-bpm-taskpool-job-sender</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/common/datapool-sender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-common-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-datapool-sender</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<relativePath>../../bom/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration/common/tasklist-url-resolver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-common-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-tasklist-url-resolver</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/common/taskpool-sender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-common-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-taskpool-sender</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration/common/variable-serializer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-integration-common-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-variable-serializer</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.polyflow</groupId>
<artifactId>polyflow-root</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<packaging>pom</packaging>

<name>POM: ${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion view/form-url-resolver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-view-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-form-url-resolver</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion view/jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.polyflow</groupId>
<artifactId>polyflow-view-parent</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
</parent>

<artifactId>polyflow-view-jpa</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package io.holunda.polyflow.view.jpa.data


import io.holunda.polyflow.view.jpa.payload.PayloadAttribute
import org.hibernate.annotations.Fetch
import org.hibernate.annotations.FetchMode
import java.time.Instant
import javax.persistence.*

Expand All @@ -13,19 +15,19 @@ import javax.persistence.*
class DataEntryEntity(
@EmbeddedId
var dataEntryId: DataEntryId,
@Column(name = "TYPE", nullable = false)
@Column(name = "TYPE", length = 255, nullable = false)
var type: String,
@Column(name = "NAME", nullable = false)
@Column(name = "NAME", length = 255, nullable = false)
var name: String,
@Column(name = "APPLICATION_NAME", nullable = false)
@Column(name = "APPLICATION_NAME", length = 64, nullable = false)
var applicationName: String,
@Column(name = "FORM_KEY")
@Column(name = "FORM_KEY", length = 64, nullable = true)
var formKey: String? = null,
@Column(name = "REVISION")
var revision: Long = 0L,
@Embedded
var state: DataEntryStateEmbeddable,
@Column(name = "DESCRIPTION", length = 2048)
@Column(name = "DESCRIPTION", nullable = true, length = 2048)
var description: String? = null,

@Column(name = "DATE_CREATED", nullable = false)
Expand Down Expand Up @@ -58,6 +60,7 @@ class DataEntryEntity(


@OneToMany(mappedBy = "dataEntry", orphanRemoval = true, cascade = [CascadeType.ALL], fetch = FetchType.EAGER)
@Fetch(FetchMode.SELECT)
var protocol: MutableList<ProtocolElement> = mutableListOf(),

@Column(name = "PAYLOAD")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import javax.persistence.Embeddable
*/
@Embeddable
class DataEntryId(
@Column(name = "ENTRY_ID", nullable = false)
@Column(name = "ENTRY_ID", length = 64, nullable = false)
var entryId: String,
@Column(name = "ENTRY_TYPE", nullable = false)
@Column(name = "ENTRY_TYPE", length = 128, nullable = false)
var entryType: String
) : Serializable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import javax.persistence.Embeddable
*/
@Embeddable
class DataEntryStateEmbeddable(
@Column(name = "PROCESSING_TYPE", nullable = false)
@Column(name = "PROCESSING_TYPE", length = 64, nullable = false)
var processingType: String,
@Column(name = "STATE", nullable = false)
@Column(name = "STATE", length = 64, nullable = false)
var state: String
) : Serializable {
companion object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ import javax.persistence.*
@Table(name = "PLF_DATA_ENTRY_PROTOCOL")
class ProtocolElement(
@Id
@Column(name = "ID")
@Column(name = "ID", length = 64, nullable = false)
var id: String = UUID.randomUUID().toString(),

@Column(name = "TIME", nullable = false)
var time: Instant = Instant.now(),
@Embedded
var state: DataEntryStateEmbeddable,
@Column(name = "USERNAME", nullable = true)
@Column(name = "USERNAME", length = 64, nullable = true)
var username: String? = null,
@Column(name = "LOG_MESSAGE", nullable = true)
@Column(name = "LOG_MESSAGE", length = 2048, nullable = true)
var logMessage: String? = null,
@Column(name = "LOG_DETAILS", nullable = true)
@Column(name = "LOG_DETAILS", length = 2048, nullable = true)
var logDetails: String? = null,

@ManyToOne
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import javax.persistence.*
@Table(name = "PLF_PROC_DEF")
class ProcessDefinitionEntity(
@Id
@Column(name = "PROC_DEF_ID")
@Column(name = "PROC_DEF_ID", length = 255)
var processDefinitionId: String,
@Column(name = "PROC_DEF_KEY", nullable = false)
@Column(name = "PROC_DEF_KEY", length = 255, nullable = false)
var processDefinitionKey: String,
@Column(name = "PROC_DEF_VERSION", nullable = false)
var processDefinitionVersion: Int,
@Column(name = "APPLICATION_NAME", nullable = false)
@Column(name = "APPLICATION_NAME", length = 64, nullable = false)
var applicationName: String,
@Column(name = "NAME", nullable = false)
@Column(name = "NAME", length = 255, nullable = false)
var name: String,
@Column(name = "VERSION_TAG")
var versionTag: String? = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ import javax.persistence.*
@Table(name = "PLF_PROC_INSTANCE")
class ProcessInstanceEntity(
@Id
@Column(name = "INSTANCE_ID", nullable = true)
@Column(name = "INSTANCE_ID", length = 64, nullable = true)
var processInstanceId: String,
@Column(name = "BUSINESS_KEY", nullable = true)
@Column(name = "BUSINESS_KEY", length = 64, nullable = true)
var businessKey: String?,
@Column(name = "SUPER_INSTANCE_ID", nullable = true)
@Column(name = "SUPER_INSTANCE_ID", length = 64, nullable = true)
var superInstanceId: String?,
@Column(name = "START_ACTIVITY_ID", nullable = true)
@Column(name = "START_ACTIVITY_ID", length = 64, nullable = true)
var startActivityId: String?,
@Column(name = "END_ACTIVITY_ID", nullable = true)
@Column(name = "END_ACTIVITY_ID", length = 64, nullable = true)
var endActivityId: String?,
@Column(name = "DELETE_REASON", nullable = true)
@Column(name = "DELETE_REASON", length = 2048, nullable = true)
var deleteReason: String?,
@Column(name = "START_USER_ID", nullable = true)
@Column(name = "START_USER_ID", length = 64, nullable = true)
var startUserId: String?,
@Embedded
var sourceReference: SourceReferenceEmbeddable,
@Column(name = "RUN_STATE", nullable = false)
@Column(name = "RUN_STATE", length = 64, nullable = false)
@Enumerated(EnumType.STRING)
var state: ProcessInstanceState
)
Loading

0 comments on commit df2f6ad

Please sign in to comment.