Merge branch 'master' into bug/support-reset-context

MateuszNaKodach · web-flow · commit 625a1fff819b · 2025-01-20T15:35:25.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,7 +10,7 @@ updates:
   labels:
     - "Type: Dependency Upgrade"
     - "Priority 1: Must"
-  milestone: 7
+  milestone: 8
   reviewers:
     - "AxonFramework/framework-developers"
     - "sandjelkovic"
@@ -30,7 +30,7 @@ updates:
   labels:
     - "Type: Dependency Upgrade"
     - "Priority 1: Must"
-  milestone: 7
+  milestone: 8
   reviewers:
     - "AxonFramework/framework-developers"
     - "sandjelkovic"
diff --git a/.github/workflows/dependabot-automation.yml b/.github/workflows/dependabot-automation.yml
@@ -24,19 +24,19 @@ jobs:
                   PR_URL: ${{github.event.pull_request.html_url}}
                   GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-    dependabot-auto-merge:
-        runs-on: ubuntu-latest
-        if: ${{ github.actor == 'dependabot[bot]' }}
-        steps:
-            - name: Retrieve Dependabot metadata
-              id: metadata
-              uses: dependabot/fetch-metadata@v2
-              with:
-                  github-token: "${{ secrets.GITHUB_TOKEN }}"
-
-            - name: Auto-merge Pull Request
-              if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
-              run: gh pr merge --auto --merge "$PR_URL"
-              env:
-                  PR_URL: ${{github.event.pull_request.html_url}}
-                  GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+#    dependabot-auto-merge:
+#        runs-on: ubuntu-latest
+#        if: ${{ github.actor == 'dependabot[bot]' }}
+#        steps:
+#            - name: Retrieve Dependabot metadata
+#              id: metadata
+#              uses: dependabot/fetch-metadata@v2
+#              with:
+#                  github-token: "${{ secrets.GITHUB_TOKEN }}"
+#
+#            - name: Auto-merge Pull Request
+#              if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
+#              run: gh pr merge --auto --merge "$PR_URL"
+#              env:
+#                  PR_URL: ${{github.event.pull_request.html_url}}
+#                  GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
@@ -73,7 +73,7 @@ jobs:
         if: success()
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-        uses: voxmedia/github-action-slack-notify-build@v1.6.0
+        uses: voxmedia/github-action-slack-notify-build@v2
         with:
           channel_id: CAGSEC92A
           status: SUCCESS
@@ -83,7 +83,7 @@ jobs:
         if: failure()
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-        uses: voxmedia/github-action-slack-notify-build@v1.6.0
+        uses: voxmedia/github-action-slack-notify-build@v2
         with:
           channel_id: CAGSEC92A
           status: FAILED
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Are you having trouble using the extension?
 We'd like to help you out the best we can!
 There are a couple of things to consider when you're traversing anything Axon:
 
