diff --git a/datamodel/odata-v4/odata-v4-generator/pom.xml b/datamodel/odata-v4/odata-v4-generator/pom.xml
index 201c8ac4e5..907365492d 100644
--- a/datamodel/odata-v4/odata-v4-generator/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator/pom.xml
@@ -119,6 +119,12 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.codemodel</groupId>
diff --git a/datamodel/odata/odata-generator/pom.xml b/datamodel/odata/odata-generator/pom.xml
index 09bca7758d..313bfd93d4 100644
--- a/datamodel/odata/odata-generator/pom.xml
+++ b/datamodel/odata/odata-generator/pom.xml
@@ -120,6 +120,12 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.codemodel</groupId>
diff --git a/datamodel/openapi/openapi-api-sample/pom.xml b/datamodel/openapi/openapi-api-sample/pom.xml
index ff588120df..f05aaea984 100644
--- a/datamodel/openapi/openapi-api-sample/pom.xml
+++ b/datamodel/openapi/openapi-api-sample/pom.xml
@@ -54,10 +54,22 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- test dependencies -->
 		<dependency>
diff --git a/datamodel/openapi/openapi-api-sample/src/test/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OneOfDeserializationTest.java b/datamodel/openapi/openapi-api-sample/src/test/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OneOfDeserializationTest.java
index b705bee846..f496afe4b0 100644
--- a/datamodel/openapi/openapi-api-sample/src/test/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OneOfDeserializationTest.java
+++ b/datamodel/openapi/openapi-api-sample/src/test/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OneOfDeserializationTest.java
@@ -305,6 +305,7 @@ void testDeserializationWithEnumDiscriminator()
      * Taken from {@link com.sap.cloud.sdk.services.openapi.apiclient.ApiClient}
      */
     @Nonnull
+    @SuppressWarnings( "removal" ) // Jackson2ObjectMapperBuilder deprecated-for-removal in Spring 7; requires Jackson 3 migration
     private static ObjectMapper newDefaultObjectMapper()
     {
         return new Jackson2ObjectMapperBuilder()
diff --git a/datamodel/openapi/openapi-core/pom.xml b/datamodel/openapi/openapi-core/pom.xml
index 703f0177cf..c4c689fad7 100644
--- a/datamodel/openapi/openapi-core/pom.xml
+++ b/datamodel/openapi/openapi-core/pom.xml
@@ -59,10 +59,22 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java b/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java
index fd0851050d..3fbb5378b5 100644
--- a/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java
+++ b/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java
@@ -106,7 +106,7 @@ private String collectionToString( final Collection<? extends CharSequence> coll
     private Map<String, Authentication> authentications;
 
     private int statusCode;
-    private MultiValueMap<String, String> responseHeaders;
+    private HttpHeaders responseHeaders;
 
     private DateFormat dateFormat;
 
@@ -204,10 +204,10 @@ public int getStatusCode()
     /**
      * Gets the response headers of the previous request
      *
-     * @return MultiValueMap a map of response headers
+     * @return HttpHeaders a map of response headers
      */
     @Nonnull
-    public MultiValueMap<String, String> getResponseHeaders()
+    public HttpHeaders getResponseHeaders()
     {
         return responseHeaders;
     }
@@ -688,8 +688,7 @@ public <T> T invokeAPI(
         // auth headers are added automatically by the SDK
         // updateParamsForAuth(authNames, queryParams, headerParams);
 
-        @SuppressWarnings( "deprecation" ) // spring-web:6.2.0 and later, works until <7.0.0
-        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
+        final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(path);
         if( queryParams != null ) {
             //encode the query parameters in case they contain unsafe characters
             for( final List<String> values : queryParams.values() ) {
@@ -748,7 +747,7 @@ public <T> T invokeAPI(
     private void addHeadersToRequest( @Nullable final HttpHeaders headers, final BodyBuilder requestBuilder )
     {
         if( headers != null ) {
-            for( final Entry<String, List<String>> entry : headers.entrySet() ) {
+            for( final Entry<String, List<String>> entry : headers.headerSet() ) {
                 final List<String> values = entry.getValue();
                 for( final String value : values ) {
                     if( value != null ) {
@@ -760,6 +759,7 @@ private void addHeadersToRequest( @Nullable final HttpHeaders headers, final Bod
     }
 
     @Nonnull
+    @SuppressWarnings( "removal" ) // MappingJackson2HttpMessageConverter and Jackson2ObjectMapperBuilder deprecated-for-removal in Spring 7; requires Jackson 3 migration
     private static RestTemplate newDefaultRestTemplate()
     {
         final RestTemplate restTemplate = new RestTemplate();
@@ -776,6 +776,7 @@ private static RestTemplate newDefaultRestTemplate()
     }
 
     @Nonnull
+    @SuppressWarnings( "removal" ) // Jackson2ObjectMapperBuilder deprecated-for-removal in Spring 7; requires Jackson 3 migration
     private static ObjectMapper newDefaultObjectMapper()
     {
         return new Jackson2ObjectMapperBuilder()
diff --git a/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/core/OpenApiResponse.java b/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/core/OpenApiResponse.java
index d0e4da65f7..821fa7dea5 100644
--- a/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/core/OpenApiResponse.java
+++ b/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/core/OpenApiResponse.java
@@ -1,9 +1,12 @@
 package com.sap.cloud.sdk.services.openapi.core;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.annotation.Nonnull;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.MultiValueMap;
 
 import com.sap.cloud.sdk.services.openapi.apiclient.ApiClient;
 
@@ -20,12 +23,8 @@ public class OpenApiResponse
     @Getter
     private final int statusCode;
 
-    /**
-     * Http headers of this response.
-     */
     @Nonnull
-    @Getter
-    private final MultiValueMap<String, String> headers;
+    private final HttpHeaders headers;
 
     /**
      * Create a new {@code OpenApiResponse} from an {@link ApiClient}
@@ -50,4 +49,19 @@ public OpenApiResponse( final int statusCode )
         this.statusCode = statusCode;
         headers = new HttpHeaders();
     }
+
+    /**
+     * Http headers of this response.
+     *
+     * @return Map of response headers
+     */
+    @Nonnull
+    public Map<String, List<String>> getHeaders()
+    {
+        final Map<String, List<String>> result = new LinkedHashMap<>();
+        for( final Map.Entry<String, List<String>> entry : headers.headerSet() ) {
+            result.put(entry.getKey(), entry.getValue());
+        }
+        return result;
+    }
 }
diff --git a/pom.xml b/pom.xml
index 409c060c45..88a63fa402 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,8 +98,8 @@
 		<!-- Spring dependencies -->
 		<!-- Keep these versions consistent with the ones from the SAP Java Buildpack (after their 2.0 release) -->
 		<!-- see https://github.wdf.sap.corp/xs2-java/xs-java-buildpack/blob/master/resources/pom.xml -->
-		<spring.version>6.2.19</spring.version>
-		<spring-security.version>6.1.5</spring-security.version>
+		<spring.version>7.0.9</spring.version>
+		<spring-security.version>7.0.1</spring-security.version>
 		<slf4j.version>2.0.19</slf4j.version>
 		<assertj-core.version>3.27.7</assertj-core.version>
 		<assertj-vavr.version>0.5.1</assertj-vavr.version>