From 129e7fa03c2c8fd15bd2f746e83e1b7d8d50eb4b Mon Sep 17 00:00:00 2001 From: Karsten Schnitter Date: Thu, 30 Oct 2025 11:30:23 +0100 Subject: [PATCH 1/2] Improve MDC CleanUp Signed-off-by: Karsten Schnitter --- .../hcp/cf/logback/filter/CustomLoggingTurboFilterTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logback/filter/CustomLoggingTurboFilterTest.java b/cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logback/filter/CustomLoggingTurboFilterTest.java index f5983d31..8893b4f1 100644 --- a/cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logback/filter/CustomLoggingTurboFilterTest.java +++ b/cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logback/filter/CustomLoggingTurboFilterTest.java @@ -5,6 +5,7 @@ import ch.qos.logback.core.spi.FilterReply; import com.sap.hcp.cf.logging.common.helper.DynamicLogLevelHelper; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.MDC; @@ -24,8 +25,9 @@ public class CustomLoggingTurboFilterTest { private final Logger logger = Mockito.mock(Logger.class); + @BeforeEach @AfterEach - public void teardown() { + public void clear() { MDC.clear(); } From 0c505432f80c800efabc5a651484dbfc9c49c81a Mon Sep 17 00:00:00 2001 From: Karsten Schnitter Date: Thu, 30 Oct 2025 11:37:17 +0100 Subject: [PATCH 2/2] Fix Maven Configuration - use correct job names - reduce log verbosity during dependency downloads Signed-off-by: Karsten Schnitter --- .github/workflows/maven-verify.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 474aa464..cb25824c 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -9,29 +9,29 @@ on: jobs: build-main: - if: github.base_ref == 'release-3' + if: github.base_ref == 'main' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' - - name: Clean with Maven - run: mvn clean + java-version: '17' - name: Build with Maven - run: mvn verify - - build-release-4: - if: github.base_ref == 'main' + run: mvn -B -ntp -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify + build-release-3: + if: github.base_ref == 'release-3' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '11' + - name: Clean with Maven + run: mvn clean - name: Build with Maven - run: mvn clean verify + run: + run: mvn -B -ntp -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn verify