Merge branch 'main' into http5-oauth2

Author: Jonas-Isr

README.md

@@ -1,7 +1,7 @@
 ![build](https://github.com/SAP/cloud-sdk-java/actions/workflows/continuous-integration.yaml/badge.svg?branch=main)
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/cloud-sdk-java)](https://api.reuse.software/info/github.com/SAP/cloud-sdk-java)
 [![Fosstars security rating](https://github.com/SAP/cloud-sdk-java/blob/fosstars-report/fosstars_badge.svg)](https://github.com/SAP/cloud-sdk-java/blob/fosstars-report/fosstars_report.md)
-[![Maven Central](https://img.shields.io/badge/maven_central-5.26.0-blue.svg)](https://search.maven.org/search?q=g:com.sap.cloud.sdk%20AND%20a:sdk-core%20AND%20v:5.26.0)
+[![Maven Central](https://img.shields.io/badge/maven_central-5.27.0-blue.svg)](https://search.maven.org/search?q=g:com.sap.cloud.sdk%20AND%20a:sdk-core%20AND%20v:5.27.0)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/SAP/cloud-sdk-java)
 
 # <img src="https://sap.github.io/cloud-sdk/img/logo.svg" alt="SAP Cloud SDK" width="30"/> SAP Cloud SDK for Java

archetypes/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.27.0-SNAPSHOT</version>
+		<version>5.28.0-SNAPSHOT</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.archetypes</groupId>
 	<artifactId>archetypes-parent</artifactId>

archetypes/spring-boot3/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.archetypes</groupId>
 		<artifactId>archetypes-parent</artifactId>
-		<version>5.27.0-SNAPSHOT</version>
+		<version>5.28.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot3</artifactId>
 	<packaging>maven-archetype</packaging>

archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml

@@ -15,7 +15,7 @@
         <spring-boot.version>3.3.0</spring-boot.version>
 
         <java.version>17</java.version>
-        <cloud-sdk.version>5.27.0-SNAPSHOT</cloud-sdk.version>
+        <cloud-sdk.version>5.28.0-SNAPSHOT</cloud-sdk.version>
 
         <maven.compiler.release>${java.version}</maven.compiler.release>
         <maven.compiler.proc>full</maven.compiler.proc>

cloudplatform/caching/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.27.0-SNAPSHOT</version>
+		<version>5.28.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>caching</artifactId>
 	<name>Business Technology Platform - Caching</name>

cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.27.0-SNAPSHOT</version>
+		<version>5.28.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-connectivity-scp-cf</artifactId>
 	<name>(Deprecated) Cloud Platform - Connectivity SAP BTP Cloud Foundry</name>

cloudplatform/cloudplatform-connectivity/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.27.0-SNAPSHOT</version>
+		<version>5.28.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-connectivity</artifactId>
 	<name>Business Technology Platform - Connectivity</name>

cloudplatform/cloudplatform-connectivity/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/BtpServiceOptions.java

@@ -324,6 +324,23 @@ public static OptionsEnhancer<?> withConsumerClient( @Nonnull final String consu
             return new IasCommunicationOptions(null, null, null, consumerClientId, consumerTenantId);
         }
 
+        /**
+         * Specifies the token format to request from IAS during token exchange.
+         * <p>
+         * If not specified, the {@code token_format} parameter is not included in the token exchange request, and IAS
+         * will use its default behavior (SAML). Explicitly set to {@code "jwt"} if the target service requires JWT
+         * tokens.
+         *
+         * @param format
+         *            The token format to request. Typically {@code "jwt"} or {@code "saml"}.
+         * @return An instance of {@link OptionsEnhancer} for the token format.
+         */
+        @Nonnull
+        public static OptionsEnhancer<?> withTokenFormat( @Nonnull final String format )
+        {
+            return new TokenFormat(format);
+        }
+
         /**
          * An {@link OptionsEnhancer} that contains the target URI for an IAS-based destination. Also refer to
          * {@link #withTargetUri(String)}.
@@ -382,5 +399,18 @@ public IasCommunicationOptions getValue()
                 return this;
             }
         }
+
+        /**
+         * An {@link OptionsEnhancer} that specifies the token format for IAS token requests. If not provided, the
+         * {@code token_format} parameter is not included in the token exchange request. Also refer to
+         * {@link #withTokenFormat(String)}.
+         */
+        @Value
+        @AllArgsConstructor( access = AccessLevel.PRIVATE )
+        public static class TokenFormat implements OptionsEnhancer<String>
+        {
+            @Nonnull
+            String value;
+        }
     }
 }

cloudplatform/cloudplatform-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.27.0-SNAPSHOT</version>
+		<version>5.28.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-core</artifactId>
 	<name>Cloud Platform - Core</name>

cloudplatform/connectivity-apache-httpclient4/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.27.0-SNAPSHOT</version>
+		<version>5.28.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>connectivity-apache-httpclient4</artifactId>
 	<name>Connectivity - Apache HTTP Client 4</name>