From 11ab5f2809d4d833fd1f5ae73c239a14e59b515b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2026 23:22:48 +0000 Subject: [PATCH 1/3] chore: [DevOps] bump the production-major group across 1 directory with 2 updates Bumps the production-major group with 2 updates in the / directory: [com.sap.cloud.security:java-bom](https://github.com/SAP/cloud-security-xsuaa-integration) and [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework). Updates `com.sap.cloud.security:java-bom` from 3.6.8 to 4.0.3 - [Release notes](https://github.com/SAP/cloud-security-xsuaa-integration/releases) - [Changelog](https://github.com/SAP/cloud-security-services-integration-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/SAP/cloud-security-xsuaa-integration/compare/3.6.8...4.0.3) Updates `org.checkerframework:checker-qual` from 3.54.0 to 4.0.0 - [Release notes](https://github.com/typetools/checker-framework/releases) - [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.54.0...checker-framework-4.0.0) --- updated-dependencies: - dependency-name: com.sap.cloud.security:java-bom dependency-version: 4.0.3 dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-major - dependency-name: org.checkerframework:checker-qual dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-major ... Signed-off-by: dependabot[bot] --- dependency-bundles/bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency-bundles/bom/pom.xml b/dependency-bundles/bom/pom.xml index a1f45a61d..302cca8e9 100644 --- a/dependency-bundles/bom/pom.xml +++ b/dependency-bundles/bom/pom.xml @@ -55,7 +55,7 @@ - 3.6.8 + 4.0.3 4.5.1 2.0.17 @@ -279,7 +279,7 @@ org.checkerframework checker-qual - 3.54.0 + 4.0.0 From 87f7b672f0aba5d1fb956441cae341763baa4a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20D=C3=BCmont?= Date: Fri, 24 Apr 2026 11:00:18 +0200 Subject: [PATCH 2/3] Allow for commons-logging test dependency --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index d8c50446f..65de84be4 100644 --- a/pom.xml +++ b/pom.xml @@ -594,6 +594,7 @@ org.slf4j:slf4j-simple:*:*:test + commons-logging:commons-logging:*:*:test From 7783557164b34254154780731b42a937fa65191d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20D=C3=BCmont?= Date: Fri, 24 Apr 2026 11:36:21 +0200 Subject: [PATCH 3/3] Remove unnecessary test condition --- .../connectivity/OAuth2IntegrationTest.java | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/cloudplatform/connectivity-oauth/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2IntegrationTest.java b/cloudplatform/connectivity-oauth/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2IntegrationTest.java index 026a2e8ba..ab77ebeb8 100644 --- a/cloudplatform/connectivity-oauth/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2IntegrationTest.java +++ b/cloudplatform/connectivity-oauth/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2IntegrationTest.java @@ -22,14 +22,8 @@ import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; -import java.util.List; - -import javax.annotation.Nullable; import org.apache.http.HttpHeaders; -import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -37,10 +31,8 @@ import com.sap.cloud.environment.servicebinding.api.ServiceBinding; import com.sap.cloud.environment.servicebinding.api.ServiceIdentifier; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException; -import com.sap.cloud.sdk.cloudplatform.connectivity.exception.HttpClientInstantiationException; import com.sap.cloud.sdk.cloudplatform.tenant.DefaultTenant; import com.sap.cloud.sdk.cloudplatform.tenant.TenantAccessor; -import com.sap.cloud.security.client.HttpClientFactory; import com.sap.cloud.security.config.ClientIdentity; import com.sap.cloud.security.xsuaa.client.OAuth2ServiceException; @@ -59,35 +51,6 @@ class OAuth2IntegrationTest } """; - private List oldFactories = List.of(); - - @BeforeEach - void mockClientFactory() - { - oldFactories = HttpClientFactory.services; - HttpClientFactory.services.clear(); - - // `useSystemProperties` is needed for the WireMock proxying - HttpClientFactory.services.add(identity -> HttpClientBuilder.create().useSystemProperties().build()); - HttpClientAccessor.setHttpClientFactory(new DefaultHttpClientFactory() - { - @Override - protected HttpClientBuilder getHttpClientBuilder( @Nullable HttpDestinationProperties destination ) - throws HttpClientInstantiationException - { - return super.getHttpClientBuilder(destination).useSystemProperties(); - } - }); - } - - @AfterEach - void restoreClientFactories() - { - HttpClientFactory.services.clear(); - HttpClientFactory.services.addAll(oldFactories); - HttpClientAccessor.setHttpClientFactory(null); - } - @Test void testIasTokenFlow() {