From 0b3683a50044ab424493a62cb2f1bf3ce1e813d2 Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
Date: Tue, 10 Jun 2025 13:35:55 +0200
Subject: [PATCH] Update dependabot and actions setup.

Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
---
 .github/dependabot.yml      |  5 -----
 .github/workflows/maven.yml | 35 ++++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 17ec6874d..3a966edb9 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -58,11 +58,6 @@ updates:
     schedule:
       interval: daily
     target-branch: main
-#    ignore:
-#      # only upgrade by minor or patch
-#      - dependency-name: "*"
-#        update-types:
-#          - version-update:semver-major
   - package-ecosystem: npm
     target-branch: docs-build
     directory: /
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7e6f06596..02976f78e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -5,29 +5,38 @@ name: Build
 
 on:
   push:
-    branches: [ main, 4.1.x ]
+    branches: [ main, 4.3.x, 4.2.x, 4.1.x ]
   pull_request:
-    branches: [ main, 4.1.x ]
+    branches: [ main, 4.3.x, 4.2.x, 4.1.x ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        java: ["17"]
-
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-          cache: 'maven'
-      - name: Build with Maven
-        run: ./mvnw clean install -B -U -P sonar
-      - uses: codecov/codecov-action@v5
+          java-version: '17'
+      - name: Cache local Maven repository
+        uses: actions/cache@v4
         with:
-          fail_ci_if_error: false
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v5
+        if: always() # always run even if the previous step fails
+        with:
+          report_paths: '**/surefire-reports/TEST-*.xml'
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v4
+        with:
+          name: surefire-reports
+          path: '**/surefire-reports/*'