From 19f6b78d602bd9ae97010f71733cbd594762d4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C4=ABga?= <72249435+liga-oz@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:29:31 +0100 Subject: [PATCH] Bump version to 2.17.3 (#1428) * bump reactor version to 3.4.35 Signed-off-by: liga-oz * bump version to 2.17.3 Signed-off-by: liga-oz * bump spring-core version to 5.3.31 Signed-off-by: liga-oz * bump spring-security version to 5.8.9 Signed-off-by: liga-oz * bump commons io version to 2.15.1 Signed-off-by: liga-oz * bump maven surefire plugin version to 3.2.5 Signed-off-by: liga-oz * bump spotbugs version to 4.8.3 Signed-off-by: liga-oz * remove deprecated samples Signed-off-by: liga-oz * revert version upgrade for deprecated samples Signed-off-by: liga-oz * Update CHANGELOG.md Signed-off-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com> --------- Signed-off-by: liga-oz Signed-off-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com> Co-authored-by: Manuel Fink <123368068+finkmanAtSap@users.noreply.github.com> --- .github/workflows/maven-build-2.x.yml | 8 -------- CHANGELOG.md | 18 ++++++++++++++++++ api/README.md | 2 +- api/pom.xml | 2 +- bom/pom.xml | 2 +- env/pom.xml | 2 +- java-api/README.md | 2 +- java-api/pom.xml | 2 +- java-security-it/pom.xml | 2 +- java-security-test/README.md | 2 +- java-security-test/pom.xml | 2 +- .../Migration_SpringSecurityProjects.md | 6 +++--- java-security/README.md | 2 +- java-security/pom.xml | 2 +- pom.xml | 16 ++++++++-------- samples/java-security-usage-ias/pom.xml | 4 ++-- samples/java-security-usage/pom.xml | 4 ++-- samples/java-tokenclient-usage/pom.xml | 4 ++-- samples/sap-java-buildpack-api-usage/pom.xml | 2 +- samples/spring-security-hybrid-usage/pom.xml | 2 +- spring-security-compatibility/pom.xml | 2 +- spring-security-starter/pom.xml | 2 +- .../Migration_SpringXsuaaProjects.md | 2 +- spring-security/README.md | 2 +- spring-security/pom.xml | 4 ++-- spring-xsuaa-it/pom.xml | 2 +- spring-xsuaa-mock/README.md | 2 +- spring-xsuaa-mock/pom.xml | 2 +- spring-xsuaa-starter/pom.xml | 2 +- spring-xsuaa-test/README.md | 2 +- spring-xsuaa-test/pom.xml | 2 +- spring-xsuaa/README.md | 4 ++-- spring-xsuaa/pom.xml | 2 +- token-client/README.md | 6 +++--- token-client/pom.xml | 2 +- 35 files changed, 67 insertions(+), 57 deletions(-) diff --git a/.github/workflows/maven-build-2.x.yml b/.github/workflows/maven-build-2.x.yml index fd55116d0..934b4c885 100644 --- a/.github/workflows/maven-build-2.x.yml +++ b/.github/workflows/maven-build-2.x.yml @@ -38,12 +38,6 @@ jobs: run: mvn -B install --file pom.xml - name: Run integration tests run: cd java-security-it; mvn -B package --file pom.xml - - name: Build spring-security-basic-auth - run: cd samples/spring-security-basic-auth; mvn -B package --file pom.xml - - name: Build spring-security-xsuaa-usage - run: cd samples/spring-security-xsuaa-usage; mvn -B package --file pom.xml - - name: Build spring-webflux-security-xsuaa-usage - run: cd samples/spring-webflux-security-xsuaa-usage; mvn -B package --file pom.xml - name: Build java-security-usage run: cd samples/java-security-usage; mvn -B package --file pom.xml - name: Build sap-java-buildpack-api-usage @@ -52,5 +46,3 @@ jobs: run: cd samples/java-tokenclient-usage; mvn -B package --file pom.xml - name: Build java-security-usage-ias run: cd samples/java-security-usage-ias; mvn -B package --file pom.xml - - name: Build spring-security-hybrid-usage - run: cd samples/spring-security-hybrid-usage; mvn -B package --file pom.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index cadb6d41b..9e9c5460d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,24 @@ # Change Log All notable changes to this project will be documented in this file. +## 2.17.3 +- [java-security] + - add name property of service binding as property to OAuth2ServiceConfiguration +- [java-api] + - add ServiceConstant#NAME which can be used to access that property +- [env] + - service plan property is no longer uppercased when building OAuth2ServiceConfiguration from service bindings of the environment +- [spring-security] + - fixes a bug in which a second XSUAA configuration of plan "broker" was ignored in spring-security auto-configuration for versions >= 2.16.0 and < 2.17.3 + - add setName getName, setPlan, getPlan to OAuth2ServiceConfigurationProperties, which means, the list of XsuaaServiceConfigurations can now be filtered based on these properties. +- [token-client] + - remove httpclient caching from DefaultHttpClientFactory (#1416) + +#### Dependency upgrades +- bump spring-core version to 5.3.31 +- bump spring-security version to 5.8.9 +- bump commons io version to 2.15.1 + ## 2.17.2 ✅ Resolves a Breaking Change introduced in version 2.17.0. Consumers should be able to update to 2.17.2 from a version <= 2.16.0 without having to adjust test credentials used in their unit tests when using `java-security-test` or `spring-xsuaa-mock`. diff --git a/api/README.md b/api/README.md index 594196c0e..c17d30058 100644 --- a/api/README.md +++ b/api/README.md @@ -5,6 +5,6 @@ com.sap.cloud.security.xsuaa api - 2.17.2 + 2.17.3 ``` diff --git a/api/pom.xml b/api/pom.xml index b4c9550b6..1476d4b52 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -11,7 +11,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 jar diff --git a/bom/pom.xml b/bom/pom.xml index ae96ee5de..dacc4e0b4 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -8,7 +8,7 @@ com.sap.cloud.security java-bom - 2.17.2 + 2.17.3 pom java-bom diff --git a/env/pom.xml b/env/pom.xml index 91318a859..6ea002310 100644 --- a/env/pom.xml +++ b/env/pom.xml @@ -9,7 +9,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 com.sap.cloud.security diff --git a/java-api/README.md b/java-api/README.md index 80c6b5217..a8d9233d8 100644 --- a/java-api/README.md +++ b/java-api/README.md @@ -5,6 +5,6 @@ com.sap.cloud.security java-api - 2.17.2 + 2.17.3 ``` diff --git a/java-api/pom.xml b/java-api/pom.xml index 593459995..20a92474d 100644 --- a/java-api/pom.xml +++ b/java-api/pom.xml @@ -9,7 +9,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 com.sap.cloud.security diff --git a/java-security-it/pom.xml b/java-security-it/pom.xml index 9e801c43f..01be35ba8 100644 --- a/java-security-it/pom.xml +++ b/java-security-it/pom.xml @@ -9,7 +9,7 @@ parent com.sap.cloud.security.xsuaa - 2.17.2 + 2.17.3 java-security-it diff --git a/java-security-test/README.md b/java-security-test/README.md index 3cd2896c9..927602874 100644 --- a/java-security-test/README.md +++ b/java-security-test/README.md @@ -22,7 +22,7 @@ It includes for example a `JwtGenerator` that generates JSON Web Tokens (JWT) th com.sap.cloud.security java-security-test - 2.17.2 + 2.17.3 test ``` diff --git a/java-security-test/pom.xml b/java-security-test/pom.xml index e7aff0607..74c36ce4b 100644 --- a/java-security-test/pom.xml +++ b/java-security-test/pom.xml @@ -9,7 +9,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 com.sap.cloud.security diff --git a/java-security/Migration_SpringSecurityProjects.md b/java-security/Migration_SpringSecurityProjects.md index 21980db32..fba0c18e5 100644 --- a/java-security/Migration_SpringSecurityProjects.md +++ b/java-security/Migration_SpringSecurityProjects.md @@ -37,19 +37,19 @@ First make sure you have the following dependencies defined in your pom.xml: com.sap.cloud.security.xsuaa api - 2.17.2 + 2.17.3 com.sap.cloud.security java-security - 2.17.2 + 2.17.3 com.sap.cloud.security java-security-test - 2.17.2 + 2.17.3 test ``` diff --git a/java-security/README.md b/java-security/README.md index fa4719c77..da3d5c529 100644 --- a/java-security/README.md +++ b/java-security/README.md @@ -47,7 +47,7 @@ In case of XSUAA does the JWT provide a valid `jku` token header parameter that com.sap.cloud.security java-security - 2.17.2 + 2.17.3 org.apache.httpcomponents diff --git a/java-security/pom.xml b/java-security/pom.xml index 5a4cc286e..9c8b14f26 100644 --- a/java-security/pom.xml +++ b/java-security/pom.xml @@ -9,7 +9,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 com.sap.cloud.security diff --git a/pom.xml b/pom.xml index a6943abeb..fb0e95718 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 pom parent @@ -58,30 +58,30 @@ 3.2.1 2.7.18 - 5.3.30 - 5.8.8 + 5.3.31 + 5.8.9 2.5.2.RELEASE 1.1.1.RELEASE - 3.4.33 + 3.4.35 2.21.1 1.7.36 20231013 0.10.1 4.5.14 2.9.3 - 2.15.0 + 2.15.1 4.0.1 4.13.2 5.10.1 - 3.2.2 + 3.2.5 1.3 4.11.0 3.24.2 3.5.0 2.35.0 1.3.2 - 4.8.1 - 4.8.1.0 + 4.8.3 + 4.8.2.0 false ${skipTests} diff --git a/samples/java-security-usage-ias/pom.xml b/samples/java-security-usage-ias/pom.xml index 22311bf6b..2b96fe92f 100755 --- a/samples/java-security-usage-ias/pom.xml +++ b/samples/java-security-usage-ias/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.sap.cloud.security.xssec.samples java-security-usage-ias - 2.17.2 + 2.17.3 war org.springframework.boot diff --git a/spring-xsuaa-mock/pom.xml b/spring-xsuaa-mock/pom.xml index dc6c561c7..405ffddba 100644 --- a/spring-xsuaa-mock/pom.xml +++ b/spring-xsuaa-mock/pom.xml @@ -9,7 +9,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 spring-xsuaa-mock diff --git a/spring-xsuaa-starter/pom.xml b/spring-xsuaa-starter/pom.xml index 2e177199c..1c2f50a17 100644 --- a/spring-xsuaa-starter/pom.xml +++ b/spring-xsuaa-starter/pom.xml @@ -16,7 +16,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 xsuaa-spring-boot-starter diff --git a/spring-xsuaa-test/README.md b/spring-xsuaa-test/README.md index 6b41aba35..d0ebd7c98 100644 --- a/spring-xsuaa-test/README.md +++ b/spring-xsuaa-test/README.md @@ -31,7 +31,7 @@ This includes for example a `JwtGenerator` that generates JSON Web Tokens (JWT) com.sap.cloud.security.xsuaa spring-xsuaa-test - 2.17.2 + 2.17.3 test diff --git a/spring-xsuaa-test/pom.xml b/spring-xsuaa-test/pom.xml index 8d8fc0da7..a524190a5 100644 --- a/spring-xsuaa-test/pom.xml +++ b/spring-xsuaa-test/pom.xml @@ -9,7 +9,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 spring-xsuaa-test diff --git a/spring-xsuaa/README.md b/spring-xsuaa/README.md index 95ec08f55..6838fdbbe 100644 --- a/spring-xsuaa/README.md +++ b/spring-xsuaa/README.md @@ -41,7 +41,7 @@ These (spring) dependencies needs to be provided: com.sap.cloud.security.xsuaa spring-xsuaa - 2.17.2 + 2.17.3 org.apache.logging.log4j @@ -55,7 +55,7 @@ These (spring) dependencies needs to be provided: com.sap.cloud.security.xsuaa xsuaa-spring-boot-starter - 2.17.2 + 2.17.3 ``` diff --git a/spring-xsuaa/pom.xml b/spring-xsuaa/pom.xml index d1b04a665..27722db2b 100644 --- a/spring-xsuaa/pom.xml +++ b/spring-xsuaa/pom.xml @@ -9,7 +9,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 spring-xsuaa diff --git a/token-client/README.md b/token-client/README.md index 2da097aed..5237fcc84 100644 --- a/token-client/README.md +++ b/token-client/README.md @@ -23,7 +23,7 @@ The Resource owner password credentials (i.e., username and password) can be use com.sap.cloud.security.xsuaa token-client - 2.17.2 + 2.17.3 org.apache.httpcomponents @@ -80,7 +80,7 @@ tokenService.clearCache(); com.sap.cloud.security.xsuaa token-client - 2.17.2 + 2.17.3 org.springframework @@ -130,7 +130,7 @@ In context of a Spring Boot application you may like to leverage autoconfigurati com.sap.cloud.security.xsuaa xsuaa-spring-boot-starter - 2.17.2 + 2.17.3 org.apache.httpcomponents diff --git a/token-client/pom.xml b/token-client/pom.xml index f756bb6e8..c230665c9 100644 --- a/token-client/pom.xml +++ b/token-client/pom.xml @@ -9,7 +9,7 @@ com.sap.cloud.security.xsuaa parent - 2.17.2 + 2.17.3 token-client