From 2956d9d25ee310a600782cb9c0d7234fc1c9c416 Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Thu, 15 Sep 2022 14:26:42 +0200
Subject: [PATCH 1/4] Add multi-tenancy and spring-native extensions

Add the new Axon Framework Multi-Tenancy and experimental Axon Framework
 Spring Native dependencies.

#feature/add-springnative-and-multitenancy
---
 pom.xml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2ed9ecc..fa33da5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
     <properties>
         <axonserver-connector-java.version>4.5.6</axonserver-connector-java.version>
         <axon.version>4.6.0</axon.version>
+        <axonserver-plugin-api.version>4.5</axonserver-plugin-api.version>
 
         <extension.amqp.version>4.6.0</extension.amqp.version>
         <extension.cdi.version>4.5-alpha1</extension.cdi.version>
@@ -50,10 +51,11 @@
         <extension.kafka.version>4.6.0</extension.kafka.version>
         <extension.kotlin.version>0.2.0</extension.kotlin.version>
         <extension.mongo.version>4.5</extension.mongo.version>
+        <extension.multitenancy.version>4.6.0</extension.multitenancy.version>
         <extension.reactor.version>4.5.1</extension.reactor.version>
+        <extension.spring-native.version>0.1.0</extension.spring-native.version>
         <extension.springcloud.version>4.5</extension.springcloud.version>
         <extension.tracing.version>4.5.2</extension.tracing.version>
-        <axonserver-plugin-api.version>4.5</axonserver-plugin-api.version>
 
         <projectreactor.version>3.4.23</projectreactor.version>
     </properties>
@@ -212,6 +214,22 @@
                 <artifactId>axon-mongo</artifactId>
                 <version>${extension.mongo.version}</version>
             </dependency>
