From 358703412ad7a725bfc452c13ae4cc312469f8b1 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Tue, 24 Jan 2023 17:47:31 +0100 Subject: [PATCH 01/10] Update for next development version --- bom/bom/pom.xml | 2 +- bom/parent/pom.xml | 2 +- example/axon/flight-axon/pom.xml | 2 +- example/axon/hotel-axon/pom.xml | 2 +- example/axon/reservation-axon/pom.xml | 2 +- example/common/pom.xml | 2 +- example/itest/pom.xml | 2 +- example/pom.xml | 2 +- example/spring-cloud/flight-kafka/pom.xml | 2 +- example/spring-cloud/hotel-kafka/pom.xml | 2 +- example/spring-cloud/reservation-kafka/pom.xml | 2 +- extension/axon/pom.xml | 2 +- extension/cockpit-plugin/pom.xml | 2 +- extension/core/pom.xml | 2 +- extension/spring-boot-starter/pom.xml | 2 +- extension/spring-cloud-stream/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bom/bom/pom.xml b/bom/bom/pom.xml index 91984bd..c5ec79e 100644 --- a/bom/bom/pom.xml +++ b/bom/bom/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-root - 1.1.0 + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml index 81c7a76..6e1a34b 100644 --- a/bom/parent/pom.xml +++ b/bom/parent/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-root - 1.1.0 + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/example/axon/flight-axon/pom.xml b/example/axon/flight-axon/pom.xml index 9f4d882..695648f 100644 --- a/example/axon/flight-axon/pom.xml +++ b/example/axon/flight-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/example/axon/hotel-axon/pom.xml b/example/axon/hotel-axon/pom.xml index 0de07d9..5b83587 100644 --- a/example/axon/hotel-axon/pom.xml +++ b/example/axon/hotel-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/example/axon/reservation-axon/pom.xml b/example/axon/reservation-axon/pom.xml index b1f155d..464b706 100644 --- a/example/axon/reservation-axon/pom.xml +++ b/example/axon/reservation-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/example/common/pom.xml b/example/common/pom.xml index 10ecc17..a221b45 100644 --- a/example/common/pom.xml +++ b/example/common/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.0 + 1.1.1-SNAPSHOT ../pom.xml diff --git a/example/itest/pom.xml b/example/itest/pom.xml index 2147d5f..d77c7ec 100644 --- a/example/itest/pom.xml +++ b/example/itest/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.0 + 1.1.1-SNAPSHOT ../pom.xml diff --git a/example/pom.xml b/example/pom.xml index 8d3fbf7..03adc4f 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.0 + 1.1.1-SNAPSHOT ../bom/parent/pom.xml diff --git a/example/spring-cloud/flight-kafka/pom.xml b/example/spring-cloud/flight-kafka/pom.xml index 6746131..2bce203 100644 --- a/example/spring-cloud/flight-kafka/pom.xml +++ b/example/spring-cloud/flight-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/example/spring-cloud/hotel-kafka/pom.xml b/example/spring-cloud/hotel-kafka/pom.xml index 5a472ae..4e492e1 100644 --- a/example/spring-cloud/hotel-kafka/pom.xml +++ b/example/spring-cloud/hotel-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/example/spring-cloud/reservation-kafka/pom.xml b/example/spring-cloud/reservation-kafka/pom.xml index 3d4fa79..063d8d0 100644 --- a/example/spring-cloud/reservation-kafka/pom.xml +++ b/example/spring-cloud/reservation-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../pom.xml diff --git a/extension/axon/pom.xml b/extension/axon/pom.xml index c84d67b..0f215f6 100644 --- a/extension/axon/pom.xml +++ b/extension/axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../bom/parent/pom.xml diff --git a/extension/cockpit-plugin/pom.xml b/extension/cockpit-plugin/pom.xml index eb33fc9..33aa9be 100644 --- a/extension/cockpit-plugin/pom.xml +++ b/extension/cockpit-plugin/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../bom/parent/pom.xml diff --git a/extension/core/pom.xml b/extension/core/pom.xml index 5d503bc..4bfaf72 100644 --- a/extension/core/pom.xml +++ b/extension/core/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../bom/parent/pom.xml diff --git a/extension/spring-boot-starter/pom.xml b/extension/spring-boot-starter/pom.xml index 395f20b..63b69a7 100644 --- a/extension/spring-boot-starter/pom.xml +++ b/extension/spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../bom/parent/pom.xml diff --git a/extension/spring-cloud-stream/pom.xml b/extension/spring-cloud-stream/pom.xml index b499fbb..1acd5d2 100644 --- a/extension/spring-cloud-stream/pom.xml +++ b/extension/spring-cloud-stream/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.0 + 1.1.1-SNAPSHOT ../../bom/parent/pom.xml diff --git a/pom.xml b/pom.xml index 4bace20..9931e47 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.holunda camunda-bpm-correlate-root - 1.1.0 + 1.1.1-SNAPSHOT pom ${project.artifactId} https://github.com/holunda-io/camunda-bpm-correlate/ From b5b35645ad752c5cb2c42de123707e3b1531b752 Mon Sep 17 00:00:00 2001 From: Lars Bilger Date: Wed, 1 Feb 2023 23:17:21 +0100 Subject: [PATCH 02/10] feat: add a custom grouping key to CorrelationHint that controls how batches are built --- .../bpm/correlate/correlation/BatchCorrelationProcessor.kt | 6 +++--- .../camunda/bpm/correlate/correlation/CorrelationBatch.kt | 6 +++--- .../holunda/camunda/bpm/correlate/event/CorrelationHint.kt | 6 +++++- .../persist/impl/DefaultMessagePersistenceService.kt | 4 ++-- .../kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt | 1 + .../correlate/correlation/BatchCorrelationProcessorTest.kt | 6 +++--- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/BatchCorrelationProcessor.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/BatchCorrelationProcessor.kt index e56bf5c..994c358 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/BatchCorrelationProcessor.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/BatchCorrelationProcessor.kt @@ -23,9 +23,9 @@ class BatchCorrelationProcessor( .filterNot { it.correlationMessages.isEmpty() } .forEach { batch -> try { - logger.debug { "Correlating batch ${batch.correlationHint} containing ${batch.correlationMessages.size} messages." } + logger.debug { "Correlating batch ${batch.groupingKey} containing ${batch.correlationMessages.size} messages." } val result: CorrelationBatchResult = correlationService.correlateBatch(batch) - logger.debug { "Processing result for batch ${batch.correlationHint}: $result" } + logger.debug { "Processing result for batch ${batch.groupingKey}: $result" } when (result) { is CorrelationBatchResult.Success -> { persistenceService.success(successfulCorrelations = result.successfulCorrelations) @@ -49,7 +49,7 @@ class BatchCorrelationProcessor( ) ) correlationMetrics.incrementError() - logger.trace(e) { "Error processing for batch ${batch.correlationHint}" } + logger.trace(e) { "Error processing for batch ${batch.groupingKey}" } } } } diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/CorrelationBatch.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/CorrelationBatch.kt index 238140d..5c8cdac 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/CorrelationBatch.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/CorrelationBatch.kt @@ -3,11 +3,11 @@ package io.holunda.camunda.bpm.correlate.correlation import io.holunda.camunda.bpm.correlate.event.CorrelationHint /** - * Correlation batch is a collection of messages with the same correlation hint. - * @param correlationHint target of the correlation. + * Correlation batch is a collection of messages with the same grouping key. + * @param groupingKey key for this batch. * @param correlationMessages messages that should be correlated. */ data class CorrelationBatch( - val correlationHint: CorrelationHint, + val groupingKey: Any, val correlationMessages: List ) diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt index 0f84169..f1a935d 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt @@ -34,7 +34,11 @@ data class CorrelationHint( /** * Flag if only process start events should be considered. */ - val processStart: Boolean = false + val processStart: Boolean = false, + /** + * Any value used for grouping messages into batches. Messages with equal groupingKeys will end up in the same batch. + */ + val groupingKey: Any = correlationVariables ) { /** diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt index f42cb24..eb35618 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt @@ -85,10 +85,10 @@ class DefaultMessagePersistenceService( // build batches val batches: List = messagesWithRetries .keys - .groupBy(singleMessageCorrelationStrategy.correlationSelector()) + .groupBy { singleMessageCorrelationStrategy.correlationSelector()(it).groupingKey } .map { CorrelationBatch( - correlationHint = it.key, + groupingKey = it.key, correlationMessages = it.value.sortedWith(singleMessageCorrelationStrategy.correlationMessageSorter()) ) } diff --git a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt index e72aa9c..af2efa7 100644 --- a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt +++ b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt @@ -30,6 +30,7 @@ fun rejectingFilter() = RejectingMessageFilter() fun runningInstanceHint(processInstanceId: String) = CorrelationHint( processDefinitionId = "DEF-ID", processInstanceId = processInstanceId, + groupingKey = processInstanceId ) fun correlationMessage() = CorrelationMessage( diff --git a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/correlation/BatchCorrelationProcessorTest.kt b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/correlation/BatchCorrelationProcessorTest.kt index 01b9c5f..7b023c9 100644 --- a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/correlation/BatchCorrelationProcessorTest.kt +++ b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/correlation/BatchCorrelationProcessorTest.kt @@ -10,11 +10,11 @@ internal class BatchCorrelationProcessorTest { private val batches = arrayOf( CorrelationBatch( - correlationHint = runningInstanceHint("instance1"), + groupingKey = runningInstanceHint("instance1").groupingKey, correlationMessages = listOf(correlationMessage(), correlationMessage(), correlationMessage()) ), CorrelationBatch( - correlationHint = runningInstanceHint("instance2"), + groupingKey = runningInstanceHint("instance2").groupingKey, correlationMessages = listOf(correlationMessage(), correlationMessage()) ) ) @@ -98,4 +98,4 @@ internal class BatchCorrelationProcessorTest { } -} \ No newline at end of file +} From b4c88a1dfed40b4d2d664a817cc354c648448f65 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Mon, 6 Feb 2023 21:36:02 +0100 Subject: [PATCH 03/10] minor improvements --- .../io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt | 1 + .../correlate/persist/impl/DefaultMessagePersistenceService.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt index f1a935d..a4ef0f7 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/event/CorrelationHint.kt @@ -37,6 +37,7 @@ data class CorrelationHint( val processStart: Boolean = false, /** * Any value used for grouping messages into batches. Messages with equal groupingKeys will end up in the same batch. + * Defaults to correlation variables. */ val groupingKey: Any = correlationVariables ) { diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt index eb35618..9a81409 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt @@ -85,7 +85,7 @@ class DefaultMessagePersistenceService( // build batches val batches: List = messagesWithRetries .keys - .groupBy { singleMessageCorrelationStrategy.correlationSelector()(it).groupingKey } + .groupBy { singleMessageCorrelationStrategy.correlationSelector().invoke(it).groupingKey } .map { CorrelationBatch( groupingKey = it.key, From 5cd28ea367406dd6ef2e5097255f059f91f72499 Mon Sep 17 00:00:00 2001 From: Lars Bilger Date: Mon, 5 Jun 2023 22:03:55 +0200 Subject: [PATCH 04/10] feature: add messageTimestamp to MessageMetaData and implement a Comparator that sorts by it. Fixes #44 --- ...geTimestampCorrelationMessageComparator.kt | 11 +++++ .../correlation/metadata/MessageMetaData.kt | 5 ++ .../metadata/MessageMetaDataSnippet.kt | 46 ++++--------------- .../impl/DefaultMessagePersistenceService.kt | 3 +- .../camunda/bpm/correlate/TestFixtures.kt | 1 + 5 files changed, 27 insertions(+), 39 deletions(-) create mode 100644 extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/impl/MessageTimestampCorrelationMessageComparator.kt diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/impl/MessageTimestampCorrelationMessageComparator.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/impl/MessageTimestampCorrelationMessageComparator.kt new file mode 100644 index 0000000..2bbdc2b --- /dev/null +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/impl/MessageTimestampCorrelationMessageComparator.kt @@ -0,0 +1,11 @@ +package io.holunda.camunda.bpm.correlate.correlation.impl + +import io.holunda.camunda.bpm.correlate.correlation.CorrelationMessage + +/** + * Correlation message comparator taking message timestamp as a reference. + */ +class MessageTimestampCorrelationMessageComparator : Comparator { + override fun compare(left: CorrelationMessage, right: CorrelationMessage): Int = + left.messageMetaData.messageTimestamp.compareTo(right.messageMetaData.messageTimestamp) +} diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaData.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaData.kt index 5dbdbb9..08ead82 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaData.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaData.kt @@ -10,6 +10,10 @@ data class MessageMetaData( * Message id. */ val messageId: String, + /** + * Timestamp of the message. + */ + val messageTimestamp: Instant, /** * Payload type info. */ @@ -32,6 +36,7 @@ data class MessageMetaData( */ constructor(snippet: MessageMetaDataSnippet) : this( messageId = requireNotNull(snippet.messageId) { "Message id must not be null" }, + messageTimestamp = snippet.messageTimestamp ?: Instant.now(), payloadTypeInfo = requireNotNull(snippet.payloadTypeInfo) { "Payload type info must not be null" }, payloadEncoding = requireNotNull(snippet.payloadEncoding) { "Payload encoding must be set" }, timeToLive = snippet.timeToLive, diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaDataSnippet.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaDataSnippet.kt index a075462..9b28171 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaDataSnippet.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaDataSnippet.kt @@ -37,44 +37,14 @@ data class MessageMetaDataSnippet( /** * Reducer for snippets. */ - fun reduce(acc: MessageMetaDataSnippet, other: MessageMetaDataSnippet): MessageMetaDataSnippet = - acc.let { - if (other.messageId != null) { - it.copy(messageId = other.messageId) - } else { - it - } - }.let { - if (other.timeToLive != null) { - it.copy(timeToLive = other.timeToLive) - } else { - it - } - }.let { - if (other.expiration != null) { - it.copy(expiration = other.expiration) - } else { - it - } - }.let { - if (other.payloadEncoding != null) { - it.copy(payloadEncoding = other.payloadEncoding) - } else { - it - } - }.let { - if (other.payloadTypeInfo != TypeInfo.UNKNOWN && it.payloadTypeInfo.overwritePossible) { - it.copy(payloadTypeInfo = other.payloadTypeInfo) - } else { - it - } - }.let { - if (other.messageTimestamp != null) { - it.copy(messageTimestamp = other.messageTimestamp) - } else { - it - } - } + fun reduce(acc: MessageMetaDataSnippet, other: MessageMetaDataSnippet): MessageMetaDataSnippet = MessageMetaDataSnippet( + messageId = other.messageId ?: acc.messageId, + timeToLive = other.timeToLive ?: acc.timeToLive, + expiration = other.expiration ?: acc.expiration, + payloadEncoding = other.payloadEncoding ?: acc.payloadEncoding, + payloadTypeInfo = if(other.payloadTypeInfo != TypeInfo.UNKNOWN && acc.payloadTypeInfo.overwritePossible) other.payloadTypeInfo else acc.payloadTypeInfo, + messageTimestamp = other.messageTimestamp ?: acc.messageTimestamp + ) } /** diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt index 9a81409..d4f1b6b 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/persist/impl/DefaultMessagePersistenceService.kt @@ -54,6 +54,7 @@ class DefaultMessagePersistenceService( ) val messageMetaData = MessageMetaData( messageId = entity.id, + messageTimestamp = entity.inserted, payloadTypeInfo = typeInfo, timeToLive = entity.timeToLiveDuration, payloadEncoding = entity.payloadEncoding, @@ -163,7 +164,7 @@ class DefaultMessagePersistenceService( messageRepository.insert( MessageEntity( id = metaData.messageId, - inserted = clock.instant(), + inserted = metaData.messageTimestamp, payloadEncoding = metaData.payloadEncoding, payloadTypeNamespace = metaData.payloadTypeInfo.namespace, payloadTypeName = metaData.payloadTypeInfo.name, diff --git a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt index af2efa7..d5d1511 100644 --- a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt +++ b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/TestFixtures.kt @@ -17,6 +17,7 @@ fun emptyMessage() = ObjectMessage(mapOf(), "") fun emptyMessageMetadata() = MessageMetaData( messageId = messageId(), + messageTimestamp = Instant.now(), payloadTypeInfo = TypeInfo.UNKNOWN, payloadEncoding = "", timeToLive = null, From 0a4937f1b774ecbe4a95177dcb183c703e31999b Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Tue, 6 Jun 2023 17:52:40 +0200 Subject: [PATCH 05/10] add tests for snippet reduction --- .../metadata/MessageMetaDataSnippetTest.kt | 62 +++++++++++++++++++ .../cloudstream/StreamByteMessageConsumer.kt | 2 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaDataSnippetTest.kt diff --git a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaDataSnippetTest.kt b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaDataSnippetTest.kt new file mode 100644 index 0000000..6eb4998 --- /dev/null +++ b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaDataSnippetTest.kt @@ -0,0 +1,62 @@ +package io.holunda.camunda.bpm.correlate.correlation.metadata + +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test +import java.time.Duration +import java.time.Instant +import java.time.ZoneOffset +import java.util.* + + +internal class MessageMetaDataSnippetTest { + @Test + fun `reduces adding not-null values`() { + + val messageMetaData = MessageMetaDataSnippet( + messageId = UUID.randomUUID().toString(), + messageTimestamp = Instant.now(), + payloadTypeInfo = TypeInfo.from("namespace", "name", "1"), + payloadEncoding = "jackson" + ) + + val channelMetaData = MessageMetaDataSnippet( + timeToLive = Duration.ofHours(2).toString(), + expiration = Instant.now().atOffset(ZoneOffset.UTC).toLocalDate().atStartOfDay(ZoneOffset.UTC).plusDays(1).toInstant() + ) + + val reduced = MessageMetaDataSnippet.reduce(messageMetaData, channelMetaData) + assertThat(reduced.messageId).isEqualTo(messageMetaData.messageId) + assertThat(reduced.messageTimestamp).isEqualTo(messageMetaData.messageTimestamp) + assertThat(reduced.payloadTypeInfo).isEqualTo(messageMetaData.payloadTypeInfo) + assertThat(reduced.payloadEncoding).isEqualTo(messageMetaData.payloadEncoding) + assertThat(reduced.timeToLive).isEqualTo(channelMetaData.timeToLive) + assertThat(reduced.expiration).isEqualTo(channelMetaData.expiration) + } + + @Test + fun `reduces taking values from the second`() { + + val messageMetaData = MessageMetaDataSnippet( + messageId = UUID.randomUUID().toString(), + messageTimestamp = Instant.now(), + payloadTypeInfo = TypeInfo.from("namespace", "name", "1"), + payloadEncoding = "jackson" + ) + + val channelMetaData = MessageMetaDataSnippet( + timeToLive = Duration.ofHours(2).toString(), + expiration = Instant.now().atOffset(ZoneOffset.UTC).toLocalDate().atStartOfDay(ZoneOffset.UTC).plusDays(1).toInstant(), + messageTimestamp = Instant.now(), + payloadEncoding = "xml" + ) + + val reduced = MessageMetaDataSnippet.reduce(messageMetaData, channelMetaData) + assertThat(reduced.messageId).isEqualTo(messageMetaData.messageId) + assertThat(reduced.messageTimestamp).isEqualTo(channelMetaData.messageTimestamp) + assertThat(reduced.payloadTypeInfo).isEqualTo(messageMetaData.payloadTypeInfo) + assertThat(reduced.payloadEncoding).isEqualTo(channelMetaData.payloadEncoding) + assertThat(reduced.timeToLive).isEqualTo(channelMetaData.timeToLive) + assertThat(reduced.expiration).isEqualTo(channelMetaData.expiration) + } + +} diff --git a/extension/spring-cloud-stream/src/main/kotlin/io/holunda/camunda/bpm/correlate/ingress/cloudstream/StreamByteMessageConsumer.kt b/extension/spring-cloud-stream/src/main/kotlin/io/holunda/camunda/bpm/correlate/ingress/cloudstream/StreamByteMessageConsumer.kt index a308643..390b3b0 100644 --- a/extension/spring-cloud-stream/src/main/kotlin/io/holunda/camunda/bpm/correlate/ingress/cloudstream/StreamByteMessageConsumer.kt +++ b/extension/spring-cloud-stream/src/main/kotlin/io/holunda/camunda/bpm/correlate/ingress/cloudstream/StreamByteMessageConsumer.kt @@ -22,7 +22,7 @@ class StreamByteMessageConsumer( override fun accept(message: Message) { metrics.incrementReceived(channelName, CHANNEL_TYPE) - val headers = streamChannelMessageHeaderConverter.extractMessageHeaders(message) + val headers: Map = streamChannelMessageHeaderConverter.extractMessageHeaders(message) logger.debug { "Received message $headers" } if (messageAcceptor.supports(headers)) { messageAcceptor.accept(ByteMessage(headers = headers, payload = message.payload)) From cbc30bc986b7f381f06f5832e242dfb75ca6516b Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Thu, 15 Jun 2023 12:42:43 +0200 Subject: [PATCH 06/10] change default initialization for message timestamp in streams --- .../correlate/correlation/metadata/MessageMetaData.kt | 2 +- .../ingress/message/DelegatingChannelMessageTest.kt | 4 +++- .../KafkaStreamChannelMessageHeaderConverter.kt | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaData.kt b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaData.kt index 08ead82..6e89676 100644 --- a/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaData.kt +++ b/extension/core/src/main/kotlin/io/holunda/camunda/bpm/correlate/correlation/metadata/MessageMetaData.kt @@ -36,7 +36,7 @@ data class MessageMetaData( */ constructor(snippet: MessageMetaDataSnippet) : this( messageId = requireNotNull(snippet.messageId) { "Message id must not be null" }, - messageTimestamp = snippet.messageTimestamp ?: Instant.now(), + messageTimestamp = requireNotNull(snippet.messageTimestamp) { "Message timestamp must not be null" }, payloadTypeInfo = requireNotNull(snippet.payloadTypeInfo) { "Payload type info must not be null" }, payloadEncoding = requireNotNull(snippet.payloadEncoding) { "Payload encoding must be set" }, timeToLive = snippet.timeToLive, diff --git a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/ingress/message/DelegatingChannelMessageTest.kt b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/ingress/message/DelegatingChannelMessageTest.kt index 7e746bc..821280f 100644 --- a/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/ingress/message/DelegatingChannelMessageTest.kt +++ b/extension/core/src/test/kotlin/io/holunda/camunda/bpm/correlate/ingress/message/DelegatingChannelMessageTest.kt @@ -10,6 +10,7 @@ import io.holunda.camunda.bpm.correlate.ingress.impl.PersistingChannelMessageAcc import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.mockito.kotlin.* +import java.time.Instant /** * Test to simulate the usage of delegation message for Axon Framework use case. @@ -27,7 +28,8 @@ internal class DelegatingChannelMessageTest { headers = mapOf( HeaderNames.ID to "VALUE", HeaderNames.PAYLOAD_TYPE_CLASS_NAME to PayloadType::class.java.canonicalName, - HeaderNames.PAYLOAD_ENCODING to "jackson" + HeaderNames.PAYLOAD_ENCODING to "jackson", + HeaderNames.TIMESTAMP to Instant.now().toString() ), payload = payload ), payloadSupplier = { payload -> convert(payload.deserializePayload()) } diff --git a/extension/spring-cloud-stream/src/main/kotlin/io/holunda/camunda/bpm/correlate/ingress/cloudstream/KafkaStreamChannelMessageHeaderConverter.kt b/extension/spring-cloud-stream/src/main/kotlin/io/holunda/camunda/bpm/correlate/ingress/cloudstream/KafkaStreamChannelMessageHeaderConverter.kt index 6d4bc3d..086867e 100644 --- a/extension/spring-cloud-stream/src/main/kotlin/io/holunda/camunda/bpm/correlate/ingress/cloudstream/KafkaStreamChannelMessageHeaderConverter.kt +++ b/extension/spring-cloud-stream/src/main/kotlin/io/holunda/camunda/bpm/correlate/ingress/cloudstream/KafkaStreamChannelMessageHeaderConverter.kt @@ -18,7 +18,14 @@ class KafkaStreamChannelMessageHeaderConverter : StreamChannelMessageHeaderConve */ override fun extractMessageHeaders(message: Message): Map { return builder() - .set(HEADER_MESSAGE_TIMESTAMP, Instant.ofEpochMilli(message.headers.timestamp!!).toString()) + .set( + HEADER_MESSAGE_TIMESTAMP, + if (message.headers.timestamp != null) { + Instant.ofEpochMilli(message.headers.timestamp!!) + } else { + Instant.now() + }.toString() + ) .set(HEADER_MESSAGE_ID, message.headers.id!!.toString()) .build().apply { this.putAll(message.headers.normalized()) From 2a3d1834c06452dac7702c1602b10bf4d19eec57 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Thu, 15 Jun 2023 12:53:42 +0200 Subject: [PATCH 07/10] chore: update versions --- .github/dependabot.yml | 2 +- bom/parent/pom.xml | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4cc25b8..37f9565 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,6 @@ updates: directory: "/" schedule: interval: daily - open-pull-requests-limit: 10 + open-pull-requests-limit: 15 default-labels: - "Type: dependencies" diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml index 6e1a34b..9ec35b3 100644 --- a/bom/parent/pom.xml +++ b/bom/parent/pom.xml @@ -14,7 +14,7 @@ POM / Parent - 2.7.5 + 2.7.12 7.18.0 1.2.8 4.38.0 @@ -80,7 +80,7 @@ org.mockito.kotlin mockito-kotlin - 4.0.0 + 5.0.0 test diff --git a/pom.xml b/pom.xml index 9931e47..0daafa7 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 11 - 1.7.21 + 1.8.22 From d56824d7cddf37f88afe243de5e6ae417b380f0b Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Thu, 15 Jun 2023 12:56:54 +0200 Subject: [PATCH 08/10] chore: update maven version --- .github/workflows/development.yml | 4 ++-- .github/workflows/master.yml | 4 ++-- .mvn/wrapper/maven-wrapper.properties | 6 +++--- pom.xml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index e2b9bc9..c3bc03d 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -33,11 +33,11 @@ jobs: # Build - name: Build with Maven - run: ./mvnw clean verify -U -B -T4 + run: ./mvnw clean verify -U -B -T4 -ntp # itest - name: Run itest - run: ./mvnw integration-test failsafe:verify -Pitest -U -B -T4 + run: ./mvnw integration-test failsafe:verify -Pitest -U -B -T4 -ntp - name: Upload coverage to Codecov if: github.event_name == 'push' && github.actor != 'dependabot[bot]' diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 62d64ea..f9c7d45 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -37,11 +37,11 @@ jobs: # Build - name: Build with Maven - run: ./mvnw clean verify -U -B -T4 + run: ./mvnw clean verify -U -B -T4 -ntp # Publish release - name: Deploy a new release version to Maven Central - run: ./mvnw clean deploy -B -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}" -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}" + run: ./mvnw clean deploy -B -ntp -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}" -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}" env: OSS_CENTRAL_USERNAME: "${{ secrets.SONATYPE_USERNAME }}" OSS_CENTRAL_PASSWORD: "${{ secrets.SONATYPE_PASSWORD }}" diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 8c79a83..8e86bbe 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -5,14 +5,14 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/pom.xml b/pom.xml index 0daafa7..07b5b89 100644 --- a/pom.xml +++ b/pom.xml @@ -528,7 +528,7 @@ 11 - 3.6.0 + 3.9.0 From 60a05d4702ce19e964d062c5710c0735ff4368b4 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Fri, 16 Jun 2023 15:30:17 +0200 Subject: [PATCH 09/10] Update versions for release --- bom/bom/pom.xml | 2 +- bom/parent/pom.xml | 2 +- example/axon/flight-axon/pom.xml | 2 +- example/axon/hotel-axon/pom.xml | 2 +- example/axon/reservation-axon/pom.xml | 2 +- example/common/pom.xml | 2 +- example/itest/pom.xml | 2 +- example/pom.xml | 2 +- example/spring-cloud/flight-kafka/pom.xml | 2 +- example/spring-cloud/hotel-kafka/pom.xml | 2 +- example/spring-cloud/reservation-kafka/pom.xml | 2 +- extension/axon/pom.xml | 2 +- extension/cockpit-plugin/pom.xml | 2 +- extension/core/pom.xml | 2 +- extension/spring-boot-starter/pom.xml | 2 +- extension/spring-cloud-stream/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bom/bom/pom.xml b/bom/bom/pom.xml index c5ec79e..2d4810f 100644 --- a/bom/bom/pom.xml +++ b/bom/bom/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-root - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../pom.xml diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml index 9ec35b3..152b499 100644 --- a/bom/parent/pom.xml +++ b/bom/parent/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-root - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../pom.xml diff --git a/example/axon/flight-axon/pom.xml b/example/axon/flight-axon/pom.xml index 695648f..aa4f442 100644 --- a/example/axon/flight-axon/pom.xml +++ b/example/axon/flight-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../pom.xml diff --git a/example/axon/hotel-axon/pom.xml b/example/axon/hotel-axon/pom.xml index 5b83587..da9b63b 100644 --- a/example/axon/hotel-axon/pom.xml +++ b/example/axon/hotel-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../pom.xml diff --git a/example/axon/reservation-axon/pom.xml b/example/axon/reservation-axon/pom.xml index 464b706..bb6439b 100644 --- a/example/axon/reservation-axon/pom.xml +++ b/example/axon/reservation-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../pom.xml diff --git a/example/common/pom.xml b/example/common/pom.xml index a221b45..2a925eb 100644 --- a/example/common/pom.xml +++ b/example/common/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml diff --git a/example/itest/pom.xml b/example/itest/pom.xml index d77c7ec..804053f 100644 --- a/example/itest/pom.xml +++ b/example/itest/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../pom.xml diff --git a/example/pom.xml b/example/pom.xml index 03adc4f..7ee7721 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../bom/parent/pom.xml diff --git a/example/spring-cloud/flight-kafka/pom.xml b/example/spring-cloud/flight-kafka/pom.xml index 2bce203..6dd953c 100644 --- a/example/spring-cloud/flight-kafka/pom.xml +++ b/example/spring-cloud/flight-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../pom.xml diff --git a/example/spring-cloud/hotel-kafka/pom.xml b/example/spring-cloud/hotel-kafka/pom.xml index 4e492e1..f8bf041 100644 --- a/example/spring-cloud/hotel-kafka/pom.xml +++ b/example/spring-cloud/hotel-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../pom.xml diff --git a/example/spring-cloud/reservation-kafka/pom.xml b/example/spring-cloud/reservation-kafka/pom.xml index 063d8d0..7316800 100644 --- a/example/spring-cloud/reservation-kafka/pom.xml +++ b/example/spring-cloud/reservation-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../pom.xml diff --git a/extension/axon/pom.xml b/extension/axon/pom.xml index 0f215f6..3030fff 100644 --- a/extension/axon/pom.xml +++ b/extension/axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../bom/parent/pom.xml diff --git a/extension/cockpit-plugin/pom.xml b/extension/cockpit-plugin/pom.xml index 33aa9be..7dbe858 100644 --- a/extension/cockpit-plugin/pom.xml +++ b/extension/cockpit-plugin/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../bom/parent/pom.xml diff --git a/extension/core/pom.xml b/extension/core/pom.xml index 4bfaf72..570f68a 100644 --- a/extension/core/pom.xml +++ b/extension/core/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../bom/parent/pom.xml diff --git a/extension/spring-boot-starter/pom.xml b/extension/spring-boot-starter/pom.xml index 63b69a7..270bf97 100644 --- a/extension/spring-boot-starter/pom.xml +++ b/extension/spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../bom/parent/pom.xml diff --git a/extension/spring-cloud-stream/pom.xml b/extension/spring-cloud-stream/pom.xml index 1acd5d2..c6d8b58 100644 --- a/extension/spring-cloud-stream/pom.xml +++ b/extension/spring-cloud-stream/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT ../../bom/parent/pom.xml diff --git a/pom.xml b/pom.xml index 07b5b89..6f5233e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.holunda camunda-bpm-correlate-root - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT pom ${project.artifactId} https://github.com/holunda-io/camunda-bpm-correlate/ From 6af1c7ab787faceb7fdf9af14d05d106ec450e2f Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Fri, 16 Jun 2023 15:31:51 +0200 Subject: [PATCH 10/10] Update for next development version --- bom/bom/pom.xml | 2 +- bom/parent/pom.xml | 2 +- example/axon/flight-axon/pom.xml | 2 +- example/axon/hotel-axon/pom.xml | 2 +- example/axon/reservation-axon/pom.xml | 2 +- example/common/pom.xml | 2 +- example/itest/pom.xml | 2 +- example/pom.xml | 2 +- example/spring-cloud/flight-kafka/pom.xml | 2 +- example/spring-cloud/hotel-kafka/pom.xml | 2 +- example/spring-cloud/reservation-kafka/pom.xml | 2 +- extension/axon/pom.xml | 2 +- extension/cockpit-plugin/pom.xml | 2 +- extension/core/pom.xml | 2 +- extension/spring-boot-starter/pom.xml | 2 +- extension/spring-cloud-stream/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bom/bom/pom.xml b/bom/bom/pom.xml index 2d4810f..ad4bed3 100644 --- a/bom/bom/pom.xml +++ b/bom/bom/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-root - 1.2.0-SNAPSHOT + 1.2.0 ../../pom.xml diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml index 152b499..766cd71 100644 --- a/bom/parent/pom.xml +++ b/bom/parent/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-root - 1.2.0-SNAPSHOT + 1.2.0 ../../pom.xml diff --git a/example/axon/flight-axon/pom.xml b/example/axon/flight-axon/pom.xml index aa4f442..387f2eb 100644 --- a/example/axon/flight-axon/pom.xml +++ b/example/axon/flight-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../pom.xml diff --git a/example/axon/hotel-axon/pom.xml b/example/axon/hotel-axon/pom.xml index da9b63b..0388e6d 100644 --- a/example/axon/hotel-axon/pom.xml +++ b/example/axon/hotel-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../pom.xml diff --git a/example/axon/reservation-axon/pom.xml b/example/axon/reservation-axon/pom.xml index bb6439b..3167e6c 100644 --- a/example/axon/reservation-axon/pom.xml +++ b/example/axon/reservation-axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../pom.xml diff --git a/example/common/pom.xml b/example/common/pom.xml index 2a925eb..f07966a 100644 --- a/example/common/pom.xml +++ b/example/common/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.2.0-SNAPSHOT + 1.2.0 ../pom.xml diff --git a/example/itest/pom.xml b/example/itest/pom.xml index 804053f..19cfb17 100644 --- a/example/itest/pom.xml +++ b/example/itest/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.2.0-SNAPSHOT + 1.2.0 ../pom.xml diff --git a/example/pom.xml b/example/pom.xml index 7ee7721..c63d728 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.2.0-SNAPSHOT + 1.2.0 ../bom/parent/pom.xml diff --git a/example/spring-cloud/flight-kafka/pom.xml b/example/spring-cloud/flight-kafka/pom.xml index 6dd953c..a015b9a 100644 --- a/example/spring-cloud/flight-kafka/pom.xml +++ b/example/spring-cloud/flight-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../pom.xml diff --git a/example/spring-cloud/hotel-kafka/pom.xml b/example/spring-cloud/hotel-kafka/pom.xml index f8bf041..337f6dd 100644 --- a/example/spring-cloud/hotel-kafka/pom.xml +++ b/example/spring-cloud/hotel-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../pom.xml diff --git a/example/spring-cloud/reservation-kafka/pom.xml b/example/spring-cloud/reservation-kafka/pom.xml index 7316800..13fa01f 100644 --- a/example/spring-cloud/reservation-kafka/pom.xml +++ b/example/spring-cloud/reservation-kafka/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-example-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../pom.xml diff --git a/extension/axon/pom.xml b/extension/axon/pom.xml index 3030fff..58064d6 100644 --- a/extension/axon/pom.xml +++ b/extension/axon/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../bom/parent/pom.xml diff --git a/extension/cockpit-plugin/pom.xml b/extension/cockpit-plugin/pom.xml index 7dbe858..864bf82 100644 --- a/extension/cockpit-plugin/pom.xml +++ b/extension/cockpit-plugin/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../bom/parent/pom.xml diff --git a/extension/core/pom.xml b/extension/core/pom.xml index 570f68a..94f7fb7 100644 --- a/extension/core/pom.xml +++ b/extension/core/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../bom/parent/pom.xml diff --git a/extension/spring-boot-starter/pom.xml b/extension/spring-boot-starter/pom.xml index 270bf97..d71788a 100644 --- a/extension/spring-boot-starter/pom.xml +++ b/extension/spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../bom/parent/pom.xml diff --git a/extension/spring-cloud-stream/pom.xml b/extension/spring-cloud-stream/pom.xml index c6d8b58..2da8645 100644 --- a/extension/spring-cloud-stream/pom.xml +++ b/extension/spring-cloud-stream/pom.xml @@ -5,7 +5,7 @@ io.holunda camunda-bpm-correlate-parent - 1.2.0-SNAPSHOT + 1.2.0 ../../bom/parent/pom.xml diff --git a/pom.xml b/pom.xml index 6f5233e..617ba73 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.holunda camunda-bpm-correlate-root - 1.2.0-SNAPSHOT + 1.2.0 pom ${project.artifactId} https://github.com/holunda-io/camunda-bpm-correlate/