-* Checking the [reference guide](https://library.axoniq.io/axon_framework_ref/) should be your first stop,
+* Checking the [reference guide](https://library.axoniq.io/axon-framework-reference/) should be your first stop,
   as the majority of possible scenarios you might encounter when using Axon should be covered there.
 * If the Reference Guide does not cover a specific topic you would've expected,
   we'd appreciate if you could post a [new thread/topic on our library fourms describing the problem](https://discuss.axoniq.io/c/26).
diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2023. Axon Framework
+  ~ Copyright (c) 2010-2024. Axon Framework
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.axonframework.extensions.kotlin</groupId>
         <artifactId>axon-kotlin-parent</artifactId>
-      <version>4.9.1-SNAPSHOT</version>
+        <version>4.11.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>axon-coverage-report</artifactId>
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,23 @@
+# Documentation For Axon Framework - Kotlin Extension.
+
+This folder contains the docs related to the Kotlin Extension for Axon Framework. The docs in this folder are written as part of the [AxonIQ Library](https://library.axoniq.io), and are [written in Ascii and built with Antora.](https://library.axoniq.io/contibution-guide/overview/platform.html)
+
+The following are the current documentation sources (folders):
+
+- `extension-guide` : [The Kotlin Extension Guide](https://library.axoniq.io/kotlin-extension-reference/index.html)
+
+## Contributing to the docs.
+
+You are welcome to contribute to these docs. Whether you want to fix a typo, or you find something missing, something that is not clear or can be improved, or even if you want to write an entire piece of docs to illustrate something that could help others to understand the use of the Bike Rental App, you are more than welcome to send a Pull Request to this GitHub repository. Just make sure you follow the guidelines explained in [AxonIQ Library Contribution Guide](https://library.axoniq.io/contibution-guide/index.html)
+
+## Building and testing these docs locally.
+
+If you want to build and explore the docs locally (because you have made changes or before contributing), you can use the Antora's build file in `docs/_playbook` folder.
+
+You can check the [detailed information on how the process to build the docs works](https://library.axoniq.io/contibution-guide/overview/build.html), but in short, all you have to do is:
+
+1. Make sure you have Node (a LTS version is preferred), Antora and Vale installed in your system.
+2. CD to the `docs/_playbook` folder.
+3. Run `npx antora playbook.yaml`. Antora will generate the set of static html files under `docs/_playbook/build/site`
+4. Move to `docs/_playbook/build/site` and execute some local http server to serve files in that directory. For example by executing `python3 -m http.server 8070`
+5. Open your browser and go to `http://localhost:8070`. You should be able to navigate the local version of the docs.
diff --git a/docs/_playbook/playbook.yaml b/docs/_playbook/playbook.yaml
@@ -1,6 +1,6 @@
 site:
   title: Kotlin Extension docs PREVIEW
-  start_page: kotlin_extension_guide::index.adoc
+  start_page: kotlin-extension-reference::index.adoc
 
 content:
   sources:
diff --git a/docs/extension-guide/antora.yml b/docs/extension-guide/antora.yml
diff --git a/docs/extension-guide/modules/nav.adoc b/docs/extension-guide/modules/nav.adoc
diff --git a/docs/reference/antora.yml b/docs/reference/antora.yml
@@ -0,0 +1,16 @@
+name: kotlin-extension-reference
+title: Kotlin Extension Reference
+version:
+    axon-kotlin-(?<version>+({0..9}).+({0..9})).*: $<version>
+    master: development
+prerelease: true
+start_page: ROOT:index.adoc
+
+asciidoc:
+  attributes:
+    component_description: Extension enhancing the development experience when using Kotlin
+    type: extension-reference
+    group: axon-framework
+
+nav:
+  - modules/nav.adoc
diff --git a/docs/reference/modules/ROOT/pages/commands.adoc b/docs/reference/modules/ROOT/pages/commands.adoc
@@ -1,7 +1,7 @@
 :navtitle: Commands
 = Commands
 
-This section describes the additional functionality attached to Axon's xref:axon_framework_ref:axon-framework-commands:README.adoc[command dispatching and handling] logic.
+This section describes the additional functionality attached to Axon's xref:axon-framework-reference:axon-framework-commands:index.adoc[command dispatching and handling] logic.
 
 [[commandgateway]]
 == `CommandGateway`
diff --git a/docs/reference/modules/ROOT/pages/events.adoc b/docs/reference/modules/ROOT/pages/events.adoc
@@ -1,11 +1,11 @@
 :navtitle: Events
 = Events
 
-This section describes the additional functionality attached to Axon's xref:axon_framework_ref:events:README.adoc[event publication and handling] logic.
+This section describes the additional functionality attached to Axon's xref:axon-framework-reference:events:index.adoc[event publication and handling] logic.
 
 == Event upcasters
 
-A simplified implementation of the xref:axon_framework_ref:events:event-versioning.adoc#event-upcasting[Single Event Upcaster] is given, which allows for a shorter implementation cycle. Making an upcaster to upcast the `CardIssuedEvent` from revision `0` to `1` can be written as follows:
+A simplified implementation of the xref:axon-framework-reference:events:event-versioning.adoc#event-upcasting[Single Event Upcaster] is given, which allows for a shorter implementation cycle. Making an upcaster to upcast the `CardIssuedEvent` from revision `0` to `1` can be written as follows:
 
 [source,kotlin]
 ----
diff --git a/docs/reference/modules/ROOT/pages/index.adoc b/docs/reference/modules/ROOT/pages/index.adoc
diff --git a/docs/reference/modules/ROOT/pages/queries.adoc b/docs/reference/modules/ROOT/pages/queries.adoc
@@ -1,7 +1,7 @@
 :navtitle: Queries
 = Queries
 
-This section describes the additional functionality attached to Axon's xref:axon_framework_ref:queries:README.adoc[query dispatching and handling] logic.
+This section describes the additional functionality attached to Axon's xref:axon-framework-reference:queries:index.adoc[query dispatching and handling] logic.
 
 [[querygateway]]
 == `QueryGateway`
diff --git a/docs/reference/modules/ROOT/pages/release-notes.adoc b/docs/reference/modules/ROOT/pages/release-notes.adoc
@@ -0,0 +1,12 @@
+= Release Notes Kotlin Extension
+:navtitle: Release notes
+
+You can find the release notes for the Kotlin Extension of version 4.10.0 below.
+For earlier releases, please go to the link:https://legacydocs.axoniq.io/reference-guide/release-notes/rn-extensions/rn-kotlin[legacy documentation].
+
+== Release 4.10
+
+. Upgrades the Kotlin Extension to be compatible with Axon Framework 4.10.0
+. Adds a serializer with `kotlin.serialization` support
+
+See the link:https://github.com/AxonFramework/extension-kotlin/releases/tag/axon-kotlin-4.10.0[GitHub release notes] for an exhaustive list of all changes.
diff --git a/docs/reference/modules/nav.adoc b/docs/reference/modules/nav.adoc
@@ -0,0 +1,4 @@
+* xref:ROOT:commands.adoc[]
+* xref:ROOT:events.adoc[]
+* xref:ROOT:queries.adoc[]
+* xref:ROOT:release-notes.adoc[]
diff --git a/kotlin-test/pom.xml b/kotlin-test/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2023. Axon Framework
+  ~ Copyright (c) 2010-2024. Axon Framework
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>axon-kotlin-parent</artifactId>
     <groupId>org.axonframework.extensions.kotlin</groupId>
-    <version>4.9.1-SNAPSHOT</version>
+      <version>4.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>axon-kotlin-test</artifactId>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>2.2</version>
+      <version>3.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2023. Axon Framework
+  ~ Copyright (c) 2010-2024. Axon Framework
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.axonframework.extensions.kotlin</groupId>
     <artifactId>axon-kotlin-parent</artifactId>
-    <version>4.9.1-SNAPSHOT</version>
+      <version>4.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>axon-kotlin</artifactId>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
-      <version>3.6.8</version>
+      <version>3.7.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/kotlin/src/main/kotlin/org/axonframework/extensions/kotlin/serialization/KotlinSerializer.kt b/kotlin/src/main/kotlin/org/axonframework/extensions/kotlin/serialization/KotlinSerializer.kt
@@ -15,31 +15,27 @@
  */
 package org.axonframework.extensions.kotlin.serialization
 
-import kotlinx.serialization.BinaryFormat
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialFormat
+import kotlinx.serialization.*
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.StringFormat
 import kotlinx.serialization.builtins.ArraySerializer
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.SetSerializer
 import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.serializer
-import org.axonframework.serialization.AnnotationRevisionResolver
-import org.axonframework.serialization.ChainingConverter
-import org.axonframework.serialization.Converter
-import org.axonframework.serialization.RevisionResolver
-import org.axonframework.serialization.SerializedObject
-import org.axonframework.serialization.SerializedType
+import org.axonframework.serialization.*
 import org.axonframework.serialization.Serializer
-import org.axonframework.serialization.SimpleSerializedObject
-import org.axonframework.serialization.SimpleSerializedType
-import org.axonframework.serialization.UnknownSerializedType
 import java.util.concurrent.ConcurrentHashMap
 import org.axonframework.serialization.SerializationException as AxonSerializationException
 
 /**
- * Implementation of Axon Serializer that uses a kotlinx.serialization implementation.
+ * Implementation of Axon [Serializer] that uses a [kotlinx.serialization] implementation.
+ *
+ * When instantiating the [KotlinSerializer], use the [AxonSerializersModule] to insert serializers for all common
+ * Axon Framework components.
+ * When the desired serialization format is JSON, the construction of the serializer would look as follows:
+ * `KotlinSerializer(serialFormat = Json { serializersModule = AxonSerializersModule })`
+ *
+ * Other construction parameters of the [KotlinSerializer] are the [RevisionResolver]
+ * (defaulted to a [AnnotationRevisionResolver]) and [Converter] (defaulted to a [ChainingConverter]).
  *
  * @see kotlinx.serialization.Serializer
  * @see org.axonframework.serialization.Serializer
diff --git a/pom.xml b/pom.xml
@@ -20,10 +20,10 @@
     <name>Axon Framework - Kotlin Extension</name>
     <description>Extension for Axon Framework that provides Kotlin utilities.</description>
 
-  <groupId>org.axonframework.extensions.kotlin</groupId>
-  <artifactId>axon-kotlin-parent</artifactId>
-  <version>4.9.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
+    <groupId>org.axonframework.extensions.kotlin</groupId>
+    <artifactId>axon-kotlin-parent</artifactId>
+    <version>4.11.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <modules>
         <module>kotlin</module>
@@ -54,13 +54,13 @@
             ${project.basedir}/../coverage-report/target/site/jacoco-aggregate/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
         <!-- Main -->
-        <axon.version>4.9.0</axon.version>
+        <axon.version>4.10.0</axon.version>
         <kotlin.version>1.9.24</kotlin.version>
         <!-- Serialization -->
         <jackson-kotlin.version>2.17.1</jackson-kotlin.version>
         <kotlin-serialization.version>1.6.3</kotlin-serialization.version>
         <!-- Logging -->
-        <slf4j.version>2.0.13</slf4j.version>
+        <slf4j.version>2.0.16</slf4j.version>
         <log4j.version>2.13.3</log4j.version>
         <!-- Testing -->
         <junit.jupiter.version>5.10.1</junit.jupiter.version>
@@ -71,15 +71,15 @@
         <maven-assembly.version>3.7.1</maven-assembly.version>
         <maven-clean.version>3.4.0</maven-clean.version>
         <maven-compiler.version>3.13.0</maven-compiler.version>
-        <maven-deploy.version>3.1.2</maven-deploy.version>
+        <maven-deploy.version>3.1.3</maven-deploy.version>
         <maven-enforcer.version>3.5.0</maven-enforcer.version>
-        <maven-gpg.version>3.2.4</maven-gpg.version>
-        <maven-install.version>3.1.2</maven-install.version>
+        <maven-gpg.version>3.2.7</maven-gpg.version>
+        <maven-install.version>3.1.3</maven-install.version>
         <maven-jar.version>3.4.2</maven-jar.version>
         <maven-javadoc.version>3.5.0</maven-javadoc.version>
         <maven-release.version>3.1.1</maven-release.version>
         <maven-source.version>3.3.1</maven-source.version>
-        <maven-surefire.version>3.3.1</maven-surefire.version>
+        <maven-surefire.version>3.5.2</maven-surefire.version>
         <maven-resources.version>3.3.1</maven-resources.version>
         <!--
         Deactivate dokka by default, and make the build faster for all projects.
