Bump version to 3.5.3 (#1613)

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 3.5.3
+
+- [java-security] Reenable sap-java-buildpack-api-usage sample using Tomcat 10
+
+#### Dependency upgrades
+
+- Bump spring.security.version from 6.3.1 to 6.3.3
+- Bump io.projectreactor:reactor-core from 3.6.7 to 3.6.9
+- Bump slf4j.api.version from 2.0.13 to 2.0.16
+- Bump org.eclipse.jetty.version from 12.0.7 to 12.0.12
+- Bump spring.core.version from 6.1.10 to 6.1.12
+- Bump spring.boot.version from 3.3.1 to 3.3.2
+- Bump org.wiremock:wiremock-standalone from 3.7.0 to 3.9.1
+
 ## 3.5.2
 
 - [spring-xsuaa] Remove new X5tCertificateThumbprintValidator from spring-xsuaa validators

README.md

@@ -126,7 +126,7 @@ The SAP Cloud Security Services Integration is published to maven central: https
         <dependency>
             <groupId>com.sap.cloud.security</groupId>
             <artifactId>java-bom</artifactId>
-            <version>3.5.2</version>
+            <version>3.5.3</version>
             <scope>import</scope>
             <type>pom</type>
         </dependency>

bom/pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.sap.cloud.security</groupId>
     <artifactId>java-bom</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
     <packaging>pom</packaging>
     <name>java-bom</name>
 

env/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.sap.cloud.security.xsuaa</groupId>
         <artifactId>parent</artifactId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
     </parent>
 
     <groupId>com.sap.cloud.security</groupId>

java-api/README.md

@@ -5,6 +5,6 @@
 <dependency>
     <groupId>com.sap.cloud.security</groupId>
     <artifactId>java-api</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 </dependency>
 ```

java-api/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<groupId>com.sap.cloud.security</groupId>

java-security-it/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.sap.cloud.security.xsuaa</groupId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
     </parent>
 
     <artifactId>java-security-it</artifactId>

java-security-test/README.md

@@ -40,7 +40,7 @@ It is pre-configured with a security filter that only accepts valid tokens. Furt
 <dependency>
     <groupId>com.sap.cloud.security</groupId>
    <artifactId>java-security-test</artifactId>
-   <version>3.5.2</version>
+   <version>3.5.3</version>
    <scope>test</scope>
 </dependency>
 ```

java-security-test/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<groupId>com.sap.cloud.security</groupId>

java-security/README.md

@@ -67,7 +67,7 @@ To be able to validate tokens it performs the following tasks:
 <dependency>
     <groupId>com.sap.cloud.security</groupId>
     <artifactId>java-security</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 </dependency>
 <dependency>
     <groupId>org.apache.httpcomponents</groupId>

java-security/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<groupId>com.sap.cloud.security</groupId>

pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>com.sap.cloud.security.xsuaa</groupId>
 	<artifactId>parent</artifactId>
-	<version>3.5.2</version>
+	<version>3.5.3</version>
 	<packaging>pom</packaging>
 
 	<name>parent</name>

samples/java-security-usage-ias/pom.xml

@@ -6,16 +6,16 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sap.cloud.security.xssec.samples</groupId>
     <artifactId>java-security-usage-ias</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
     <packaging>war</packaging>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <sap.cloud.security.version>3.5.2</sap.cloud.security.version>
+        <sap.cloud.security.version>3.5.3</sap.cloud.security.version>
         <slf4j.api.version>2.0.5</slf4j.api.version>
         <apache.httpclient.version>4.5.14</apache.httpclient.version>
-        <jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
+        <jakarta.servlet.api.version>6.1.0</jakarta.servlet.api.version>
         <assertj.version>3.24.2</assertj.version>
         <junit.version>5.10.0</junit.version>
     </properties>

samples/java-security-usage/pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sap.cloud.security.xssec.samples</groupId>
     <artifactId>java-security-usage</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
     <packaging>war</packaging>
 
     <!--profiles>
@@ -27,10 +27,10 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <sap.cloud.security.version>3.5.2</sap.cloud.security.version>
+        <sap.cloud.security.version>3.5.3</sap.cloud.security.version>
         <slf4j.api.version>2.0.5</slf4j.api.version>
         <apache.httpclient.version>4.5.14</apache.httpclient.version>
-        <jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
+        <jakarta.servlet.api.version>6.1.0</jakarta.servlet.api.version>
         <assertj.version>3.24.2</assertj.version>
         <junit.version>5.10.0</junit.version>
     </properties>

samples/java-tokenclient-usage/pom.xml

@@ -6,15 +6,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sap.cloud.security.xssec.samples</groupId>
     <artifactId>java-tokenclient-usage</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
     <packaging>war</packaging>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <sap.cloud.security.version>3.5.2</sap.cloud.security.version>
+        <sap.cloud.security.version>3.5.3</sap.cloud.security.version>
         <apache.httpclient.version>4.5.14</apache.httpclient.version>
-        <jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
+        <jakarta.servlet.api.version>6.1.0</jakarta.servlet.api.version>
         <slf4j.api.version>2.0.5</slf4j.api.version>
     </properties>
 

samples/sap-java-buildpack-api-usage/pom.xml

@@ -6,13 +6,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sap.cloud.security.xssec.samples</groupId>
 	<artifactId>sap-java-buildpack-api-usage</artifactId>
-	<version>3.5.2</version>
+	<version>3.5.3</version>
 	<packaging>war</packaging>
 
 	<properties>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
-		<jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
+		<jakarta.servlet.api.version>6.1.0</jakarta.servlet.api.version>
 	</properties>
 
 	<dependencies>

samples/spring-security-basic-auth/pom.xml

@@ -13,14 +13,14 @@
 	</parent>
 
 	<artifactId>spring-security-basic-auth</artifactId>
-	<version>3.5.2</version>
+	<version>3.5.3</version>
 	<name>spring-security-basic-auth</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>17</java.version>
-		<sap.cloud.security.version>3.5.2</sap.cloud.security.version>
+		<sap.cloud.security.version>3.5.3</sap.cloud.security.version>
 	</properties>
 
 	<dependencyManagement>
@@ -72,7 +72,7 @@
 		<dependency>
 			<groupId>com.sap.cloud.security</groupId>
 			<artifactId>java-security-test</artifactId>
-			<version>3.5.2</version>
+			<version>3.5.3</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

samples/spring-security-hybrid-usage/pom.xml

@@ -16,7 +16,7 @@
 
 	<groupId>com.sap.cloud.security.samples</groupId>
 	<artifactId>spring-security-hybrid-usage</artifactId>
-	<version>3.5.2</version>
+	<version>3.5.3</version>
 
 	<properties>
 		<!-- 
@@ -28,7 +28,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>17</java.version>
-		<sap.cloud.security.version>3.5.2</sap.cloud.security.version>
+		<sap.cloud.security.version>3.5.3</sap.cloud.security.version>
 		<apache.httpclient.version>4.5.14</apache.httpclient.version>
 	</properties>
 

samples/spring-security-xsuaa-usage/pom.xml

@@ -16,7 +16,7 @@
 
 	<groupId>com.sap.cloud.security.samples</groupId>
 	<artifactId>spring-security-xsuaa-usage</artifactId>
-	<version>3.5.2</version>
+	<version>3.5.3</version>
 	<name>spring-security-xsuaa-usage</name>
 
 	<properties>
@@ -29,7 +29,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>17</java.version>
-		<sap.cloud.security.version>3.5.2</sap.cloud.security.version>
+		<sap.cloud.security.version>3.5.3</sap.cloud.security.version>
 		<http.client5>5.2.1</http.client5>
 	</properties>
 

samples/spring-webflux-security-hybrid-usage/pom.xml

@@ -14,12 +14,12 @@
 
     <groupId>com.sap.cloud.security.samples</groupId>
     <artifactId>spring-webflux-security-hybrid-usage</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
     <name>spring-webflux-security-hybrid-usage</name>
 
     <properties>
         <java.version>17</java.version>
-        <sap.cloud.security.version>3.5.2</sap.cloud.security.version>
+        <sap.cloud.security.version>3.5.3</sap.cloud.security.version>
     </properties>
 
     <dependencyManagement>

spring-security-compatibility/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.sap.cloud.security.xsuaa</groupId>
         <artifactId>parent</artifactId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
     </parent>
 
     <groupId>com.sap.cloud.security.xsuaa</groupId>

spring-security-starter/pom.xml

@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<groupId>com.sap.cloud.security</groupId>

spring-security/Migration_SpringXsuaaProjects.md

@@ -157,7 +157,7 @@ It is provided in an extra module. This maven dependency needs to be provided ad
 <dependency>
     <groupId>com.sap.cloud.security.xsuaa</groupId>
     <artifactId>spring-security-compatibility</artifactId>
-  <version>3.5.2</version>
+  <version>3.5.3</version>
 </dependency>
 ```
 

spring-security/README.md

@@ -67,7 +67,7 @@ These (spring) dependencies need to be provided:
 <dependency>
     <groupId>com.sap.cloud.security</groupId>
     <artifactId>resourceserver-security-spring-boot-starter</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 </dependency>
 ```
 

spring-security/pom.xml

@@ -9,13 +9,13 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<groupId>com.sap.cloud.security</groupId>
 	<artifactId>spring-security</artifactId>
 	<packaging>jar</packaging>
-	<version>3.5.2</version>
+	<version>3.5.3</version>
 
 	<dependencies>
 <!--		TODO remove once spring-security-oauth2-jose has a newer version with updated nimbus dependency-->

spring-xsuaa-it/pom.xml

@@ -14,12 +14,12 @@
 
 	<artifactId>spring-xsuaa-it</artifactId>
 	<name>spring-xsuaa-it</name>
-	<version>3.5.2</version>
+	<version>3.5.3</version>
 
 	<properties>
 		<mockwebserver.version>4.10.0</mockwebserver.version>
 		<java.version>17</java.version>
-		<sap.cloud.security.version>3.5.2</sap.cloud.security.version>
+		<sap.cloud.security.version>3.5.3</sap.cloud.security.version>
 	</properties>
 
 	<dependencyManagement>

spring-xsuaa-starter/pom.xml

@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<artifactId>xsuaa-spring-boot-starter</artifactId>

spring-xsuaa-test/README.md

@@ -31,7 +31,7 @@ This includes for example a `JwtGenerator` that generates JSON Web Tokens (JWT)
 <dependency>
     <groupId>com.sap.cloud.security.xsuaa</groupId>
     <artifactId>spring-xsuaa-test</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
     <scope>test</scope>
 </dependency>
 

spring-xsuaa-test/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<artifactId>spring-xsuaa-test</artifactId>

spring-xsuaa/README.md

@@ -39,7 +39,7 @@ These (spring) dependencies need to be provided:
 <dependency>
     <groupId>com.sap.cloud.security.xsuaa</groupId>
     <artifactId>spring-xsuaa</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 </dependency>
 <dependency> <!-- new with version 1.5.0 -->
     <groupId>org.apache.logging.log4j</groupId>
@@ -53,7 +53,7 @@ These (spring) dependencies need to be provided:
 <dependency>
     <groupId>com.sap.cloud.security.xsuaa</groupId>
     <artifactId>xsuaa-spring-boot-starter</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 </dependency>
 ```
 

spring-xsuaa/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<artifactId>spring-xsuaa</artifactId>

token-client/README.md

@@ -49,15 +49,15 @@ In context of a Spring Boot application you can leverage autoconfiguration provi
 <dependency>
     <groupId>com.sap.cloud.security</groupId>
     <artifactId>resourceserver-security-spring-boot-starter</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 </dependency>
 ```
 In context of Spring Applications you will need the following dependencies:
 ```xml
 <dependency>
     <groupId>com.sap.cloud.security.xsuaa</groupId>
     <artifactId>token-client</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 </dependency>
 <dependency>
     <groupId>org.apache.httpcomponents</groupId>
@@ -124,7 +124,7 @@ See the [OAuth2ServiceConfiguration](#oauth2serviceconfiguration) section and [H
 <dependency>
     <groupId>com.sap.cloud.security.xsuaa</groupId>
     <artifactId>token-client</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 </dependency>
 <dependency>
     <groupId>org.apache.httpcomponents</groupId>

token-client/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.sap.cloud.security.xsuaa</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.5.2</version>
+		<version>3.5.3</version>
 	</parent>
 
 	<artifactId>token-client</artifactId>