Merge pull request #18 from cloudcreate-dk/release_0_20_6

Release 0.20.6
cloudcreate-dk · Oct 22, 2023 · e74382b · e74382b
2 parents e98369c + 7152664
commit e74382b
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 # Essentials Spring Example
 
-> Note: [For a Java version 11 version, please see the java11 branch](https://github.com/cloudcreate-dk/essentials-spring-examples/tree/java11)
+| Essentials version                                                                           | Java compatibility | Spring Boot compatibility |
+|----------------------------------------------------------------------------------------------|--------------------|---------------------------|
+| [0.9.*](https://github.com/cloudcreate-dk/essentials-spring-examples/tree/java11)            | 11-16              | 2.7.x                     |
+| [0.20.*](https://github.com/cloudcreate-dk/essentials-spring-examples/tree/springboot_3_0_x) | 17+                | 3.0.x                     |
+| [0.30.*](https://github.com/cloudcreate-dk/essentials-spring-examples/tree/main)             | 17+                | 3.1.x                     |
 
 Examples of how to use the Essentials and Essentials Components together with Spring and Spring Boot:
 

diff --git a/pom.xml b/pom.xml
@@ -58,22 +58,22 @@
         <java.version>17</java.version>
 
         <revision>DEV-SNAPSHOT</revision>
-        <essentials.version>0.20.5</essentials.version>
+        <essentials.version>0.20.6</essentials.version>
 
-        <slf4j.version>2.0.7</slf4j.version>
+        <slf4j.version>2.0.9</slf4j.version>
         <postgresql.version>42.6.0</postgresql.version>
         <objenesis.version>3.3</objenesis.version>
         <assertj.version>3.24.2</assertj.version>
         <awaitility.version>4.2.0</awaitility.version>
-        <spring-boot.version>3.0.9</spring-boot.version>
-        <spring-kafka.version>3.0.9</spring-kafka.version>
-        <kafka-clients.version>3.5.1</kafka-clients.version>
-        <spring-data-mongodb.version>4.0.9</spring-data-mongodb.version>
-        <log4j-to-slf4j.version>2.20.0</log4j-to-slf4j.version>
+        <spring-boot.version>3.0.12</spring-boot.version>
+        <spring-kafka.version>3.0.12</spring-kafka.version>
+        <kafka-clients.version>3.6.0</kafka-clients.version>
+        <spring-data-mongodb.version>4.0.11</spring-data-mongodb.version>
+        <log4j-to-slf4j.version>2.21.0</log4j-to-slf4j.version>
         <json-smart.version>2.5.0</json-smart.version>
-        <micrometer.version>1.11.3</micrometer.version>
-        <micrometer-tracing.version>1.1.4</micrometer-tracing.version>
-        <lombok.version>1.18.28</lombok.version>
+        <micrometer.version>1.11.5</micrometer.version>
+        <micrometer-tracing.version>1.1.6</micrometer-tracing.version>
+        <lombok.version>1.18.30</lombok.version>
     </properties>
 
     <modules>
@@ -94,42 +94,42 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-bom</artifactId>
-                <version>1.18.3</version>
+                <version>1.19.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.jdbi</groupId>
                 <artifactId>jdbi3-bom</artifactId>
-                <version>3.41.0</version>
+                <version>3.41.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.15.2</version>
+                <version>2.15.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>io.projectreactor</groupId>
                 <artifactId>reactor-bom</artifactId>
-                <version>2022.0.10</version>
+                <version>2022.0.12</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-bom</artifactId>
-                <version>5.4.0</version>
+                <version>5.6.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>6.0.11</version>
+                <version>6.0.13</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -140,7 +140,7 @@
         <dependency>
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>
-            <version>1.1.10.3</version>
+            <version>1.1.10.5</version>
         </dependency>
 
         <!-- Tracing, Latency and Metric setup is inspired by https://spring.io/blog/2022/10/12/observability-with-spring-boot-3 / https://github.com/marcingrzejszczak/observability-boot-blog-post -->
@@ -216,7 +216,7 @@
         <dependency>
             <groupId>com.github.loki4j</groupId>
             <artifactId>loki-logback-appender</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.2</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -312,7 +312,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -336,7 +336,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.16.0</version>
+                    <version>2.16.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -360,7 +360,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -396,7 +396,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>8.4.0</version>
+                <version>8.4.1</version>
                 <configuration>
                     <skipTestScope>false</skipTestScope>
                     <failBuildOnCVSS>0</failBuildOnCVSS>

diff --git a/...pring/examples/postgresql/cqrs/shipping/adapters/kafka/outgoing/ExternalOrderShipped.java b/...pring/examples/postgresql/cqrs/shipping/adapters/kafka/outgoing/ExternalOrderShipped.java
@@ -22,7 +22,8 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ExternalOrderShipped extends ExternalOrderShippingEvent {
-    public ExternalOrderShipped(@NonNull OrderId orderId) {
-        super(orderId);
+    public ExternalOrderShipped(@NonNull OrderId orderId, long eventOrder) {
+        super(orderId, eventOrder);
     }
+
 }
diff --git a/...examples/postgresql/cqrs/shipping/adapters/kafka/outgoing/ExternalOrderShippingEvent.java b/...examples/postgresql/cqrs/shipping/adapters/kafka/outgoing/ExternalOrderShippingEvent.java
@@ -25,4 +25,5 @@
 public abstract class ExternalOrderShippingEvent {
     @NonNull
     public final OrderId orderId;
+    public final long    eventOrder;
 }
diff --git a/...xamples/postgresql/cqrs/shipping/adapters/kafka/outgoing/ShippingEventKafkaPublisher.java b/...xamples/postgresql/cqrs/shipping/adapters/kafka/outgoing/ShippingEventKafkaPublisher.java
@@ -22,6 +22,7 @@
 import dk.cloudcreate.essentials.components.eventsourced.eventstore.postgresql.subscription.EventStoreSubscriptionManager;
 import dk.cloudcreate.essentials.components.foundation.messaging.MessageHandler;
 import dk.cloudcreate.essentials.components.foundation.messaging.eip.store_and_forward.Inboxes;
+import dk.cloudcreate.essentials.components.foundation.messaging.queue.OrderedMessage;
 import dk.cloudcreate.essentials.components.foundation.reactive.command.DurableLocalCommandBus;
 import dk.cloudcreate.essentials.spring.examples.postgresql.cqrs.shipping.domain.ShippingOrders;
 import dk.cloudcreate.essentials.spring.examples.postgresql.cqrs.shipping.domain.events.OrderShipped;
@@ -63,9 +64,9 @@ protected List<AggregateType> reactsToEventsRelatedToAggregateTypes() {
     }
 
     @MessageHandler
-    void handle(OrderShipped e) {
+    void handle(OrderShipped e, OrderedMessage eventMessage) {
         log.info("*** Received {} for Order '{}' and adding it to the Outbox as a {} message", e.getClass().getSimpleName(), e.orderId, ExternalOrderShipped.class.getSimpleName());
-        var externalEvent = new ExternalOrderShipped(e.orderId);
+        var externalEvent = new ExternalOrderShipped(e.orderId, eventMessage.getOrder());
         log.info("*** Forwarding {} message to Kafka. Order '{}'", externalEvent.getClass().getSimpleName(), externalEvent.orderId);
         var producerRecord = new ProducerRecord<String, Object>(SHIPPING_EVENTS_TOPIC_NAME,
                                                                 externalEvent.orderId.toString(),

diff --git a/...dcreate/essentials/spring/examples/postgresql/cqrs/shipping/OrderShippingProcessorIT.java b/...dcreate/essentials/spring/examples/postgresql/cqrs/shipping/OrderShippingProcessorIT.java
@@ -134,6 +134,7 @@ void receiving_an_OrderAccepted_event_for_a_registered_ShippingOrder_results_in_
                   .untilAsserted(() -> assertThat(shippingRecordsReceived.size()).isEqualTo(1));
         assertThat(shippingRecordsReceived.get(0).value()).isInstanceOf(ExternalOrderShipped.class);
         assertThat((CharSequence) ((ExternalOrderShipped) shippingRecordsReceived.get(0).value()).orderId).isEqualTo(orderId);
+        assertThat(((ExternalOrderShipped) shippingRecordsReceived.get(0).value()).eventOrder).isEqualTo(1L);
 
         // Verify that both the DurableLocalCommandBus and Outbox are empty
         var commandQueueName = commandBus.getCommandQueueName();

diff --git a/postgresql-inbox-outbox/pom.xml b/postgresql-inbox-outbox/pom.xml
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
+            <version>${lombok.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/project-suppression.xml b/project-suppression.xml
@@ -294,4 +294,11 @@
         <packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
         <cve>CVE-2023-35116</cve>
     </suppress>
+    <suppress base="true">
+        <notes><![CDATA[
+   See https://github.com/jeremylong/DependencyCheck/issues/5912
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/io\.netty/netty-handler@.*$</packageUrl>
+        <cve>CVE-2023-4586</cve>
+    </suppress>
 </suppressions>