Skip to content

Commit

Permalink
Bump version to 2.13.6 (#1095)
Browse files Browse the repository at this point in the history
* bump spring-boot from 2.7.8 to 2.7.9

* bump spring-security from 5.8.1 to 5.8.2
  • Loading branch information
liga-oz authored Feb 24, 2023
1 parent 0a26ad4 commit c8dd76b
Show file tree
Hide file tree
Showing 39 changed files with 63 additions and 55 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/fosstars-project-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: "Security rating"
steps:
- uses: actions/[email protected]
- uses: SAP/fosstars-rating-core-action@v1.1.1
- uses: SAP/fosstars-rating-core-action@v1.10.0
with:
report-branch: fosstars-report
token: "${{ secrets.GITHUB_TOKEN }}"
token: "${{ secrets.GITHUB_TOKEN }}"
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Change Log
All notable changes to this project will be documented in this file.

## 2.13.6
- [env] `CFEnvironment` has migrated to use btp-environment-variable-access library for accessing configuration from VCAP_SERVICES
- [java-security] `XsUserInfoAdapter.getSystemAttribute()` supports in token `xs.system.attributes` values in string format along with string array

#### Dependency upgrades
* Bump spring.boot.version from 2.7.8 to 2.7.9
* Bump spring.security.version from 5.8.1 to 5.8.2

## 2.13.5
- [spring-xsuaa] improved logging for JwtAudienceValidator
- [java-security] enables token validation without zones
Expand Down
2 changes: 1 addition & 1 deletion api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<dependency>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>api</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</dependency>
```
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<groupId>com.sap.cloud.security</groupId>
<artifactId>java-bom</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<packaging>pom</packaging>
<name>java-bom</name>

Expand Down
2 changes: 1 addition & 1 deletion env/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<groupId>com.sap.cloud.security</groupId>
Expand Down
2 changes: 1 addition & 1 deletion java-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<dependency>
<groupId>com.sap.cloud.security</groupId>
<artifactId>java-api</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</dependency>
```
2 changes: 1 addition & 1 deletion java-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<groupId>com.sap.cloud.security</groupId>
Expand Down
2 changes: 1 addition & 1 deletion java-security-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<artifactId>java-security-it</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion java-security-test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ It includes for example a `JwtGenerator` that generates JSON Web Tokens (JWT) th
<dependency>
<groupId>com.sap.cloud.security</groupId>
<artifactId>java-security-test</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<scope>test</scope>
</dependency>
```
Expand Down
2 changes: 1 addition & 1 deletion java-security-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<groupId>com.sap.cloud.security</groupId>
Expand Down
6 changes: 3 additions & 3 deletions java-security/Migration_SpringSecurityProjects.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ First make sure you have the following dependencies defined in your pom.xml:
<dependency>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>api</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</dependency>
<dependency>
<groupId>com.sap.cloud.security</groupId>
<artifactId>java-security</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</dependency>

<!-- new java-security dependencies for unit tests -->
<dependency>
<groupId>com.sap.cloud.security</groupId>
<artifactId>java-security-test</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<scope>test</scope>
</dependency>
```
Expand Down
2 changes: 1 addition & 1 deletion java-security/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ In case of XSUAA does the JWT provide a valid `jku` token header parameter that
<dependency>
<groupId>com.sap.cloud.security</groupId>
<artifactId>java-security</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
2 changes: 1 addition & 1 deletion java-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<groupId>com.sap.cloud.security</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<packaging>pom</packaging>

<name>parent</name>
Expand Down Expand Up @@ -57,9 +57,9 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
<!-- make sure that spring core and spring boot versions are compatible-->
<spring.boot.version>2.7.8</spring.boot.version>
<spring.boot.version>2.7.9</spring.boot.version>
<spring.core.version>5.3.25</spring.core.version>
<spring.security.version>5.8.1</spring.security.version>
<spring.security.version>5.8.2</spring.security.version>
<spring.security.oauth2.version>2.5.2.RELEASE</spring.security.oauth2.version>
<spring.security.jwt.version>1.1.1.RELEASE</spring.security.jwt.version>
<reactor.version>3.4.24</reactor.version>
Expand Down
4 changes: 2 additions & 2 deletions samples/java-security-usage-ias/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.sap.cloud.security.xssec.samples</groupId>
<artifactId>java-security-usage-ias</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<packaging>war</packaging>

<!--profiles>
Expand All @@ -27,7 +27,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<sap.cloud.security.version>2.13.5</sap.cloud.security.version>
<sap.cloud.security.version>2.13.6</sap.cloud.security.version>
<slf4j.api.version>2.0.5</slf4j.api.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
<javax.servlet.api.version>4.0.1</javax.servlet.api.version>
Expand Down
4 changes: 2 additions & 2 deletions samples/java-security-usage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.sap.cloud.security.xssec.samples</groupId>
<artifactId>java-security-usage</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<packaging>war</packaging>

<!--profiles>
Expand All @@ -27,7 +27,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<sap.cloud.security.version>2.13.5</sap.cloud.security.version>
<sap.cloud.security.version>2.13.6</sap.cloud.security.version>
<slf4j.api.version>2.0.5</slf4j.api.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
<javax.servlet.api.version>4.0.1</javax.servlet.api.version>
Expand Down
4 changes: 2 additions & 2 deletions samples/java-tokenclient-usage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.sap.cloud.security.xssec.samples</groupId>
<artifactId>java-tokenclient-usage</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<packaging>war</packaging>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<sap.cloud.security.version>2.13.5</sap.cloud.security.version>
<sap.cloud.security.version>2.13.6</sap.cloud.security.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
<javax.servlet.api.version>4.0.1</javax.servlet.api.version>
<slf4j.api.version>2.0.5</slf4j.api.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/sap-java-buildpack-api-usage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.sap.cloud.security.xssec.samples</groupId>
<artifactId>sap-java-buildpack-api-usage</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<packaging>war</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions samples/spring-security-basic-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
</parent>

<artifactId>spring-security-basic-auth</artifactId>
<version>2.13.5</version>
<version>2.13.6</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>1.8</java.version>
<sap.cloud.security.version>2.13.5</sap.cloud.security.version>
<sap.cloud.security.version>2.13.6</sap.cloud.security.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions samples/spring-security-hybrid-usage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<groupId>com.sap.cloud.security.samples</groupId>
<artifactId>spring-security-hybrid-usage</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>

<properties>
<!--
Expand All @@ -28,7 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<sap.cloud.security.version>2.13.5</sap.cloud.security.version>
<sap.cloud.security.version>2.13.6</sap.cloud.security.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
</properties>

Expand All @@ -50,7 +50,7 @@
<dependency>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>spring-security-compatibility</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
4 changes: 2 additions & 2 deletions samples/spring-security-xsuaa-usage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<groupId>com.sap.cloud.security.samples</groupId>
<artifactId>spring-security-xsuaa-usage</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<name>spring-security-xsuaa-usage</name>

<properties>
Expand All @@ -29,7 +29,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<sap.cloud.security.version>2.13.5</sap.cloud.security.version>
<sap.cloud.security.version>2.13.6</sap.cloud.security.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions samples/spring-webflux-security-xsuaa-usage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

<groupId>com.sap.cloud.security.samples</groupId>
<artifactId>spring-webflux-security-xsuaa-usage</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
<name>spring-webflux-security-xsuaa-usage</name>

<properties>
<java.version>1.8</java.version>
<sap.cloud.security.version>2.13.5</sap.cloud.security.version>
<sap.cloud.security.version>2.13.6</sap.cloud.security.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-security-compatibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<groupId>com.sap.cloud.security.xsuaa</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-security-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<groupId>com.sap.cloud.security</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-security/Migration_SpringXsuaaProjects.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,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>2.13.5</version>
<version>2.13.6</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion spring-security/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ These (spring) dependencies needs to be provided:
<dependency>
<groupId>com.sap.cloud.security</groupId>
<artifactId>resourceserver-security-spring-boot-starter</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
4 changes: 2 additions & 2 deletions spring-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<groupId>com.sap.cloud.security</groupId>
<artifactId>spring-security</artifactId>
<packaging>jar</packaging>
<version>2.13.5</version>
<version>2.13.6</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion spring-xsuaa-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<artifactId>spring-xsuaa-it</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-xsuaa-mock/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The default implementation offers already valid *token_keys* for JWT tokens, tha
<dependency>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>spring-xsuaa-mock</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</dependency>
<dependency> <!-- new with version 1.5.0 - provided with org.springframework.boot:spring-boot-starter:jar -->
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-xsuaa-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<artifactId>spring-xsuaa-mock</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-xsuaa-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>com.sap.cloud.security.xsuaa</groupId>
<artifactId>parent</artifactId>
<version>2.13.5</version>
<version>2.13.6</version>
</parent>

<artifactId>xsuaa-spring-boot-starter</artifactId>
Expand Down
Loading

0 comments on commit c8dd76b

Please sign in to comment.