+            <!-- Extension - Multi-Tenancy -->
+            <dependency>
+                <groupId>org.axonframework.extensions.multitenancy</groupId>
+                <artifactId>axon-multitenancy</artifactId>
+                <version>${extension.multitenancy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.axonframework.extensions.multitenancy</groupId>
+                <artifactId>axon-multitenancy-spring-boot-autoconfigure</artifactId>
+                <version>${extension.multitenancy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.axonframework.extensions.multitenancy</groupId>
+                <artifactId>axon-multitenancy-spring-boot-starter</artifactId>
+                <version>${extension.multitenancy.version}</version>
+            </dependency>
             <!-- Extension - Reactor -->
             <dependency>
                 <groupId>org.axonframework.extensions.reactor</groupId>
@@ -228,6 +246,12 @@
                 <artifactId>axon-reactor-spring-boot-starter</artifactId>
                 <version>${extension.reactor.version}</version>
             </dependency>
+            <!-- Extension - Spring-Native -->
+            <dependency>
+                <groupId>org.axonframework.experimental</groupId>
+                <artifactId>axon-spring-native</artifactId>
+                <version>${extension.spring-native.version}</version>
+            </dependency>
             <!-- Extension - Spring Cloud -->
             <dependency>
                 <groupId>org.axonframework.extensions.springcloud</groupId>

From e1f8e30eb04bcd2e2ce4f716ee8c079cee033a41 Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Mon, 19 Sep 2022 10:45:19 +0200
Subject: [PATCH 2/4] Update the README

Update the README.md to include the Multi-Tenancy and Spring-Native
extensions.

#88
---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eb73ed3..3414bc6 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,15 @@ At this stage, the BOM includes the dependencies for the following projects:
 * [Axon Framework Kafka Extension](https://github.com/AxonFramework/extension-kafka)
 * [Axon Framework Kotlin Extension](https://github.com/AxonFramework/extension-kotlin)
 * [Axon Framework Mongo Extension](https://github.com/AxonFramework/extension-mongo)
+* [Axon Framework Multi-Tenancy Extension](https://github.com/AxonFramework/extension-multitenancy)
 * [Axon Framework Reactor Extension](https://github.com/AxonFramework/extension-reactor)
+* [Axon Framework Spring-Native Extension](https://github.com/AxonFramework/extension-spring-native)
 * [Axon Framework Spring Cloud Extension](https://github.com/AxonFramework/extension-springcloud)
 * [Axon Framework Tracing Extension](https://github.com/AxonFramework/extension-tracing)
 
-The Bill of Materials always follows at least the Axon Framework release cycle. So every new Axon Framework version will lead to a new Bill of Materials version. Releases of other dependencies may or may not lead to a new release.
+The Bill of Materials always follows at least the Axon Framework release cycle. 
+So every new Axon Framework version will lead to a new Bill of Materials version. 
+Releases of other dependencies may or may not lead to a new release.
 
 ## Getting Started - Maven
 

From 21c15149e2e52b7ab096612a1108e3b70aaf5116 Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Mon, 19 Sep 2022 11:36:24 +0200
Subject: [PATCH 3/4] Rename multi-tenancy Spring Boot dependencies

The multi-tenancy Spring Boot auto-configure and starter dependency are
not prefixed with `axon-`. Hence, the prefix that's present should be
removed.

#88
---
 pom.xml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 75482cd..ff58831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <groupId>org.axonframework</groupId>
     <artifactId>axon-bom</artifactId>
@@ -62,8 +63,6 @@
 
     <dependencyManagement>
         <dependencies>
-        
-
             <!-- Axon Server Connector -->
             <dependency>
                 <groupId>io.axoniq</groupId>
@@ -76,12 +75,7 @@
                 <artifactId>axonserver-plugin-api</artifactId>
                 <version>${axonserver-plugin-api.version}</version>
             </dependency>
-            <!-- Project reactor - Included to avoid compatability issues when updating from older Axon versions -->
-            <dependency>
-                <groupId>io.projectreactor</groupId>
-                <artifactId>reactor-core</artifactId>
-                <version>${projectreactor.version}</version>
-            </dependency>
+
             <!-- Axon Framework -->
             <dependency>
                 <groupId>org.axonframework</groupId>
@@ -145,12 +139,12 @@
             </dependency>
             <dependency>
                 <groupId>org.axonframework</groupId>
-                <artifactId>axon-tracing-opentelemetry</artifactId>
+                <artifactId>axon-test</artifactId>
                 <version>${axon.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.axonframework</groupId>
-                <artifactId>axon-test</artifactId>
+                <artifactId>axon-tracing-opentelemetry</artifactId>
                 <version>${axon.version}</version>
             </dependency>
             <!-- Extension - AMQP -->
@@ -227,12 +221,12 @@
             </dependency>
             <dependency>
                 <groupId>org.axonframework.extensions.multitenancy</groupId>
-                <artifactId>axon-multitenancy-spring-boot-autoconfigure</artifactId>
+                <artifactId>multitenancy-spring-boot-autoconfigure</artifactId>
                 <version>${extension.multitenancy.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.axonframework.extensions.multitenancy</groupId>
-                <artifactId>axon-multitenancy-spring-boot-starter</artifactId>
+                <artifactId>multitenancy-spring-boot-starter</artifactId>
                 <version>${extension.multitenancy.version}</version>
             </dependency>
             <!-- Extension - Reactor -->
@@ -289,6 +283,13 @@
                 <artifactId>axon-tracing-spring-boot-starter</artifactId>
                 <version>${extension.tracing.version}</version>
             </dependency>
+
+            <!-- Project Reactor - Included to avoid compatability issues when updating from older Axon versions -->
+            <dependency>
+                <groupId>io.projectreactor</groupId>
+                <artifactId>reactor-core</artifactId>
+                <version>${projectreactor.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 5761d7358c7d6549e97ac26883ba3f77aca4871b Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Mon, 19 Sep 2022 11:36:48 +0200
Subject: [PATCH 4/4] Rename multi-tenancy Spring Boot dependencies

The multi-tenancy Spring Boot auto-configure and starter dependency are
not prefixed with `axon-`. Hence, the prefix that's present should be
removed.

#88
---
 pom.xml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff58831..74f83e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,9 +13,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <groupId>org.axonframework</groupId>
     <artifactId>axon-bom</artifactId>
@@ -63,6 +62,7 @@
 
     <dependencyManagement>
         <dependencies>
+        
             <!-- Axon Server Connector -->
             <dependency>
                 <groupId>io.axoniq</groupId>
@@ -76,6 +76,13 @@
                 <version>${axonserver-plugin-api.version}</version>
             </dependency>
 
+            <!-- Project Reactor - Included to avoid compatability issues when updating from older Axon versions -->
+            <dependency>
+                <groupId>io.projectreactor</groupId>
+                <artifactId>reactor-core</artifactId>
+                <version>${projectreactor.version}</version>
+            </dependency>
+
             <!-- Axon Framework -->
             <dependency>
                 <groupId>org.axonframework</groupId>
@@ -147,6 +154,12 @@
                 <artifactId>axon-tracing-opentelemetry</artifactId>
                 <version>${axon.version}</version>
             </dependency>
+            <!-- Extension - Spring-Native -->
+            <dependency>
+                <groupId>org.axonframework.experimental</groupId>
+                <artifactId>axon-spring-native</artifactId>
+                <version>${extension.spring-native.version}</version>
+            </dependency>
             <!-- Extension - AMQP -->
             <dependency>
                 <groupId>org.axonframework.extensions.amqp</groupId>
@@ -245,12 +258,6 @@
                 <artifactId>axon-reactor-spring-boot-starter</artifactId>
                 <version>${extension.reactor.version}</version>
             </dependency>
-            <!-- Extension - Spring-Native -->
-            <dependency>
-                <groupId>org.axonframework.experimental</groupId>
-                <artifactId>axon-spring-native</artifactId>
-                <version>${extension.spring-native.version}</version>
-            </dependency>
             <!-- Extension - Spring Cloud -->
             <dependency>
                 <groupId>org.axonframework.extensions.springcloud</groupId>
@@ -283,13 +290,6 @@
                 <artifactId>axon-tracing-spring-boot-starter</artifactId>
                 <version>${extension.tracing.version}</version>
             </dependency>
-
-            <!-- Project Reactor - Included to avoid compatability issues when updating from older Axon versions -->
-            <dependency>
-                <groupId>io.projectreactor</groupId>
-                <artifactId>reactor-core</artifactId>
-                <version>${projectreactor.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>