From 7ea8fcfa85153bf98d9570608f79c126af92d660 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:02:54 -0400 Subject: [PATCH 1/8] Fixing includes --- README.adoc | 3 +-- docs/src/main/asciidoc/README.adoc | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index b9d62cf55..466b82e7d 100644 --- a/README.adoc +++ b/README.adoc @@ -38,8 +38,7 @@ and binding to the Spring Environment and other Spring programming model idioms. == Building - -:jdkversion: 17 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 4dce562ea..26f4af395 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -12,11 +12,11 @@ include::intro.adoc[] == Building -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building-jdk8.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building-jdk8.adoc[] == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[] == License From 64af4d00e10c5bc6308692b351429b9a424b7aff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 13:05:22 +0100 Subject: [PATCH 2/8] Bump actions/checkout from 2 to 4 (#897) --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0282149bd..64eb67f29 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,7 +19,7 @@ jobs: java: ["8"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v2 with: From 85e235b8e5f1b8241e3f074b19c14374cc3c12c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 13:06:07 +0100 Subject: [PATCH 3/8] Bump codecov/codecov-action from 1 to 3 (#900) --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 64eb67f29..6abd67af6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,6 +28,6 @@ jobs: cache: 'maven' - name: Build with Maven run: ./mvnw clean install -B -U -P sonar - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: fail_ci_if_error: true From b3270388eb519ef980bfbf62c3b8f952bb29408e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 13:09:36 +0100 Subject: [PATCH 4/8] Bump actions/setup-java from 2 to 3 (#902) --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6abd67af6..424b4f67f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.java }} From eb3a9cb7bc5b9c8b1d03393e5ea34889a5d6e606 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 13:10:06 +0100 Subject: [PATCH 5/8] Bump com.fasterxml.jackson.dataformat:jackson-dataformat-smile (#909) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1ce200ad..46963e247 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ ${basedir} - 2.11.3 + 2.11.4 3.1.8-SNAPSHOT From 952fe21241809ffce3b58fc5b0a3e3539d9867cd Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 14 Nov 2023 13:22:46 +0100 Subject: [PATCH 6/8] Upgrade dependencies. (#928) --- pom.xml | 4 ++-- spring-cloud-openfeign-core/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 46963e247..7a6ff6d17 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ ${basedir} - 2.11.4 + 2.15.3 3.1.8-SNAPSHOT 2.10 - 2.19.1 + 2.22.2 jacoco reuseReports ${project.basedir}/../target/jacoco.exec diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 96a636f05..d352e0676 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -216,7 +216,7 @@ com.google.protobuf protobuf-java - 3.19.6 + 3.25.0 test @@ -233,7 +233,7 @@ commons-io commons-io - 2.11.0 + 2.15.0 test From 8a32228758469816ea8963d7c8dedfe78ab14adf Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 14 Nov 2023 15:26:18 +0100 Subject: [PATCH 7/8] Upgrade to feign-core 12.5. (#929) --- spring-cloud-openfeign-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index d5f3d85b5..21cfe2097 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies - 12.4 + 12.5 3.8.0 From 999aaedb5ffed0cbc30a159f5cdb3e059463eb40 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Tue, 14 Nov 2023 15:58:45 +0100 Subject: [PATCH 8/8] Upgrade Feign to 13.0. Upgrade Surefire plugin to 3.2.2. Regenerate configprops. --- docs/modules/ROOT/partials/_configprops.adoc | 2 ++ pom.xml | 2 +- .../cloud/openfeign/FeignClientUsingPropertiesTests.java | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/modules/ROOT/partials/_configprops.adoc b/docs/modules/ROOT/partials/_configprops.adoc index aecbb2e5a..13b00a7eb 100644 --- a/docs/modules/ROOT/partials/_configprops.adoc +++ b/docs/modules/ROOT/partials/_configprops.adoc @@ -60,6 +60,8 @@ |spring.cloud.loadbalancer.retry.retryable-status-codes | `+++{}+++` | A `Set` of status codes that should trigger a retry. |spring.cloud.loadbalancer.sticky-session.add-service-instance-cookie | `+++false+++` | Indicates whether a cookie with the newly selected instance should be added by LoadBalancer. |spring.cloud.loadbalancer.sticky-session.instance-id-cookie-name | `+++sc-lb-instance-id+++` | The name of the cookie holding the preferred instance id. +|spring.cloud.loadbalancer.subset.instance-id | | Instance id of deterministic subsetting. If not set, {@link IdUtils#getDefaultInstanceId(PropertyResolver)} will be used. +|spring.cloud.loadbalancer.subset.size | `+++100+++` | Max subset size of deterministic subsetting. |spring.cloud.loadbalancer.x-forwarded.enabled | `+++false+++` | To Enable X-Forwarded Headers. |spring.cloud.openfeign.autoconfiguration.jackson.enabled | `+++true+++` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding. |spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled | `+++false+++` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties. diff --git a/pom.xml b/pom.xml index c9c2d8a10..a51e2921a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2.10 - 2.22.2 + 3.2.2 jacoco reuseReports ${project.basedir}/../target/jacoco.exec diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java index c26472a09..2b57cf7ee 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java @@ -429,7 +429,7 @@ public void apply(RequestTemplate template) { public static class BazResponseInterceptor implements ResponseInterceptor { @Override - public Object aroundDecode(InvocationContext invocationContext) { + public Object intercept(InvocationContext invocationContext, Chain chain) throws Exception { return "baz"; } diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 6955be578..b213477f9 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies - 12.5 + 13.0 3.8.0