From 9a3e622742a8bb6490fe3a341c4a423e5fb14eaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:16:59 +0100 Subject: [PATCH 1/5] Bump actions/checkout from 2 to 4 (#4192) --- .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 da5a83dbf..990c964a3 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 28ba6079f0b3946e2fbdebec9fb49e767a72114f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:18:15 +0100 Subject: [PATCH 2/5] Bump codecov/codecov-action from 1 to 3 (#4195) --- .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 990c964a3..c9d1854e1 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: false From fdc37f6d547340b37b1a36eaed7818e5fbb0daaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:19:00 +0100 Subject: [PATCH 3/5] Bump actions/setup-java from 2 to 3 (#4198) --- .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 c9d1854e1..9174b0f3d 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 a76ddd526aec468729fc08cab15c59dab98db63f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:19:48 +0100 Subject: [PATCH 4/5] Bump eureka.version from 1.10.17 to 1.10.18 (#4202) --- spring-cloud-netflix-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 883d9fc97..855c42199 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -14,7 +14,7 @@ spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies - 1.10.17 + 1.10.18 From 564ac7a1a5543efca5a5d3d9905912ba08bf1dd3 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Thu, 9 Nov 2023 18:55:51 +0100 Subject: [PATCH 5/5] Remove Ribbon mentions. Fixes gh-4219. --- docs/src/main/asciidoc/_configprops.adoc | 1 - docs/src/main/asciidoc/spring-cloud-netflix.adoc | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 6 ------ .../src/test/resources/application.yml | 7 +------ 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 503c407a6..bf3454e5e 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -14,7 +14,6 @@ |eureka.client.register-with-eureka | `+++true+++` | Indicates whether or not this instance should register its information with eureka server for discovery by others. In some cases, you do not want your instances to be discovered whereas you just want do discover other instances. |eureka.server.peer-eureka-nodes-update-interval-ms | `+++0+++` | |eureka.server.peer-eureka-status-refresh-time-interval-ms | `+++0+++` | -|ribbon.eureka.enabled | `+++true+++` | Enables the use of Eureka with Ribbon. |spring.cloud.loadbalancer.eureka.approximate-zone-from-hostname | `+++false+++` | Used to determine whether we should try to get the `zone` value from host name. |=== \ No newline at end of file diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 1f2e60d27..1f7562fb9 100755 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -307,7 +307,7 @@ The following example shows the dependencies you need to add: You need not use the raw Netflix `EurekaClient`. Also, it is usually more convenient to use it behind a wrapper of some sort. -Spring Cloud has support for <> (a REST client builder) and <> through the logical Eureka service identifiers (VIPs) instead of physical URLs. +Spring Cloud has support for <> (a REST client builder) and https://docs.spring.io/spring-cloud-commons/docs/3.1.7/reference/html/#spring-cloud-loadbalancer[Spring Cloud LoadBalancer] through the logical Eureka service identifiers (VIPs) instead of physical URLs. You can also use the `org.springframework.cloud.client.discovery.DiscoveryClient`, which provides a simple API (not specific to Netflix) for discovery clients, as shown in the following example: diff --git a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 7f16592a7..0342fced7 100644 --- a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -12,12 +12,6 @@ "description": "Determines whether the EurekaClient instance can be refreshed or not(If disabled none of the Eureka client properties will be refreshable).", "type": "java.lang.Boolean" }, - { - "defaultValue": true, - "name": "ribbon.eureka.enabled", - "description": "Enables the use of Eureka with Ribbon.", - "type": "java.lang.Boolean" - }, { "defaultValue": false, "name": "eureka.client.webclient.enabled", diff --git a/spring-cloud-netflix-eureka-client/src/test/resources/application.yml b/spring-cloud-netflix-eureka-client/src/test/resources/application.yml index 3e83e31a8..a7cc48ce8 100644 --- a/spring-cloud-netflix-eureka-client/src/test/resources/application.yml +++ b/spring-cloud-netflix-eureka-client/src/test/resources/application.yml @@ -1,9 +1,4 @@ -# for EurekaRibbonClientPropertyOverrideIntegrationTests -foo3: - ribbon: - NFLoadBalancerPingClassName: com.netflix.loadbalancer.DummyPing - NIWSServerListClassName: com.netflix.loadbalancer.ConfigurationBasedServerList - + security: basic: enabled: false