Merge branch 'release/4.8.0.1'

holixon · Oct 10, 2023 · d2e1433 · d2e1433
2 parents 4b2af1d + b8e232d
commit d2e1433
Show file tree

Hide file tree

Showing 20 changed files with 120 additions and 29 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -1,7 +1,9 @@
 name: Development branches
 
-on: [ push ]
-
+on:
+  push:
+    branches:
+      - '!master'
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # 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.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
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/README.md b/README.md
@@ -128,6 +128,14 @@ resolve the payload type and revision and a different content retrieval strategy
 
 ## Changelog
 
+### 4.8.0.0
+
+* BREAKING: we removed support for the `axon-testing-jgiven-junit4` module, as junit5 is the new standard. You can still manually use junit4 by using the `core`module and add missing dependencies.
+* Semantic Versioning: To get a bit more freedom when it comes to versioning this lib, we decided to use only the first 2 digits (`4.8.`) to indicate the axon-framework version, the last two digits (`0.0.`) are used for our own minor/patch versions.
+
+
+### 4.7.4.0
+
 * Beginning with release `4.7.4.0` we changed to a semantic versioning model where the first 3 digits refer to the axon framework version this lib is supposed to work withm the last digit is the build version of this lib against the framework.
 
 

diff --git a/examples/bankaccount-jgiven-junit4/pom.xml b/examples/bankaccount-jgiven-junit4/pom.xml
diff --git a/examples/bankaccount-jgiven-junit5/pom.xml b/examples/bankaccount-jgiven-junit5/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>examples</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing.examples</groupId>

diff --git a/examples/bankaccount-upcaster-junit5/pom.xml b/examples/bankaccount-upcaster-junit5/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>examples</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing.examples</groupId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>axon-testing_</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <artifactId>examples</artifactId>

diff --git a/extension/assert/pom.xml b/extension/assert/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>
@@ -39,6 +39,12 @@
     <dependency>
       <groupId>org.axonframework</groupId>
       <artifactId>axon-messaging</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>
diff --git a/extension/jgiven/core/pom.xml b/extension/jgiven/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension-jgiven</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>
@@ -21,6 +21,12 @@
     <dependency>
       <groupId>org.axonframework</groupId>
       <artifactId>axon-test</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>compile</scope>
     </dependency>
 
@@ -36,6 +42,12 @@
     </dependency>
 
     <!-- TEST -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>${junit5.version}</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>io.github.microutils</groupId>

diff --git a/extension/jgiven/junit5/pom.xml b/extension/jgiven/junit5/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension-jgiven</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>
@@ -23,6 +23,12 @@
       <artifactId>jgiven-junit5</artifactId>
       <version>${jgiven.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit5.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>io.toolisticon.testing</groupId>

diff --git a/extension/jgiven/pom.xml b/extension/jgiven/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <artifactId>extension-jgiven</artifactId>

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>axon-testing_</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <artifactId>extension</artifactId>
@@ -23,6 +23,12 @@
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-reflect</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-api.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/extension/upcaster/core/pom.xml b/extension/upcaster/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension-upcaster</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>
@@ -25,6 +25,12 @@
     <dependency>
       <groupId>org.axonframework</groupId>
       <artifactId>axon-configuration</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -63,17 +69,15 @@
       <artifactId>jackson-datatype-jsr310</artifactId>
       <scope>test</scope>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-compiler-embeddable</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>test</scope>
-    </dependency>
-    -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
 

diff --git a/extension/upcaster/junit5/pom.xml b/extension/upcaster/junit5/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension-upcaster</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing</groupId>

diff --git a/extension/upcaster/pom.xml b/extension/upcaster/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>extension</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <artifactId>extension-upcaster</artifactId>

diff --git a/lib/fixtures/bankaccount/pom.xml b/lib/fixtures/bankaccount/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>fixtures</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing.lib</groupId>

diff --git a/lib/fixtures/giftcard/pom.xml b/lib/fixtures/giftcard/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>fixtures</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <groupId>io.holixon.axon.testing.lib</groupId>
@@ -16,6 +16,12 @@
     <dependency>
       <groupId>org.axonframework</groupId>
       <artifactId>axon-configuration</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/lib/fixtures/pom.xml b/lib/fixtures/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>lib</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <artifactId>fixtures</artifactId>
@@ -21,10 +21,22 @@
     <dependency>
       <groupId>org.axonframework</groupId>
       <artifactId>axon-modelling</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.axonframework</groupId>
       <artifactId>axon-spring</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holixon.axon.testing._</groupId>
     <artifactId>axon-testing_</artifactId>
-    <version>4.8.0.0</version>
+    <version>4.8.0.1</version>
   </parent>
 
   <artifactId>lib</artifactId>
@@ -20,4 +20,13 @@
   <modules>
     <module>fixtures</module>
   </modules>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-api.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>io.holixon.axon.testing._</groupId>
   <artifactId>axon-testing_</artifactId>
-  <version>4.8.0.0</version>
+  <version>4.8.0.1</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -22,9 +22,10 @@
     <kotlin.version>1.9.10</kotlin.version>
 
     <!-- LIBS -->
-    <axon-bom.version>4.7.4</axon-bom.version>
+    <axon-bom.version>4.8.3</axon-bom.version>
     <jgiven.version>1.3.0</jgiven.version>
     <jgiven-kotlin.version>1.3.0.0</jgiven-kotlin.version>
+    <slf4j-api.version>2.0.9</slf4j-api.version>
 
     <!-- TEST -->
     <jackson.version>2.15.2</jackson.version>
@@ -112,8 +113,27 @@
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
         <version>1.4.11</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+          </exclusion>
+        </exclusions>
         <scope>test</scope>
       </dependency>
+
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>${assertj.version}</version>
+        <exclusions>
+          <!-- because 3.24.4 comes with v1.12.21 and latest is 1.4.8 -->
+          <exclusion>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>