Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version 2.13.7 #1108

Merged
merged 2 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Change Log
All notable changes to this project will be documented in this file.

## 2.13.7
- [token-client] Fixes regression introduced with logback dependency not having scope test

#### Dependency upgrades
- Bump org.json from to 20230227

## 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
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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</version>
</dependency>
<dependency>
<groupId>com.sap.cloud.security</groupId>
<artifactId>java-security</artifactId>
<version>2.13.6</version>
<version>2.13.7</version>
</dependency>

<!-- new java-security dependencies for unit tests -->
<dependency>
<groupId>com.sap.cloud.security</groupId>
<artifactId>java-security-test</artifactId>
<version>2.13.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</version>
</parent>

<groupId>com.sap.cloud.security</groupId>
Expand Down
4 changes: 2 additions & 2 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.6</version>
<version>2.13.7</version>
<packaging>pom</packaging>

<name>parent</name>
Expand Down Expand Up @@ -65,7 +65,7 @@
<reactor.version>3.4.24</reactor.version>
<log4j2.version>2.19.0</log4j2.version>
<slf4j.api.version>1.7.36</slf4j.api.version> <!--see also here http://www.slf4j.org/faq.html#changesInVersion18 -->
<org.json.version>20220924</org.json.version>
<org.json.version>20230227</org.json.version>
<sap.cloud.env.servicebinding.version>0.5.2</sap.cloud.env.servicebinding.version>
<google.jsr305.version>3.0.2</google.jsr305.version>
<apache.httpclient.version>4.5.14</apache.httpclient.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.6</version>
<version>2.13.7</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.6</sap.cloud.security.version>
<sap.cloud.security.version>2.13.7</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.6</version>
<version>2.13.7</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.6</sap.cloud.security.version>
<sap.cloud.security.version>2.13.7</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.6</version>
<version>2.13.7</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.6</sap.cloud.security.version>
<sap.cloud.security.version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</sap.cloud.security.version>
<sap.cloud.security.version>2.13.7</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.6</version>
<version>2.13.7</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.6</sap.cloud.security.version>
<sap.cloud.security.version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</sap.cloud.security.version>
<sap.cloud.security.version>2.13.7</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.6</version>
<version>2.13.7</version>
<name>spring-webflux-security-xsuaa-usage</name>

<properties>
<java.version>1.8</java.version>
<sap.cloud.security.version>2.13.6</sap.cloud.security.version>
<sap.cloud.security.version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</version>
</parent>

<groupId>com.sap.cloud.security</groupId>
<artifactId>spring-security</artifactId>
<packaging>jar</packaging>
<version>2.13.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</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.6</version>
<version>2.13.7</version>
</parent>

<artifactId>xsuaa-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-xsuaa-test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>2.13.6</version>
<version>2.13.7</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion spring-xsuaa-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.6</version>
<version>2.13.7</version>
</parent>

<artifactId>spring-xsuaa-test</artifactId>
Expand Down
Loading