Merge pull request #28 from cloudcreate-dk/updates

Updates
cloudcreate-dk · Aug 29, 2024 · 4e0191a · 4e0191a
2 parents 7654d71 + d066bfd
commit 4e0191a
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 52 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.9'
-
 networks:
   default:
     name: essentials-spring-boot-examples

diff --git a/...cloudcreate/essentials/spring/examples/mongodb/messaging/shipping/commands/ShipOrder.java b/...cloudcreate/essentials/spring/examples/mongodb/messaging/shipping/commands/ShipOrder.java
@@ -19,7 +19,9 @@
 import dk.cloudcreate.essentials.spring.examples.mongodb.messaging.shipping.OrderId;
 import lombok.*;
 
-@Value
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class ShipOrder {
     @NonNull
     public OrderId orderId;

diff --git a/pom.xml b/pom.xml
@@ -61,63 +61,65 @@
         <skipDependencyCheck>false</skipDependencyCheck>
 
         <!--Essentials versions-->
-        <essentials.version>0.40.7</essentials.version>
-        <postgresql.version>42.7.3</postgresql.version>
-        <slf4j.version>2.0.13</slf4j.version>
-        <spring-boot.version>3.2.5</spring-boot.version>
-        <awaitility.version>4.2.1</awaitility.version>
-        <spring-data-mongodb.version>4.2.5</spring-data-mongodb.version>
-        <spring-data-jpa.version>3.2.5</spring-data-jpa.version>
-        <objenesis.version>3.3</objenesis.version>
-        <assertj.version>3.25.3</assertj.version>
-        <mongodb-driver-sync.version>4.11.2</mongodb-driver-sync.version>
+        <essentials.version>0.40.15</essentials.version>
+
+        <objenesis.version>3.4</objenesis.version>
+        <postgresql.version>42.7.4</postgresql.version>
+        <slf4j.version>2.0.16</slf4j.version>
+        <spring-boot.version>3.2.9</spring-boot.version>
+        <awaitility.version>4.2.2</awaitility.version>
+        <spring-data-mongodb.version>4.2.9</spring-data-mongodb.version>
+        <spring-data-jpa.version>3.2.9</spring-data-jpa.version>
+        <assertj.version>3.26.3</assertj.version>
+        <mongodb-driver-sync.version>4.11.3</mongodb-driver-sync.version>
         <log4j-to-slf4j.version>2.23.1</log4j-to-slf4j.version>
         <json-smart.version>2.5.1</json-smart.version>
         <json-path.version>2.9.0</json-path.version>
         <snakeyaml.version>2.2</snakeyaml.version>
-        <micrometer.version>1.12.5</micrometer.version>
-        <micrometer-tracing.version>1.2.5</micrometer-tracing.version>
-        <netty-bom.version>4.1.109.Final</netty-bom.version>
-        <junit-bom.version>5.10.2</junit-bom.version>
-        <testcontainers-bom.version>1.19.7</testcontainers-bom.version>
-        <jdbi3-bom.version>3.45.1</jdbi3-bom.version>
-        <jackson-bom.version>2.17.0</jackson-bom.version>
-        <reactor-bom.version>2023.0.5</reactor-bom.version>
-        <spring-framework-bom.version>6.1.6</spring-framework-bom.version>
-        <mockito-bom.version>5.11.0</mockito-bom.version>
-        <logback.version>1.5.6</logback.version>
-        <avro.version>1.11.3</avro.version>
-        <commons-compress.version>1.26.1</commons-compress.version>
+        <micrometer.version>1.12.9</micrometer.version>
+        <micrometer-tracing.version>1.2.9</micrometer-tracing.version>
+        <netty-bom.version>4.1.112.Final</netty-bom.version>
+        <junit-bom.version>5.11.0</junit-bom.version>
+        <testcontainers-bom.version>1.20.1</testcontainers-bom.version>
+        <jdbi3-bom.version>3.45.4</jdbi3-bom.version>
+        <jackson-bom.version>2.17.2</jackson-bom.version>
+        <reactor-bom.version>2023.0.9</reactor-bom.version>
+        <spring-framework-bom.version>6.1.12</spring-framework-bom.version>
+        <mockito-bom.version>5.13.0</mockito-bom.version>
+        <logback.version>1.5.7</logback.version>
+        <avro.version>1.12.0</avro.version>
+        <commons-compress.version>1.27.1</commons-compress.version>
+        <xmlunit-core.version>2.10.0</xmlunit-core.version>
 
         <!-- Examples specific versions -->
-        <spring-kafka.version>3.1.4</spring-kafka.version>
-        <kafka-clients.version>3.7.0</kafka-clients.version>
-        <lombok.version>1.18.32</lombok.version>
+        <spring-kafka.version>3.1.8</spring-kafka.version>
+        <kafka-clients.version>3.8.0</kafka-clients.version>
+        <lombok.version>1.18.34</lombok.version>
         <prometheus-simpleclient.version>0.16.0</prometheus-simpleclient.version>
         <zipkin-reporter-brave.version>2.17.2</zipkin-reporter-brave.version>
-        <loki-logback-appender.version>1.5.1</loki-logback-appender.version>
+        <loki-logback-appender.version>1.5.2</loki-logback-appender.version>
 
         <!-- Maven plugin versions -->
-        <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
-        <maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
-        <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
-        <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
+        <maven-dependency-plugin.version>3.8.0</maven-dependency-plugin.version>
+        <maven-project-info-reports-plugin.version>3.7.0</maven-project-info-reports-plugin.version>
+        <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
+        <maven-install-plugin.version>3.1.3</maven-install-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-        <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
-        <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
-        <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
+        <maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
+        <maven-site-plugin.version>3.20.0</maven-site-plugin.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-        <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
+        <maven-failsafe-plugin.version>3.4.0</maven-failsafe-plugin.version>
+        <maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-        <versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
-        <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+        <versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
+        <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
         <minimum-maven-version>3.8.8</minimum-maven-version>
-        <dependency-check-maven.version>9.1.0</dependency-check-maven.version>
+        <dependency-check-maven.version>10.0.3</dependency-check-maven.version>
         <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-        <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
+        <maven-gpg-plugin.version>3.2.5</maven-gpg-plugin.version>
     </properties>
 
     <modules>
@@ -188,10 +190,17 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <version>${spring-boot.version}</version>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>
-            <version>1.1.10.5</version>
+            <version>1.1.10.6</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -288,6 +297,13 @@
             <version>${slf4j.version}</version>
         </dependency>
         <!-- Test -->
+        <!-- Due to  CVE-2024-31573 in xmlunit-core-2.9.1.jar -->
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <version>${xmlunit-core.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>

diff --git a/postgresql-cqrs/pom.xml b/postgresql-cqrs/pom.xml
@@ -43,11 +43,11 @@
             <artifactId>eventsourced-aggregates</artifactId>
             <version>${essentials.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.objenesis</groupId>-->
-<!--            <artifactId>objenesis</artifactId>-->
-<!--            <version>${objenesis.version}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>${objenesis.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>

diff --git a/...k/cloudcreate/essentials/spring/examples/postgresql/cqrs/shipping/commands/ShipOrder.java b/...k/cloudcreate/essentials/spring/examples/postgresql/cqrs/shipping/commands/ShipOrder.java
@@ -20,6 +20,8 @@
 import lombok.*;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class ShipOrder {
     @NonNull
     public OrderId orderId;

diff --git a/postgresql-inbox-outbox/README.md b/postgresql-inbox-outbox/README.md
@@ -13,7 +13,7 @@ from within your IDE or using Maven `mvn verify -pl :postgresql-inbox-outbox` fr
 Alternatively you can start the Spring Boot application standalone from the **root** of the `essentials-spring-examples` project folder using
 ```bash
 docker compose up -d
-mvn spring-boot:run -pl :mongodb-inbox-outbox
+mvn spring-boot:run -pl :postgresql-inbox-outbox
 ```
 
 The last command will block the current terminal, so to continue you need to open a new Terminal.

diff --git a/...udcreate/essentials/spring/examples/postgresql/messaging/shipping/commands/ShipOrder.java b/...udcreate/essentials/spring/examples/postgresql/messaging/shipping/commands/ShipOrder.java
@@ -19,7 +19,9 @@
 import dk.cloudcreate.essentials.spring.examples.postgresql.messaging.shipping.OrderId;
 import lombok.*;
 
-@Value
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class ShipOrder {
     @NonNull
     public OrderId orderId;