Merge branch 'springwolf:master' into feature/replace-componentscan

.github/workflows/springwolf-common-model-converters.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - master
-    paths:
-      - '.github/workflows/springwolf-common-model-converters.yml'
-      - 'springwolf-add-ons/springwolf-common-model-converters/**'
   pull_request:
     types: [ opened, synchronize, ready_for_review ]
 

.github/workflows/springwolf-core.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - master
-    paths:
-      - '.github/workflows/springwolf-core.yml'
-      - 'springwolf-core/**'
   pull_request:
     types: [ opened, synchronize, ready_for_review ]
 

.github/workflows/springwolf-sqs.yml → .github/workflows/springwolf-plugins.yml

@@ -1,26 +1,25 @@
-name: springwolf-sqs
+name: springwolf-plugins
 
 on:
   push:
     branches:
       - master
-    paths:
-      - '.github/workflows/springwolf-sqs.yml'
-      - 'springwolf-core/**'
-      - 'springwolf-plugins/springwolf-sqs-plugin/**'
-      - 'springwolf-examples/springwolf-sqs-example/**'
   pull_request:
     types: [ opened, synchronize, ready_for_review ]
 
-env:
-  plugin: springwolf-plugins/springwolf-sqs-plugin
-  example: springwolf-examples/springwolf-sqs-example
-
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        plugin: [ "amqp", "cloud-stream", "kafka", "sqs" ]
+
+    env:
+      plugin: springwolf-plugins/springwolf-${{ matrix.plugin }}-plugin
+      example: springwolf-examples/springwolf-${{ matrix.plugin }}-example
+
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/springwolf-ui.yml

@@ -4,12 +4,6 @@ on:
   push:
     branches:
       - master
-    paths:
-      - '.github/workflows/springwolf-ui.yml'
-      - 'springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json'
-      - 'springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json'
-      - 'springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json'
-      - 'springwolf-ui/**'
   pull_request:
     types: [ opened, synchronize, ready_for_review ]
 

build.gradle

@@ -10,8 +10,8 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.3' apply false
     id 'org.springframework.boot' version '3.1.4' apply false
     id 'org.owasp.dependencycheck' version '8.4.0'
-    id 'com.diffplug.spotless' version '6.21.0'
-    id 'com.bmuschko.docker-spring-boot-application' version '9.3.3' apply false
+    id 'com.diffplug.spotless' version '6.22.0'
+    id 'com.bmuschko.docker-spring-boot-application' version '9.3.4' apply false
 }
 
 applyDotEnvFileAsGradleProperties()

dependencies.gradle

@@ -37,7 +37,8 @@ ext {
 
     jsr305Version = '3.0.2'
 
-    kafkaVersion = '3.5.1'
+    kafkaClientsVersion = '3.5.1'
+    kafkaStreamsVersion = '3.5.1'
 
     jacksonVersion = '2.15.2'
     jakartaAnnotationApiVersion = '2.1.1'
@@ -56,11 +57,5 @@ ext {
 
     swaggerVersion = '2.2.16'
 
-    testcontainersVersion = '1.19.0'
+    testcontainersVersion = '1.19.1'
 }
-
-// spring boot managed dependency versions
-ext {
-    set('kafka.version', ext.kafkaVersion)
-    set('snakeyaml.version', '2.2')
-}