Skip to content

Commit

Permalink
Merge branch 'release/3.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
zambrovski committed Nov 28, 2022
2 parents 7ae517e + f891339 commit 3cfb975
Show file tree
Hide file tree
Showing 48 changed files with 381 additions and 105 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,12 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3

- name: Cache .m2
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: ${{ matrix.jdk }}
cache: maven

- name: Prepare Maven Wrapper
run: chmod +x ./mvnw
Expand All @@ -47,7 +40,7 @@ jobs:
- name: Run I-Tests with Maven
run: ./mvnw integration-test failsafe:verify -Pitest -B

- name: Upolad coverage information
uses: codecov/codecov-action@v1
- name: Upload coverage information
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }} #required
16 changes: 5 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3

- name: Cache .m2
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven
# Get GPG private key into GPG
- name: Import GPG Owner Trust
run: echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --import-ownertrust

- name: Import GPG key
run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes

Expand All @@ -33,6 +26,7 @@ jobs:
with:
java-version: 11.0.5
distribution: 'zulu'
cache: maven
server-id: ossrh
server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central
Expand All @@ -50,12 +44,12 @@ jobs:
run: ./mvnw integration-test failsafe:verify -Pitest -B -T4

- name: Deploy a new version to central
run: ./mvnw clean deploy -B -DskipTests -Prelease -Dgpg.keyname=${{secrets.GPG_KEYNAME}} -Dgpg.passphrase="${{secrets.GPG_PASSPHRASE}}"
run: ./mvnw deploy -B -DskipTests -Prelease -Dgpg.keyname=${{secrets.GPG_KEYNAME}} -Dgpg.passphrase="${{secrets.GPG_PASSPHRASE}}"
env:
OSS_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
OSS_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}

- name: Upolad coverage information
uses: codecov/codecov-action@v1
- name: Upload coverage information
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
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.4.2</version>
<version>3.5.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions 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.4.2</version>
<version>3.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -24,10 +24,10 @@
<axon-bom.version>4.6.2</axon-bom.version>

<axon-kotlin.version>4.6.0</axon-kotlin.version>
<axon-gateway-extension.version>1.0.0</axon-gateway-extension.version>
<axon-gateway-extension.version>1.1.1</axon-gateway-extension.version>

<awaitability.version>4.2.0</awaitability.version>
<mockito-kotlin.version>4.0.0</mockito-kotlin.version>
<mockito-kotlin.version>4.1.0</mockito-kotlin.version>
<jgiven.version>1.2.4</jgiven.version>

<pattern.class.itest>**/*ITest.*</pattern.class.itest>
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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</version>
</parent>

<artifactId>polyflow-taskpool-event</artifactId>
Expand Down
6 changes: 4 additions & 2 deletions docs/getting-started/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ This guide is describing steps required to configure an existing Camunda BPM Spr
connect to **existing Process Platform**.

!!! note
The following steps assume that you have already choosen one of the distribution scenarios and setup the **Core components**. This is a pre-requirement for the following steps to work.
The following steps assume that you have already chosen one of the distribution scenarios and set-up the **Core components**. This is a pre-requirement for the following steps to work.


## Add dependency to Polyflow integration starter

Apart from the example application, you might be interested in integrating Polyflow Taskpool and Datapool into your existing
application. To do so, you need to enable your Camunda BPM process engine to use the library.
For doing so, add the `polyflow-integration-camunda-bpm-engine-parent` library. In Maven, add the following dependency
For doing so, add the `polyflow-integration-camunda-bpm-springboot-starter` library. In Maven, add the following dependency
to your `pom.xml`:

``` xml
Expand Down Expand Up @@ -52,6 +52,8 @@ camunda:
bpm:
default-serialization-format: application/json
history-level: full
eventing:
task: false

polyflow:
integration:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ Taskpool Collector registers Spring Event Listener to the following events, fire
** HistoricVariableUpdateEventEntity
** HistoricDetailVariableInstanceUpdateEntity

The events are transformed into corresponding commands and passed over to the processor layer.
The events are transformed into corresponding commands and passed over to the processor layer. Until Camunda Platform 7.19, the eventing
is fired using custom listeners only and polyflow components don't rely on that but rather on own implementation of built-in (unskippable) listeners.
For this purpose, it is important to disable Camunda Platform custom listeners by setting `camunda.bpm.eventing.task` property to `false`.

### Task commands enrichment

Expand Down
6 changes: 6 additions & 0 deletions docs/reference-guide/components/common-datapool-sender.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ The default provided command sender (type: `simple`) just sends the commands syn
If you want to implement a custom command sending, please provide your own implementation of the interface `DataEntryCommandSender`
(register a Spring Component of the type) and set the property `polyflow.integration.sender.data-entry.type` to `custom`.

#### Serialization of payload

By default, the data entry sender will serialize payload of the `DataEntry` into a JSON-Map structure, in order to be received by projections (Data Pool View)
and storage of it, independent of the classes which might be not on the classpath of the projection (generic structure instead of a typed Java object structure).
This serialization can be disabled by the sender property `polyflow.integration.sender.data-entry.serialize-payload=false`.

#### Handling command transmission

The commands sent by the `Datapool Sender` are received by Command Handlers. The latter may accept or reject commands, depending
Expand Down
7 changes: 7 additions & 0 deletions docs/reference-guide/components/common-taskpool-sender.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ are sent _before_ the process engine transaction is committed, otherwise command
Never send commands over remote messaging before the transaction is committed, since you may produce unexpected results if Camunda fails
to commit the transaction.

#### Serialization of payload

By default, the data entry sender will serialize payload of the `DataEntry` into a JSON-Map structure, in order to be received by projections (Data Pool View)
and storage of it, independent of the classes which might be not on the classpath of the projection (generic structure instead of a typed Java object structure).
This serialization can be disabled by the sender property `polyflow.integration.task.sender.serialize-payload=false`.


#### Handling command transmission

The commands sent via gateway (e.g. `AxonCommandListGateway`) are received by Command Handlers. The latter may accept or reject commands, depending
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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</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.4.2</version>
<version>3.5.0</version>
</parent>

<artifactId>polyflow-camunda-bpm-springboot-autoconfigure</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
camunda:
bpm:
eventing:
task: false
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.4.2</version>
<version>3.5.0</version>
</parent>

<artifactId>polyflow-camunda-bpm-springboot-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
camunda:
bpm:
eventing:
task: false
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.4.2</version>
<version>3.5.0</version>
</parent>

<artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>
Expand Down
Loading

0 comments on commit 3cfb975

Please sign in to comment.