From 0ffec5dc4fd7314b2d6167a3928c2d8f4a479018 Mon Sep 17 00:00:00 2001
From: Tim Linschoten <tim.linschoten@ing.com>
Date: Mon, 6 Jul 2026 09:17:46 +0200
Subject: [PATCH 1/2] Updated Akka and other dependencies.

---
 .gitignore                                    |  3 ++
 bakery/bakery-interaction-protocol/pom.xml    |  2 +-
 bakery/bakery-interaction/pom.xml             |  2 +-
 bakery/bakery-state/pom.xml                   |  2 +-
 core/baker-akka-actors/pom.xml                |  2 +-
 core/baker-akka-runtime/pom.xml               |  2 +-
 .../{main => test}/resources/application.conf |  0
 core/baker-annotations/pom.xml                |  2 +-
 core/baker-compiler-kotlin/pom.xml            |  2 +-
 core/baker-compiler-scala/pom.xml             |  2 +-
 core/baker-compiler/pom.xml                   |  2 +-
 core/baker-interface-kotlin/pom.xml           |  2 +-
 core/baker-interface/pom.xml                  |  2 +-
 core/baker-intermediate-language/pom.xml      |  2 +-
 core/baker-recipe-dsl-kotlin/pom.xml          |  2 +-
 core/baker-recipe-dsl/pom.xml                 |  2 +-
 core/baker-recipe-manager/pom.xml             |  2 +-
 core/baker-test/pom.xml                       |  2 +-
 core/baker-types/pom.xml                      |  2 +-
 examples/baker-example/pom.xml                |  2 +-
 examples/bakery-client-example/pom.xml        |  2 +-
 .../bakery-kafka-listener-example/pom.xml     |  2 +-
 examples/docs-code-snippets/pom.xml           |  2 +-
 http/baker-http-client/pom.xml                |  2 +-
 http/baker-http-dashboard/pom.xml             |  2 +-
 http/baker-http-server/pom.xml                |  8 +---
 pom.xml                                       | 40 +++++++++++--------
 27 files changed, 50 insertions(+), 47 deletions(-)
 rename core/baker-akka-runtime/src/{main => test}/resources/application.conf (100%)

diff --git a/.gitignore b/.gitignore
index 383c00880..54afa0ce2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,6 @@ Thumbs.db
 
 # Git Files
 .gitconfig
