SpringCloud/spring-cloud-core-tests
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to spring cloud 2022.0.0

Browse Source 
Includes updates to jdk17, framework 6 and boot 3
This commit is contained in:
spencergibb
2022-01-21 13:42:59 -05:00
parent 9b9e360dc6
commit 474cb1365d
28 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.sdkmanrc
View File

@@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=8.0.292.hs-adpt
java=17.0.1-tem

6
bootstrap/pom.xml
View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
bus/pom.xml
View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
config-client-decrypt/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
config-client/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
config-retry/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
configserver-bootstrap/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -33,8 +33,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>demo.DemoApplication</start-class>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
configserver-eureka/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -33,8 +33,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>demo.DemoApplication</start-class>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
configserver/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -31,8 +31,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
eureka-client/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
eureka-first/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -33,8 +33,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>demo.DemoApplication</start-class>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
eureka-noweb/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
eureka-server/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -33,8 +33,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>demo.DemoApplication</start-class>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
feign-eager-instantiation/pom.xml
View File

@@ -14,15 +14,15 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
feign-eureka/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
feign/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
netflix-sidecar/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -33,8 +33,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>demo.DemoApplication</start-class>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
noweb/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
oauth2-ribbon/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

20
pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-tests</artifactId>
<version>2021.0.0-SNAPSHOT</version>
<version>2022.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Core Tests</name>
<description>Spring Cloud Core Tests</description>
@@ -25,24 +25,24 @@
<module>config-retry</module>
<module>configserver</module>
<module>configserver-bootstrap</module>
<module>configserver-eureka</module>
<module>eureka-client</module>
<module>eureka-first</module>
<module>eureka-noweb</module>
<module>eureka-server</module>
<!--<module>configserver-eureka</module>-->
<!--<module>eureka-client</module>-->
<!--<module>eureka-first</module>-->
<!--<module>eureka-noweb</module>-->
<!--<module>eureka-server</module>-->
<module>feign</module>
<module>feign-eager-instantiation</module>
<module>feign-eureka</module>
<!--<module>feign-eureka</module>-->
<!--<module>netflix-sidecar</module>-->
<module>noweb</module>
<!-- TODO: replace ribbon with spring cloud loadbalancer -->
<!--<module>oauth2-ribbon</module>
<module>ribbon-default-config</module>
<module>ribbon-eureka</module>-->
<module>sleuth</module>
<!--<module>sleuth</module>-->
<module>stream-bus</module>
<module>vanilla</module>
<module>zipkin</module>
<!--<module>zipkin</module>-->
</modules>
<build>
<plugins>

6
ribbon-default-config/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -27,8 +27,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
ribbon-eureka/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

4
scripts/runAcceptanceTests.sh
View File

@@ -21,8 +21,8 @@ function cloudVersion() {
CURRENT_BOOT_VERSION="${CURRENT_BOOT_VERSION:-}"
CURRENT_CLOUD_VERSION="${CURRENT_CLOUD_VERSION:-}"
#[[ -z "${CURRENT_BOOT_VERSION}" ]] && CURRENT_BOOT_VERSION="$( bootVersion "2.4" )"
CURRENT_BOOT_VERSION="2.6.0-SNAPSHOT"
[[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2021.0.0-SNAPSHOT" )"
CURRENT_BOOT_VERSION="3.0.0-SNAPSHOT"
[[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2022.0.0-SNAPSHOT" )"
function build() {
echo "Updating parent boot to [${CURRENT_BOOT_VERSION}]"

6
sleuth/pom.xml
View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencyManagement>

6
stream-bus/pom.xml
View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
<testcontainers.version>1.15.3</testcontainers.version>
</properties>

2
stream-bus/src/main/java/demo/StreamBusApplication.java
View File

@@ -2,8 +2,6 @@ package demo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Source;
/**
* @author Dave Syer

6
vanilla/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<build>

6
zipkin/pom.xml
View File

@@ -14,15 +14,15 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>demo.DemoApplication</start-class>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0-SNAPSHOT</spring-cloud.version>
<java.version>17</java.version>
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
</properties>
<dependencyManagement>