Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/maven/org.camunda.bpm-camunda-…
Browse files Browse the repository at this point in the history
…bpm-assert-7.19.0
  • Loading branch information
zambrovski authored Sep 18, 2023
2 parents 09d22da + 8a84ca3 commit 6cca571
Show file tree
Hide file tree
Showing 116 changed files with 2,380 additions and 561 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ jobs:
run: chmod +x ./mvnw

- name: Build with Maven
run: ./mvnw clean verify -U -B -T4
run: ./mvnw clean verify -U -B -T4 -ntp

- name: Prepare I-Tests
run: mkdir -p target/jgiven-reports/json

- name: Run I-Tests with Maven
run: ./mvnw integration-test failsafe:verify -Pitest -B -T4
run: ./mvnw integration-test failsafe:verify -Pitest -B -T4 -ntp

- name: Deploy a new version to central
run: ./mvnw deploy -B -DskipTests -Prelease -Dgpg.keyname="${{secrets.GPG_KEYNAME}}" -Dgpg.passphrase="${{secrets.GPG_PASSPHRASE}}"
run: ./mvnw deploy -B -ntp -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
81 changes: 21 additions & 60 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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -18,21 +18,21 @@
<url>https://github.com/holunda-io/camunda-bpm-taskpool/</url>

<properties>
<springboot.version>2.7.10</springboot.version>
<springboot.version>2.7.15</springboot.version>
<camunda-commons-typed-values.version>7.18.0</camunda-commons-typed-values.version>

<axon-bom.version>4.6.3</axon-bom.version>
<axon-bom.version>4.6.6</axon-bom.version>

<axon-kotlin.version>4.7.0</axon-kotlin.version>
<axon-gateway-extension.version>1.1.2</axon-gateway-extension.version>

<awaitability.version>4.2.0</awaitability.version>
<mockito-kotlin.version>4.1.0</mockito-kotlin.version>
<jgiven.version>1.2.5</jgiven.version>
<mockito-kotlin.version>5.0.0</mockito-kotlin.version>
<jgiven.version>1.3.0</jgiven.version>
<jgiven-kotlin.version>1.3.0.0</jgiven-kotlin.version>

<pattern.class.itest>**/*ITest.*</pattern.class.itest>
<pattern.package.itest>**/itest/**/*.*</pattern.package.itest>
<jgiven-kotlin.version>1.2.5.0</jgiven-kotlin.version>
</properties>

<modules>
Expand Down Expand Up @@ -296,13 +296,17 @@

<build>
<defaultGoal>clean package</defaultGoal>

<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>

<pluginManagement>
<plugins>
<!-- Coverage metering -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.9</version>
<version>0.8.10</version>
<executions>
<execution>
<id>pre-unit-test</id>
Expand Down Expand Up @@ -422,45 +426,11 @@
</configuration>
</plugin>

<plugin>
<!-- for packaging springboot application -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${springboot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclude>
<exclude>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclude>
<exclude>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclude>
<exclude>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<!-- for loading and unpacking artifacts -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>

<plugin>
Expand All @@ -476,8 +446,8 @@
<version>${kotlin.version}</version>
<configuration>
<jvmTarget>${java.version}</jvmTarget>
<apiVersion>1.5</apiVersion>
<languageVersion>1.5</languageVersion>
<apiVersion>1.8</apiVersion>
<languageVersion>1.8</languageVersion>
<args>
<arg>-Xjsr305=strict</arg>
</args>
Expand All @@ -500,9 +470,6 @@
<goal>kapt</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
</sourceDirs>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.springframework.boot</groupId>
Expand All @@ -517,12 +484,6 @@
<goals>
<goal>compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/target/generated-sources/swagger/src/main/java</sourceDir>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
Expand Down Expand Up @@ -552,7 +513,7 @@

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.2</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
<runOrder>random</runOrder>
Expand All @@ -563,7 +524,7 @@
</excludes>
<!-- Sets the VM argument line used when unit tests are run. -->
<!-- prevent the annoying ForkedBooter process from stealing window focus on Mac OS -->
<argLine>-Djava.awt.headless=true ${surefireArgLine} -XX:+StartAttachListener</argLine>
<argLine>-Djava.awt.headless=true @{surefireArgLine} -XX:+StartAttachListener</argLine>
<systemPropertyVariables>
<jgiven.report.dir>${project.build.directory}/jgiven-reports</jgiven.report.dir>
</systemPropertyVariables>
Expand All @@ -573,7 +534,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.2</version>
<executions>
<execution>
<goals>
Expand All @@ -589,15 +550,15 @@
</includes>
<!-- Sets the VM argument line used when integration tests are run. -->
<!-- prevent the annoying ForkedBooter process from stealing window focus on Mac OS -->
<argLine>-Djava.awt.headless=true ${failsafeArgLine} -XX:+StartAttachListener</argLine>
<argLine>-Djava.awt.headless=true @{failsafeArgLine} -XX:+StartAttachListener</argLine>
</configuration>
</plugin>

<!-- javadoc for kotlin -->
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>1.8.10</version>
<version>1.9.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -613,7 +574,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -633,7 +594,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</version>
</parent>

<artifactId>polyflow-taskpool-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.camunda.bpm.engine.variable.value.TypedValue
*/
interface ProcessVariableValue {
val type: ProcessVariableValueType
val value: Any
val value: Any?
}

/**
Expand All @@ -23,7 +23,7 @@ data class TypedValueProcessVariableValue(override val value: TypedValue)
* Implementation of the process variable value, where the value itself is represented by a 'primitive' class.
*/
data class PrimitiveProcessVariableValue(
override val value: Any
override val value: Any?
) : ProcessVariableValue {
override val type: ProcessVariableValueType = ProcessVariableValueType.PRIMITIVE
}
Expand All @@ -46,7 +46,7 @@ enum class ProcessVariableValueType {
*/
TYPE_VALUE,
/**
* Some of the types are native to serialize. These are:
* Some types are native to serialize. These are:
* - Numbers (Integer, Float, Double)
* - Boolean
* - String
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package io.holunda.camunda.taskpool.api.task

import java.util.function.Predicate

/**
* Filter for task commands.
*/
interface EngineTaskCommandFilter : Predicate<EngineTaskCommand> {
/**
* Tests if the task command should be sent.
* @param engineTaskCommand commend to test.
* @return true, if command should be emitted. Defaults to false.
*/
override fun test(engineTaskCommand: EngineTaskCommand): Boolean = false
}
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.8.3-SNAPSHOT</version>
<version>3.14.4-SNAPSHOT</version>
</parent>

<artifactId>polyflow-taskpool-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class TaskAggregate() {
private lateinit var id: String
internal lateinit var task: Task

private var deleted = false
private var completed = false
internal var deleted = false
internal var completed = false

/**
* This a non-static handler for create command.
Expand Down Expand Up @@ -277,5 +277,4 @@ class TaskAggregate() {
fun on(event: TaskDeletedEngineEvent) {
this.deleted = true
}

}
Loading

0 comments on commit 6cca571

Please sign in to comment.