+
+project/target
+project/build.properties
\ No newline at end of file
diff --git a/bakery/bakery-interaction-protocol/pom.xml b/bakery/bakery-interaction-protocol/pom.xml
index 6c6e120dd..362c20690 100644
--- a/bakery/bakery-interaction-protocol/pom.xml
+++ b/bakery/bakery-interaction-protocol/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/bakery/bakery-interaction/pom.xml b/bakery/bakery-interaction/pom.xml
index ffa969e06..4de7b62e9 100644
--- a/bakery/bakery-interaction/pom.xml
+++ b/bakery/bakery-interaction/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/bakery/bakery-state/pom.xml b/bakery/bakery-state/pom.xml
index 88c26c899..e7112da59 100644
--- a/bakery/bakery-state/pom.xml
+++ b/bakery/bakery-state/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-akka-actors/pom.xml b/core/baker-akka-actors/pom.xml
index 95d1e8342..98985303b 100644
--- a/core/baker-akka-actors/pom.xml
+++ b/core/baker-akka-actors/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-akka-runtime/pom.xml b/core/baker-akka-runtime/pom.xml
index 4ceeca6ab..430080769 100644
--- a/core/baker-akka-runtime/pom.xml
+++ b/core/baker-akka-runtime/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-akka-runtime/src/main/resources/application.conf b/core/baker-akka-runtime/src/test/resources/application.conf
similarity index 100%
rename from core/baker-akka-runtime/src/main/resources/application.conf
rename to core/baker-akka-runtime/src/test/resources/application.conf
diff --git a/core/baker-annotations/pom.xml b/core/baker-annotations/pom.xml
index 66eddbe8c..8e0671376 100644
--- a/core/baker-annotations/pom.xml
+++ b/core/baker-annotations/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-compiler-kotlin/pom.xml b/core/baker-compiler-kotlin/pom.xml
index b84d1e12c..249ff5e05 100644
--- a/core/baker-compiler-kotlin/pom.xml
+++ b/core/baker-compiler-kotlin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-compiler-scala/pom.xml b/core/baker-compiler-scala/pom.xml
index 4a578f953..956fe53c8 100644
--- a/core/baker-compiler-scala/pom.xml
+++ b/core/baker-compiler-scala/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-compiler/pom.xml b/core/baker-compiler/pom.xml
index 4cd582af0..cd959c0df 100644
--- a/core/baker-compiler/pom.xml
+++ b/core/baker-compiler/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-interface-kotlin/pom.xml b/core/baker-interface-kotlin/pom.xml
index a943b7618..f534a7937 100644
--- a/core/baker-interface-kotlin/pom.xml
+++ b/core/baker-interface-kotlin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-interface/pom.xml b/core/baker-interface/pom.xml
index 35c18d096..4f64ee328 100644
--- a/core/baker-interface/pom.xml
+++ b/core/baker-interface/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-intermediate-language/pom.xml b/core/baker-intermediate-language/pom.xml
index 7cf82b26f..2fb37dad3 100644
--- a/core/baker-intermediate-language/pom.xml
+++ b/core/baker-intermediate-language/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-recipe-dsl-kotlin/pom.xml b/core/baker-recipe-dsl-kotlin/pom.xml
index ec2c79ae7..01f665e63 100644
--- a/core/baker-recipe-dsl-kotlin/pom.xml
+++ b/core/baker-recipe-dsl-kotlin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-recipe-dsl/pom.xml b/core/baker-recipe-dsl/pom.xml
index 1e4d29bb4..91b193812 100644
--- a/core/baker-recipe-dsl/pom.xml
+++ b/core/baker-recipe-dsl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-recipe-manager/pom.xml b/core/baker-recipe-manager/pom.xml
index ac10b1776..2766c188a 100644
--- a/core/baker-recipe-manager/pom.xml
+++ b/core/baker-recipe-manager/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-test/pom.xml b/core/baker-test/pom.xml
index 639456734..4ca19fd63 100644
--- a/core/baker-test/pom.xml
+++ b/core/baker-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/core/baker-types/pom.xml b/core/baker-types/pom.xml
index 381d6f549..b0bb9ff79 100644
--- a/core/baker-types/pom.xml
+++ b/core/baker-types/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/baker-example/pom.xml b/examples/baker-example/pom.xml
index 5ddda1732..10381fefb 100644
--- a/examples/baker-example/pom.xml
+++ b/examples/baker-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/bakery-client-example/pom.xml b/examples/bakery-client-example/pom.xml
index 61c5f49be..e5475b5a5 100644
--- a/examples/bakery-client-example/pom.xml
+++ b/examples/bakery-client-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/bakery-kafka-listener-example/pom.xml b/examples/bakery-kafka-listener-example/pom.xml
index a77f82b77..30e7fb645 100644
--- a/examples/bakery-kafka-listener-example/pom.xml
+++ b/examples/bakery-kafka-listener-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/docs-code-snippets/pom.xml b/examples/docs-code-snippets/pom.xml
index f0f5a1858..401b62f81 100644
--- a/examples/docs-code-snippets/pom.xml
+++ b/examples/docs-code-snippets/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/http/baker-http-client/pom.xml b/http/baker-http-client/pom.xml
index e2ad5bed1..e221acd82 100644
--- a/http/baker-http-client/pom.xml
+++ b/http/baker-http-client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/http/baker-http-dashboard/pom.xml b/http/baker-http-dashboard/pom.xml
index c3eabbb14..8d9705168 100644
--- a/http/baker-http-dashboard/pom.xml
+++ b/http/baker-http-dashboard/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/http/baker-http-server/pom.xml b/http/baker-http-server/pom.xml
index 43d8c0ccd..b9260c202 100644
--- a/http/baker-http-server/pom.xml
+++ b/http/baker-http-server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ing.baker</groupId>
         <artifactId>baker</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -76,12 +76,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.ing.baker</groupId>
-            <artifactId>baker-compiler</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.ing.baker</groupId>
             <artifactId>baker-compiler-scala</artifactId>
diff --git a/pom.xml b/pom.xml
index c84b18bac..9fb24d24c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ing.baker</groupId>
     <artifactId>baker</artifactId>
-    <version>5.1.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Baker</name>
@@ -19,13 +19,12 @@
         <maven.compiler.target>${jvm.target}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <scala.version>2.13.16</scala.version>
         <scala.compat.version>2.13</scala.compat.version>
 
         <!-- Main Dependency Versions (alphabetically sorted) -->
-        <akka.management.version>1.6.4</akka.management.version>
-        <akka.persistence.cassandra.version>1.3.4</akka.persistence.cassandra.version>
-        <akka.version>2.10.17</akka.version>
+        <akka.management.version>1.6.5</akka.management.version>
+        <akka.persistence.cassandra.version>1.3.5</akka.persistence.cassandra.version>
+        <akka.version>2.10.20</akka.version>
         <cassandra.driver.version>4.17.0</cassandra.driver.version>
         <cats.core.version>2.13.0</cats.core.version>
         <cats.effect.version>3.6.3</cats.effect.version>
@@ -35,25 +34,25 @@
         <ficus.version>1.5.2</ficus.version>
         <fs2.kafka.version>3.9.1</fs2.kafka.version>
         <fs2.version>3.12.2</fs2.version>
-        <guava.version>33.5.0-jre</guava.version>
+        <guava.version>33.6.0-jre</guava.version>
         <http4s.blaze.version>0.23.17</http4s.blaze.version>
         <http4s.prometheus.version>0.25.0</http4s.prometheus.version>
         <http4s.version>0.23.32</http4s.version>
         <jackson.version>2.18.2</jackson.version>
         <javax.inject.version>1</javax.inject.version>
