Cherry pick SpringBoot updates for Release 0.22 (#939)

* fix: apply updated spring-boot-function dependency (#936)

This commit updates the spring-boot-function dependency explicitly as there
is not yet a CVE fix for spring-cloud 2021.0.1.

```
❯ ./mvnw clean install dependency:tree | grep spring-cloud-function
[INFO] |  +- org.springframework.cloud:spring-cloud-function-web:jar:3.2.2:compile
[INFO] +- org.springframework.cloud:spring-cloud-function-context:jar:3.2.3:compile (optional)
[INFO] |  +- org.springframework.cloud:spring-cloud-function-core:jar:3.2.2:compile (optional)
```

Fixes: https://github.com/knative-sandbox/kn-plugin-func/issues/929
Fixes: https://spring.io/blog/2022/03/29/cve-report-published-for-spring-cloud-function

Signed-off-by: Lance Ball <lball@redhat.com>

* deps: add updated pkged.go

Signed-off-by: Lance Ball <lball@redhat.com>
This commit is contained in:
Lance Ball 2022-04-04 14:34:43 -04:00 committed by GitHub
parent 4fec4afca1
commit ee245c1585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions

File diff suppressed because one or more lines are too long

View File

@ -18,8 +18,9 @@
<properties>
<java.version>11</java.version>
<spring-cloud.version>2020.0.4</spring-cloud.version>
<spring-native.version>0.10.3</spring-native.version>
<spring-cloud.version>2021.0.1</spring-cloud.version>
<spring-cloud-function.version>3.2.3</spring-cloud-function.version>
<spring-native.version>0.11.3</spring-native.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<log4j2.version>2.16.0</log4j2.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
@ -53,6 +54,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId>
<version>${spring-cloud-function.version}</version>
<optional>true</optional>
</dependency>
<dependency>

View File

@ -18,8 +18,9 @@
<properties>
<java.version>11</java.version>
<spring-cloud.version>2020.0.4</spring-cloud.version>
<spring-native.version>0.10.3</spring-native.version>
<spring-cloud.version>2021.0.1</spring-cloud.version>
<spring-cloud-function.version>3.2.3</spring-cloud-function.version>
<spring-native.version>0.11.3</spring-native.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<log4j2.version>2.16.0</log4j2.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
@ -53,6 +54,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId>
<version>${spring-cloud-function.version}</version>
<optional>true</optional>
</dependency>
<dependency>