Merge branch 'release/4.4.0'

holunda-io · Mar 4, 2025 · 7ef54fb · 7ef54fb
2 parents 168e76a + cc74330
commit 7ef54fb
Show file tree

Hide file tree

Showing 118 changed files with 840 additions and 715 deletions.
diff --git a/bom/datapool-dependencies/pom.xml b/bom/datapool-dependencies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.3.0</version>
+    <version>4.4.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-root</artifactId>
-    <version>4.3.0</version>
+    <version>4.4.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -21,11 +21,11 @@
     <springboot.version>3.2.6</springboot.version>
     <camunda-commons-typed-values.version>7.22.0</camunda-commons-typed-values.version>
 
-    <axon-bom.version>4.10.4</axon-bom.version>
-    <axon-kotlin.version>4.10.0</axon-kotlin.version>
+    <axon-bom.version>4.11.1</axon-bom.version>
+    <axon-kotlin.version>4.11.0</axon-kotlin.version>
     <axon-gateway-extension.version>2.1.0</axon-gateway-extension.version>
 
-    <awaitility.version>4.2.2</awaitility.version>
+    <awaitility.version>4.3.0</awaitility.version>
     <mockito-kotlin.version>5.4.0</mockito-kotlin.version>
     <jgiven.version>2.0.1</jgiven.version>
     <jgiven-kotlin.version>2.0.1.0</jgiven-kotlin.version>
@@ -162,6 +162,11 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <dependency>
+        <groupId>io.toolisticon.spring</groupId>
+        <artifactId>spring-boot-conditions</artifactId>
+        <version>1.0.0</version>
+      </dependency>
 
       <dependency>
         <groupId>org.camunda.commons</groupId>
@@ -197,7 +202,7 @@
 
       <!-- Logging -->
       <dependency>
-        <groupId>io.github.microutils</groupId>
+        <groupId>io.github.oshai</groupId>
         <artifactId>kotlin-logging-jvm</artifactId>
         <version>${kotlin-logging.version}</version>
       </dependency>
@@ -273,7 +278,7 @@
       <artifactId>kotlin-reflect</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.github.microutils</groupId>
+      <groupId>io.github.oshai</groupId>
       <artifactId>kotlin-logging-jvm</artifactId>
     </dependency>
     <dependency>
@@ -372,7 +377,7 @@
           <!-- java compiler -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.13.0</version>
+          <version>3.14.0</version>
           <configuration>
             <encoding>UTF-8</encoding>
             <source>${java.version}</source>
@@ -620,7 +625,7 @@
         <!-- Install -->
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>3.1.3</version>
+          <version>3.1.4</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/bom/taskpool-dependencies/pom.xml b/bom/taskpool-dependencies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.3.0</version>
+    <version>4.4.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/bus-jackson/pom.xml b/core/bus-jackson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.3.0</version>
+    <version>4.4.0</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 
@@ -60,9 +60,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-      <scope>provided</scope>
+      <groupId>io.toolisticon.spring</groupId>
+      <artifactId>spring-boot-conditions</artifactId>
     </dependency>
 
     <!-- For test only -->

diff --git a/.../main/kotlin/io/holunda/polyflow/bus/jackson/annotation/AbstractQualifiedBeanCondition.kt b/.../main/kotlin/io/holunda/polyflow/bus/jackson/annotation/AbstractQualifiedBeanCondition.kt
diff --git a/...in/kotlin/io/holunda/polyflow/bus/jackson/annotation/ConditionalOnMissingQualifiedBean.kt b/...in/kotlin/io/holunda/polyflow/bus/jackson/annotation/ConditionalOnMissingQualifiedBean.kt
diff --git a/...main/kotlin/io/holunda/polyflow/bus/jackson/annotation/OnMissingQualifiedBeanCondition.kt b/...main/kotlin/io/holunda/polyflow/bus/jackson/annotation/OnMissingQualifiedBeanCondition.kt
diff --git a/...in/io/holunda/polyflow/bus/jackson/config/FallbackPayloadObjectMapperAutoConfiguration.kt b/...in/io/holunda/polyflow/bus/jackson/config/FallbackPayloadObjectMapperAutoConfiguration.kt
@@ -2,18 +2,20 @@ package io.holunda.polyflow.bus.jackson.config
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import io.holunda.polyflow.bus.jackson.annotation.ConditionalOnMissingQualifiedBean
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.holunda.polyflow.bus.jackson.configurePolyflowJacksonObjectMapper
-import mu.KLogging
+import io.toolisticon.spring.condition.ConditionalOnMissingQualifiedBean
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.context.annotation.Bean
 
+private val logger = KotlinLogging.logger {}
+
 /**
  * No @configuration required, used as autoconfiguration.
  */
 class FallbackPayloadObjectMapperAutoConfiguration {
 
-  companion object : KLogging() {
+  companion object {
     const val PAYLOAD_OBJECT_MAPPER = "payloadObjectMapper"
   }
 

diff --git a/core/datapool/datapool-api/pom.xml b/core/datapool/datapool-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.3.0</version>
+    <version>4.4.0</version>
   </parent>
 
   <artifactId>polyflow-datapool-api</artifactId>

diff --git a/core/datapool/datapool-core/pom.xml b/core/datapool/datapool-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.3.0</version>
+    <version>4.4.0</version>
   </parent>
 
   <artifactId>polyflow-datapool-core</artifactId>

diff --git a/...l-core/src/main/kotlin/io/holunda/polyflow/datapool/core/DataPoolCoreAxonConfiguration.kt b/...l-core/src/main/kotlin/io/holunda/polyflow/datapool/core/DataPoolCoreAxonConfiguration.kt
@@ -6,7 +6,6 @@ import io.holunda.polyflow.datapool.core.business.CreateOrUpdateCommandHandler
 import io.holunda.polyflow.datapool.core.business.DataEntryAggregate
 import io.holunda.polyflow.datapool.core.business.upcaster.DataEntryCreatedEventUpcaster
 import io.holunda.polyflow.datapool.core.repository.FirstEventOnlyEventSourcingRepository
-import mu.KLogging
 import org.axonframework.common.caching.Cache
 import org.axonframework.common.caching.WeakReferenceCache
 import org.axonframework.eventsourcing.EventCountSnapshotTriggerDefinition
@@ -22,7 +21,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 
-
 /**
  * Configuration of polyflow data pool core axon setup.
  */
@@ -33,7 +31,7 @@ import org.springframework.context.annotation.Import
   DataEntryCreatedEventUpcaster::class
 )
 class DataPoolCoreAxonConfiguration {
-  companion object : KLogging() {
+  companion object {
     const val DATA_ENTRY_REPOSITORY = "dataEntryEventSourcingRepository"
     const val DATA_ENTRY_SNAPSHOTTER = "dataEntrySnapshotter"
     const val DATA_ENTRY_CACHE = "dataEntryCache"