-        <joda.time.version>2.14.0</joda.time.version>
+        <joda.time.version>2.14.2</joda.time.version>
         <jsr305.version>3.0.2</jsr305.version>
-        <kafka.version>4.2.0</kafka.version>
+        <kafka.version>4.3.1</kafka.version>
         <kotlin.version>2.2.20</kotlin.version>
-        <kotlinx.coroutines.version>1.10.2</kotlinx.coroutines.version>
+        <kotlinx.coroutines.version>1.11.0</kotlinx.coroutines.version>
         <log4s.version>1.10.0</log4s.version>
-        <logback.version>1.5.32</logback.version>
-        <metrics.jmx.version>4.2.38</metrics.jmx.version>
+        <logback.version>1.5.37</logback.version>
+        <metrics.jmx.version>4.2.39</metrics.jmx.version>
         <objenesis.version>3.5</objenesis.version>
         <paranamer.version>2.8.3</paranamer.version>
         <prometheus.client.version>0.16.0</prometheus.client.version>
         <prometheus.jmx.version>0.20.0</prometheus.jmx.version>
-        <protobuf.version>3.25.8</protobuf.version>
+        <protobuf.version>4.35.0</protobuf.version>
         <scala.collection.compat.version>2.14.0</scala.collection.compat.version>
         <scala.graph.dot.version>1.13.3</scala.graph.dot.version>
         <scala.graph.version>1.13.6</scala.graph.version>
@@ -63,7 +62,7 @@
         <sensors.version>0.4.1</sensors.version>
         <skuber.version>2.6.7</skuber.version>
         <slf4j.version>2.0.17</slf4j.version>
-        <typesafe.config.version>1.4.6</typesafe.config.version>
+        <typesafe.config.version>1.4.9</typesafe.config.version>
 
         <!-- Test-Only Dependency Versions (alphabetically sorted) -->
         <akka.persistence.inmemory.version>2.5.15.2</akka.persistence.inmemory.version>
@@ -86,20 +85,21 @@
         <scalatest.version>3.2.19</scalatest.version>
 
         <!-- Plugin Dependency Versions (alphabetically sorted) -->
-        <build.helper.maven.plugin.version>3.2.0</build.helper.maven.plugin.version>
+        <build.helper.maven.plugin.version>3.6.1</build.helper.maven.plugin.version>
         <docker.maven.plugin.version>0.48.1</docker.maven.plugin.version>
         <exec.maven.plugin.version>3.6.3</exec.maven.plugin.version>
+        <maven.deploy.plugin.version>3.1.4</maven.deploy.plugin.version>
         <maven.antrun.plugin.version>3.2.0</maven.antrun.plugin.version>
         <maven.assembly.plugin.version>3.8.0</maven.assembly.plugin.version>
         <maven.compiler.plugin.version>3.15.0</maven.compiler.plugin.version>
-        <maven.enforcer.plugin.version>3.6.2</maven.enforcer.plugin.version>
+        <maven.enforcer.plugin.version>3.6.3</maven.enforcer.plugin.version>
         <maven.jar.plugin.version>3.5.0</maven.jar.plugin.version>
-        <maven.resources.plugin.version>3.4.0</maven.resources.plugin.version>
+        <maven.resources.plugin.version>3.5.0</maven.resources.plugin.version>
         <maven.surefire.plugin.version>3.5.5</maven.surefire.plugin.version>
         <maven.version.required>3.9.10</maven.version.required>
         <os.maven.plugin.version>1.7.1</os.maven.plugin.version>
         <protobuf.maven.plugin.version>0.6.1</protobuf.maven.plugin.version>
-        <scala.maven.plugin.version>4.9.9</scala.maven.plugin.version>
+        <scala.maven.plugin.version>4.9.10</scala.maven.plugin.version>
         <scalatest.maven.plugin.version>2.2.0</scalatest.maven.plugin.version>
     </properties>
 
@@ -711,6 +711,12 @@
                     </executions>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${maven.deploy.plugin.version}</version>
+                </plugin>
+
                 <plugin>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>

From 6759a0d57d32044654c510f1e9b36f66b43dcb61 Mon Sep 17 00:00:00 2001
From: Tim Linschoten <tim.linschoten@ing.com>
Date: Mon, 6 Jul 2026 09:42:06 +0200
Subject: [PATCH 2/2] Updated Kotlin version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9fb24d24c..bbf385ec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <joda.time.version>2.14.2</joda.time.version>
         <jsr305.version>3.0.2</jsr305.version>
         <kafka.version>4.3.1</kafka.version>
-        <kotlin.version>2.2.20</kotlin.version>
+        <kotlin.version>2.3.21</kotlin.version>
         <kotlinx.coroutines.version>1.11.0</kotlinx.coroutines.version>
         <log4s.version>1.10.0</log4s.version>
         <logback.version>1.5.37</logback.version>