From 0102a3c34282fdf17ef8a5eb5f9486c1f7ef9bf5 Mon Sep 17 00:00:00 2001
From: Karsten Schnitter <k.schnitter@sap.com>
Date: Thu, 30 Oct 2025 14:05:39 +0100
Subject: [PATCH 1/4] Fix workflow

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
---
 .github/workflows/maven-verify.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 20268b04..5df30239 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -33,5 +33,4 @@ jobs:
       - name: Clean with Maven
         run: mvn clean
       - name: Build with Maven
-        run:
-          run: mvn -B -ntp -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn verify
+        run: mvn -B -ntp -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn verify

From b351a720ca5de6cfcd01d06799ad5d4cd1d5b055 Mon Sep 17 00:00:00 2001
From: Karsten Schnitter <k.schnitter@sap.com>
Date: Thu, 30 Oct 2025 14:08:11 +0100
Subject: [PATCH 2/4] Update maven-verify.yml

---
 .github/workflows/maven-verify.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 5df30239..94299f8e 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build-main:
-    if: github.event.pull_request.base_ref == 'main'
+    if: github.base_ref == 'main'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
       - name: Build with Maven
         run: mvn -B -ntp -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify
   build-release-3:
-    if: github.event.pull_request.base_ref == 'release-3'
+    if: github.base_ref == 'release-3'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

From 1f7d26d93896afd03aa0b4ccc695d4e158575388 Mon Sep 17 00:00:00 2001
From: Karsten Schnitter <k.schnitter@sap.com>
Date: Thu, 30 Oct 2025 14:17:37 +0100
Subject: [PATCH 3/4] Fix artifact version

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
---
 sample-spring-boot/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample-spring-boot/pom.xml b/sample-spring-boot/pom.xml
index e95f70fa..22789804 100644
--- a/sample-spring-boot/pom.xml
+++ b/sample-spring-boot/pom.xml
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>com.sap.hcp.cf.logging</groupId>
             <artifactId>cf-java-logging-support-servlet-dynlog-jwt</artifactId>
-            <version>4.0.0-RC1</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
 

From f58c59a2a139ecc6f34c4ce53ab24664aea96cc5 Mon Sep 17 00:00:00 2001
From: Karsten Schnitter <k.schnitter@sap.com>
Date: Thu, 30 Oct 2025 14:23:02 +0100
Subject: [PATCH 4/4] Add Maven Caching

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
---
 .github/workflows/maven-verify.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 94299f8e..4a2e81a8 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -18,6 +18,13 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
+      - name: Cache Maven dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-17-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-17-
       - name: Build with Maven
         run: mvn -B -ntp -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify
   build-release-3:
@@ -30,6 +37,13 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
+      - name: Cache Maven dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-11-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-11-
       - name: Clean with Maven
         run: mvn clean
       - name: Build with Maven