Commit Graph
72 Commits
Author SHA1 Message Date
Olga Maciaszek-Sharma a1fddaf139 Remove RestTemplate support. (#4504)
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-10-09 14:55:03 -04:00
Olga Maciaszek-Sharma d429c7623f Merge remote-tracking branch 'origin/4.3.x' 2025-10-07 14:57:41 +02:00
Olga Maciaszek-Sharma 58f0adf43b Merge remote-tracking branch 'origin/4.2.x' into 4.3.x 2025-10-07 14:57:20 +02:00
Olga Maciaszek-Sharma ab76ec72e9 Apply workaround to enforce Jackson 2 decoder/ encoder use with WebClient. Remove unnecessary classpath exclusions.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-10-01 17:46:44 +02:00
Olga Maciaszek-Sharma 00ade3f8d3 Merge remote-tracking branch 'origin/main' 2025-10-01 15:33:01 +02:00
Olga Maciaszek-Sharma 9274d7cebe Merge remote-tracking branch 'origin/main' 2025-09-19 12:00:53 +02:00
Olga Maciaszek-Sharma 12f664ab76 Use Jackson 2.20.0 in Eureka Client (#4496)
* Revert "Disables WebClientEurekaHttpClientTests"

This reverts commit ad30b66f94.

Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

* Use Jackson `2.20.0` in Client.

Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

---------

Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-09-18 16:08:05 +02:00
Olga Maciaszek-Sharma 4f9d969a78 Revert "Disables WebClientEurekaHttpClientTests"
This reverts commit ad30b66f94.
2025-09-16 14:36:13 +02:00
Olga Maciaszek-Sharma 590e5a2175 Merge remote-tracking branch 'origin/4.3.x' 2025-09-11 16:30:40 +02:00
Olga Maciaszek-Sharma 45d1eeba97 Update maven workflow settings.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-09-11 16:12:52 +02:00
Olga Maciaszek-Sharma 9dbf8dc87a Merge remote-tracking branch 'origin/4.3.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	.github/workflows/maven.yml
2025-09-11 14:53:11 +02:00
Olga Maciaszek-Sharma 738f5f8a05 Merge remote-tracking branch 'origin/4.2.x' into 4.3.x 2025-09-11 14:51:06 +02:00
Olga Maciaszek-Sharma dd8855dfe6 Update dependabot settings.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-09-11 14:41:31 +02:00
Olga Maciaszek-Sharma 6840f4f169 Revert "Set glassfish verion to 3.1.11."
This reverts commit a469382dae.

Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-09-10 15:12:43 +02:00
Olga Maciaszek-Sharma a469382dae Set glassfish verion to 3.1.11.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-09-09 14:26:12 +02:00
Olga Maciaszek-Sharma eb04c42889 Merge remote-tracking branch 'origin/4.3.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/RestTemplateEurekaClientTests.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandler.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthIndicator.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateDiscoveryClientOptionalArgs.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfiguration.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaAutoServiceRegistration.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactoryTests.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfigurationTests.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaAutoServiceRegistrationIntegrationTests.java
#	spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java
#	spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java
#	spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationDashboardDisabledTests.java
#	spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationDashboardPathTests.java
#	spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java
#	spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
#	spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java
2025-08-20 13:18:43 +02:00
Olga Maciaszek-Sharma fd36c06113 Merge remote-tracking branch 'origin/4.2.x' into 4.3.x 2025-08-20 13:10:36 +02:00
Olga Maciaszek-Sharma 1128443b03 Update license to present.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-08-20 13:09:58 +02:00
Olga Maciaszek-Sharma 6efc38d972 Add spring-boot-restclient test dependency.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-07-25 16:40:31 +02:00
Olga Maciaszek-Sharma e71bed3610 Add spring-boot-restclient dependency.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-07-25 13:34:36 +02:00
Olga Maciaszek-Sharma 8e5a21179d Merge remote-tracking branch 'origin/4.3.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
2025-07-25 12:56:15 +02:00
Olga Maciaszek-Sharma 6b52e37357 Merge remote-tracking branch 'origin/4.2.x' into 4.3.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-netflix-dependencies/pom.xml
#	spring-cloud-netflix-eureka-client-tls-tests/pom.xml
#	spring-cloud-netflix-eureka-client/pom.xml
#	spring-cloud-netflix-eureka-server/pom.xml
#	spring-cloud-starter-netflix-eureka-client/pom.xml
#	spring-cloud-starter-netflix-eureka-server/pom.xml
2025-07-25 12:48:41 +02:00
Olga Maciaszek-Sharma d21cfa9c63 Adjust to changes in Spring Security.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-06-30 14:08:22 +02:00
Olga Maciaszek-Sharma eab96b8535 Merge remote-tracking branch 'origin/4.3.x' 2025-06-30 13:53:33 +02:00
Olga Maciaszek-Sharma 28959910a6 Merge remote-tracking branch 'origin/4.2.x' into 4.3.x 2025-06-30 13:53:07 +02:00
Olga Maciaszek-Sharma 79130b2342 Merge changes from 4.1.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-06-30 13:51:59 +02:00
Olga Maciaszek-Sharma 3d12951965 Merge remote-tracking branch 'origin/4.2.x' into 4.2.x 2025-06-30 13:48:57 +02:00
Olga Maciaszek-Sharma 6a5d8c36ab Merge changes from 4.3.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-06-10 15:21:23 +02:00
Olga Maciaszek-Sharma 0b3683a500 Update dependabot and actions setup.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-06-10 13:35:55 +02:00
Olga Maciaszek-Sharma 06e41db342 Merge changes from 4.3.x.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-06-10 13:16:23 +02:00
Olga Maciaszek-Sharma 5d79e6016e Merge remote-tracking branch 'origin/4.2.x' into 4.3.x 2025-06-06 12:53:59 +02:00
Olga Maciaszek-Sharma 0015d41c18 Merge remote-tracking branch 'origin/4.1.x' into 4.2.x 2025-06-06 12:49:31 +02:00
Olga Maciaszek-Sharma e1778825d3 Merge remote-tracking branch 'origin/4.1.x' into 4.2.x 2025-06-05 15:34:51 +02:00
Olga Maciaszek-Sharma 0a1f057d41 Merge remote-tracking branch 'origin/4.2.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
2025-04-11 17:02:31 +02:00
Olga Maciaszek-Sharma 8bff0cf743 Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
2025-04-11 16:56:34 +02:00
Olga Maciaszek-Sharma c1451b0374 Fix checkstyle.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-04-11 16:35:25 +02:00
Olga Maciaszek-Sharma 65b679630f Merge remote-tracking branch 'origin/4.2.x' 2025-03-26 18:00:36 +01:00
Olga Maciaszek-Sharma 7d8abf6dc1 Merge remote-tracking branch 'origin/4.1.x' into 4.2.x 2025-03-26 17:59:40 +01:00
Olga Maciaszek-Sharma 6b37a8bf04 Merge remote-tracking branch 'origin/4.2.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-netflix-dependencies/pom.xml
#	spring-cloud-netflix-eureka-client-tls-tests/pom.xml
#	spring-cloud-netflix-eureka-client/pom.xml
#	spring-cloud-netflix-eureka-server/pom.xml
#	spring-cloud-starter-netflix-eureka-client/pom.xml
#	spring-cloud-starter-netflix-eureka-server/pom.xml
2025-03-24 19:35:47 +01:00
Olga Maciaszek-Sharma 865f9a241d Merge remote-tracking branch 'origin/4.1.x' into 4.2.x 2025-03-24 19:31:36 +01:00
Olga Maciaszek-Sharma 663ca402ab Use applicationTaskExecutor. Fixes gh-4424.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-03-24 19:28:09 +01:00
Olga Maciaszek-Sharma 9ee70c8cbb Merge remote-tracking branch 'origin/4.2.x' 2025-03-18 15:00:06 +01:00
Olga Maciaszek-Sharma 424e1bc856 Merge remote-tracking branch 'origin/4.1.x' into 4.2.x 2025-03-18 14:55:11 +01:00
Olga Maciaszek-Sharma bfbd6d15c7 Move Jersey Client Configuration for Eureka Server to a separate AutoConfiguration class. Fixes gh-4407.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-03-18 14:54:47 +01:00
Olga Maciaszek-Sharma acf7485073 Merge remote-tracking branch 'origin/4.2.x' 2025-03-13 12:52:56 +01:00
Olga Maciaszek-Sharma f454487a27 Merge remote-tracking branch 'origin/4.1.x' into 4.2.x 2025-03-13 12:43:59 +01:00
Olga Maciaszek-Sharma 04d15556ec Restore dependency duplicate verification.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-03-13 12:42:33 +01:00
Olga Maciaszek-Sharma 075d520088 Merge remote-tracking branch 'origin/4.2.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
2025-03-13 11:39:02 +01:00
Olga Maciaszek-Sharma aa8ae9936a Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
2025-03-13 11:36:54 +01:00
Olga Maciaszek-Sharma f70fef1d10 Merge remote-tracking branch 'origin/4.2.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
2025-03-04 17:43:25 +01:00
Olga Maciaszek-Sharma 2195956aca Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
2025-03-04 17:41:24 +01:00
Olga Maciaszek-Sharma aa3b1ef5d7 Temporarily disable flaky tests.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-03-04 17:29:21 +01:00
Olga Maciaszek-Sharma c6fcfab533 Temporarily disable flaky tests.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-03-04 17:29:07 +01:00
Olga Maciaszek-Sharma 0d4ddc660f Merge remote-tracking branch 'origin/4.2.x' 2025-02-10 15:55:13 +01:00
Olga Maciaszek-Sharma f224863613 Merge remote-tracking branch 'origin/4.1.x' into 4.2.x 2025-02-10 15:54:21 +01:00
Olga Maciaszek-Sharma 25c3f2034d Merge remote-tracking branch 'origin/4.2.x' 2025-02-10 15:53:42 +01:00
Olga Maciaszek-Sharma 732ca5391d Update dependabot settings.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-02-10 15:07:51 +01:00
Olga Maciaszek-Sharma 7f122b921d Temporarily disable flaky tests.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-02-07 15:41:24 +01:00
Olga Maciaszek-Sharma 5dcb1b2e39 Temporarily disable flaky tests.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-02-07 15:40:52 +01:00
Olga Maciaszek-Sharma e4fe94e110 Temporarily disable flaky tests.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-02-07 15:38:40 +01:00
Olga Maciaszek-Sharma 83e607a606 Temporarily disable flaky tests.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-01-30 12:01:50 +01:00
Olga Maciaszek-Sharma 571157c264 Try fixing flaky test.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-01-16 16:55:54 +01:00
Olga Maciaszek-Sharma c28559883d Merge remote-tracking branch 'origin/4.2.x' 2025-01-16 16:50:56 +01:00
Olga Maciaszek-Sharma b1c47e4153 Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-netflix-dependencies/pom.xml
#	spring-cloud-netflix-eureka-client-tls-tests/pom.xml
#	spring-cloud-netflix-eureka-client/pom.xml
#	spring-cloud-netflix-eureka-server/pom.xml
#	spring-cloud-starter-netflix-eureka-client/pom.xml
#	spring-cloud-starter-netflix-eureka-server/pom.xml
2025-01-16 16:49:48 +01:00
Olga Maciaszek-Sharma b5863abc3d Add DCO.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-01-16 16:46:53 +01:00
Olga Maciaszek-Sharma ce03197608 Change versions to 4.3.0-SNAPSHOT.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-01-16 16:43:45 +01:00
Olga Maciaszek-Sharma d1eb0292ea Allow customising HC5 RequestConfig in EurekaClientHttpRequestFactorySupplier (#4394) 2025-01-16 15:37:46 +01:00
Olga Maciaszek-Sharma bd38ceb02e Try fixing flaky test.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-01-16 14:54:20 +01:00
Olga Maciaszek-Sharma 011d181586 Use task executor for Euereka Server metrics. (#4376) 2024-11-22 14:58:05 +01:00
Olga Maciaszek-Sharma 87ec1d75cb Set up RestClient-based TransportClientFactories (#4363) 2024-11-07 16:20:45 +01:00
Olga Maciaszek-Sharma 7a7bb2f5c2 Fix tls tests (#4348) 2024-10-09 18:11:24 +02:00
Olga Maciaszek-Sharma b43fa21fd8 Handle TLS settings for Eureka Server's JerseyClient. (#4285) 2024-07-02 14:55:22 +02:00