spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 15:49:00 +00:00
Code Issues Projects Releases Wiki Activity
2,998 Commits 42 Branches 167 Tags
5243e460181002c252254fcfc47f2fd027813cff
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Olga Maciaszek-Sharma 5243e46018 Switch to Apache HC5 HttpClient. (#4126) 2022-10-11 16:12:27 +02:00
Olga Maciaszek-Sharma 67c227d9d7 Merge remote-tracking branch 'origin/3.1.x' 2022-09-01 15:59:37 +02:00
Olga Maciaszek-Sharma a30b87cdda Remove unused Codacy badge. Fixes gh-4105. 2022-09-01 15:58:57 +02:00
Olga Maciaszek-Sharma 01f72ff328 Merge remote-tracking branch 'origin/3.1.x' 2022-08-31 11:45:29 +02:00
Olga Maciaszek-Sharma 65fb24e321 Fix merge. 2022-07-01 15:38:58 +02:00
Olga Maciaszek-Sharma 0188b2511d Merge remote-tracking branch 'origin/3.1.x' 2022-07-01 15:38:18 +02:00
Olga Maciaszek-Sharma c6a7ebb918 merge 3.0.x 2022-07-01 15:37:50 +02:00
Olga Maciaszek-Sharma 8b2b6b5115 Update license dates for bugfix backport. 2022-06-29 15:42:19 +02:00
Olga Maciaszek-Sharma 612b6edb41 Add new tests and refactor. 2022-06-28 18:52:06 +02:00
Olga Maciaszek-Sharma b633c8af96 Bugfix. 2022-06-28 18:51:57 +02:00
Olga Maciaszek-Sharma 079ae668c0 Add resolving Health Status from composite indicators. 2022-06-28 18:51:44 +02:00
Olga Maciaszek-Sharma 3af988adcf Merge remote-tracking branch 'origin/3.1.x' 2022-06-13 18:58:12 +02:00
Olga Maciaszek-Sharma a5e038cf13 Do not set status to down. (#4102) 2022-06-13 18:57:46 +02:00
Olga Maciaszek-Sharma 9e1f7f6aad Fix @LocalServerPort imports. 2022-05-18 14:04:49 +02:00
Olga Maciaszek-Sharma 4b5d0a0b86 Revert "Update SNAPSHOT to 3.1.2" 
This reverts commit 96b10d40c3.
 2022-04-27 11:08:20 +02:00
Olga Maciaszek-Sharma 4fda5b40b8 Revert "Going back to snapshots" 
This reverts commit 872d64494b.
 2022-04-27 11:08:15 +02:00
Olga Maciaszek-Sharma 719688f4c8 Revert "Bumping versions to 3.1.3-SNAPSHOT after release" 
This reverts commit 162b1c8a9b.
 2022-04-27 11:08:12 +02:00
Olga Maciaszek-Sharma 27ac3379f6 Remove deprecated constructor. 2022-04-13 14:02:52 +02:00
Olga Maciaszek-Sharma e38cd1ef66 Merge remote-tracking branch 'origin/3.1.x' 2022-04-13 13:59:57 +02:00
Olga Maciaszek-Sharma 93913603eb Merge remote-tracking branch 'origin/3.1.x' 2022-03-18 13:12:56 +01:00
Olga Maciaszek-Sharma cdf89659e8 Merge remote-tracking branch 'origin/3.1.x' 2022-03-17 12:26:23 +01:00
Olga Maciaszek-Sharma 1efa843ed8 Get health from composite indicators (#4074) 2022-03-17 12:25:57 +01:00
Olga Maciaszek-Sharma fab3190ca4 Merge remote-tracking branch 'origin/3.1.x' 2022-03-17 11:10:30 +01:00
Olga Maciaszek-Sharma 2c22afa8bd Upgrade wro4j-maven-plugin to 0.10.1. Fixes gh-4076. 2022-03-11 16:31:59 +01:00
Olga Maciaszek-Sharma e33e5a54f6 Merge remote-tracking branch 'origin/3.1.x' 2022-03-11 16:30:58 +01:00
Olga Maciaszek-Sharma e757479f85 Upgrade Eureka Server GUI dependencies and components. (#4075) 2022-03-11 16:23:06 +01:00
Olga Maciaszek-Sharma e5ba2575e6 Merge remote-tracking branch 'origin/3.1.x' 2022-02-22 17:51:59 +01:00
Olga Maciaszek-Sharma 8f9797627f Merge remote-tracking branch 'MI-cool/reduceHighLoadOnRenew' into 3.1.x 2022-02-22 17:24:48 +01:00
Olga MaciaszekSharma dd80e2b23b Update license entries. 2022-01-11 19:07:29 +01:00
Olga MaciaszekSharma 872ac78396 Update license entries. 2022-01-11 18:58:20 +01:00
Olga MaciaszekSharma 91790a55a7 Merge remote-tracking branch 'origin/3.0.x' into 3.1.x 2022-01-11 15:06:43 +01:00
Olga MaciaszekSharma 927a51c21c Fix typo in EurekaController. 2022-01-11 15:06:18 +01:00
Olga MaciaszekSharma 39b4c8b578 Merge remote-tracking branch 'origin/3.0.x' into 3.1.x 2022-01-11 14:32:08 +01:00
Olga MaciaszekSharma 5da06943c0 Regenerate docs. 2022-01-11 14:08:00 +01:00
Olga Maciaszek-Sharma ed3834f781 Add and configure duplicate-finder plugin. Remove duplicates. (#4051) 2021-11-29 15:13:10 +01:00
Olga MaciaszekSharma d71040222b Merge remote-tracking branch 'origin/3.0.x' 2021-11-25 16:18:38 +01:00
Olga MaciaszekSharma 1327bcb7d0 Upgrade Eureka to 1.10.17. Fixes gh-4050. Fixes gh-4030. 2021-11-25 16:17:17 +01:00
Olga MaciaszekSharma 519c1d2aaf Merge remote-tracking branch 'origin/3.0.x' 2021-10-04 18:59:27 +02:00
Olga MaciaszekSharma d925a03343 Rebuild docs. 2021-10-04 18:50:30 +02:00
Olga MaciaszekSharma 44fa4a226e Merge remote-tracking branch 'origin/3.0.x' 2021-09-09 13:51:32 +02:00
Olga MaciaszekSharma 0490150344 Upgrade eureka-client and xstream. Fixes gh-4025. 2021-09-09 13:51:11 +02:00
Olga MaciaszekSharma 6356c11b45 Merge remote-tracking branch 'origin/3.0.x' 2021-09-09 13:14:14 +02:00
Olga MaciaszekSharma 86797d0f12 Fix outdated sagan description. Reformat. Fixes gh-4029. 2021-09-09 13:13:45 +02:00
Olga MaciaszekSharma 8cbb4dbe20 Merge remote-tracking branch 'origin/3.0.x' 2021-07-26 16:06:22 +02:00
Olga MaciaszekSharma aeeee56edc Merge remote-tracking branch 'origin/3.0.x' 2021-07-19 10:25:47 +02:00
Olga MaciaszekSharma 12ffaf1005 Fix checkstyle and outdated API use. 2021-07-15 16:21:17 +02:00
Olga MaciaszekSharma 2b10f19d1a Downgrade Maven Resources Plugin to 3.1.0. 2021-07-12 16:52:02 +02:00
Olga MaciaszekSharma 96eb785d07 Downgrade wro4j to 1.8.0. 2021-07-12 15:20:35 +02:00
Olga MaciaszekSharma d79b43fd28 Downgrade wro4j to 1.9.0. 2021-07-12 15:07:16 +02:00
Olga MaciaszekSharma f4baba128d Upgrade wro4j. Temporarily ignore test. 2021-07-12 14:25:57 +02:00
Olga MaciaszekSharma 3e60fd4096 Merge remote-tracking branch 'origin/2.2.x' into main 2021-05-24 19:19:27 +02:00
Olga Maciaszek-Sharma 89c37a3842 Handle stopping instance (#3999) 
* Fix for #1571

See https://github.com/spring-cloud/spring-cloud-netflix/issues/1571#issuecomment-351638405 for more information about the rational behind the changes.

Original contributor: Bertrand Renuart <bertrand.renuart@itma.lu>
 2021-05-24 19:08:25 +02:00
Olga MaciaszekSharma 849f1e7e99 Fix doc. 2021-05-24 17:06:38 +02:00
Olga MaciaszekSharma 3f4c702aa5 Upgrade bcpkix to 1.68. 2021-05-24 14:04:51 +02:00
Olga MaciaszekSharma 80e4408de7 Remove Ribbon, Hystrix, Zuul and Turbine references from docs and checkstyle. 2021-04-26 19:23:24 +02:00
Olga MaciaszekSharma 86101cd733 Switch from main to master. 2021-04-26 19:12:59 +02:00
Olga MaciaszekSharma 1cb2aa34d3 Merge remote-tracking branch 'origin/2.2.x' into main 2021-04-26 19:08:20 +02:00
Olga MaciaszekSharma a5734695b7 Revert "Switch to GH actions." 
This reverts commit e839d1dfbd.
 2021-04-26 19:05:25 +02:00
Olga MaciaszekSharma 14c7ac2dda Fix README generation. 
# Conflicts:
#	docs/README.adoc
 2021-04-26 19:00:10 +02:00
Olga MaciaszekSharma f151c881de Merge remote-tracking branch 'origin/2.2.x' into main 2021-04-26 18:53:49 +02:00
Olga MaciaszekSharma e839d1dfbd Switch to GH actions. 2021-04-26 18:44:52 +02:00
Olga MaciaszekSharma 6ad1ab2c76 Fix README generation. 2021-04-26 18:41:02 +02:00
Olga MaciaszekSharma e8ed3c3bd1 Switch from master to main. 2021-04-26 18:27:50 +02:00
Olga MaciaszekSharma 6f1332ee72 Reformat. 2021-04-20 17:23:37 +02:00
Olga Maciaszek-Sharma bff9419201 Do not load RibbonAutoConfiguration when spring.cloud.loadbalancer.ribbon.enabled is false. (#3977) 2021-03-05 16:08:15 +01:00
Olga Maciaszek-Sharma 7b90195ee8 Upgrade SC Contract version in Hystrix-Contract. 2021-02-18 16:51:43 +01:00
Olga Maciaszek-Sharma 8ecb3dca51 Fix request verification (#3969) 
* Add tests reproducing the issue.

* Strip `'` from path for route search.

* Add information on contributing, community support and commercial support to project site.

* Add checking for "#". Add logging.

* Add test.

* Revert "Add test."

This reverts commit 81875849

* Revert "Add checking for "#". Add logging."

This reverts commit 0232945a

* Verify for urls.

* Verify for encoded and double-encoded Strings.

* Verify insecure paths with `..\` and '..//'. Add more tests.
 2021-02-11 11:58:55 +01:00
Olga Maciaszek-Sharma 63134d9f47 Merge remote-tracking branch 'origin/2.2.x' 2021-01-22 10:16:11 +01:00
Olga Maciaszek-Sharma df64a02013 Use org security policy. 2021-01-22 10:15:20 +01:00
Olga Maciaszek-Sharma 2aedbcaaa6 Merge remote-tracking branch 'origin/2.2.x' 2021-01-18 11:14:35 +01:00
Olga Maciaszek-Sharma 74f7c0eefd Add information on contributing, community support and commercial support to project site. 2021-01-18 11:07:00 +01:00
Olga Maciaszek-Sharma 0092fb50d9 Merge remote-tracking branch 'origin/2.2.x' 2021-01-14 16:03:37 +01:00
Olga Maciaszek-Sharma c6141c5b15 Add license link to the docs. 2021-01-14 16:03:01 +01:00
Olga Maciaszek-Sharma 9c40720aa6 Make bean conditional on RestTemplate.class. (#3943) 2020-12-18 13:59:52 -05:00
Olga Maciaszek-Sharma e181683a00 Remove deprecations. 2020-12-10 12:20:11 +01:00
Olga Maciaszek-Sharma b6ed99eb9b Remove deprecations. 2020-12-10 11:18:44 +01:00
Olga Maciaszek-Sharma eef49656e0 Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-netflix-archaius/pom.xml
#	spring-cloud-netflix-concurrency-limits/pom.xml
#	spring-cloud-netflix-core/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-netflix-hystrix-contract/pom.xml
#	spring-cloud-netflix-hystrix-dashboard/pom.xml
#	spring-cloud-netflix-hystrix-stream/pom.xml
#	spring-cloud-netflix-hystrix/pom.xml
#	spring-cloud-netflix-ribbon/pom.xml
#	spring-cloud-netflix-sidecar/pom.xml
#	spring-cloud-netflix-turbine-stream/pom.xml
#	spring-cloud-netflix-turbine/pom.xml
#	spring-cloud-netflix-zuul/pom.xml
#	spring-cloud-starter-netflix-eureka-client/pom.xml
#	spring-cloud-starter-netflix-eureka-server/pom.xml
#	spring-cloud-starter-netflix/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml
 2020-12-01 19:09:40 +01:00
Olga Maciaszek-Sharma 4ec5556420 Upgrade xstream to 1.4.14. 2020-12-01 18:58:40 +01:00
Olga Maciaszek-Sharma 2fe021fbdb Switch to server.servlet.encoding.force. Fixes gh-3895. 2020-12-01 18:46:38 +01:00
Olga Maciaszek-Sharma a452c1d8e9 Upgrade Eureka to 1.10.10. 2020-12-01 18:33:49 +01:00
Olga Maciaszek-Sharma 3bf50f3ef5 Upgrade bcpkix-jdk15on. 2020-12-01 18:21:50 +01:00
Olga Maciaszek-Sharma 99ebcfb79a Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	spring-cloud-netflix-dependencies/pom.xml
 2020-10-30 17:22:16 +01:00
Olga Maciaszek-Sharma 08add768d0 Bump mockito-core to 3.6.0. 2020-10-30 17:14:44 +01:00
Olga Maciaszek-Sharma 4064646b39 Bump eureka to 1.10.7. 2020-10-30 16:53:31 +01:00
Olga Maciaszek-Sharma c1352a8132 Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandler.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java
 2020-10-30 16:23:23 +01:00
Olga Maciaszek-Sharma ce73a587f5 Handle nulls. Minor refactoring. 2020-10-30 16:08:24 +01:00
Olga Maciaszek-Sharma 13337db454 Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandler.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java
 2020-10-30 15:51:47 +01:00
Olga Maciaszek-Sharma 658599f810 Use eureka-jersey version for all the jersey artifacts. Remove duplicated dependency. 2020-10-06 21:35:51 +02:00
Olga Maciaszek-Sharma 0e2cd26a4a Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	spring-cloud-netflix-dependencies/pom.xml
#	spring-cloud-netflix-hystrix-dashboard/pom.xml
#	spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftlh
#	spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftlh
#	spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java
 2020-10-06 20:58:57 +02:00
Olga Maciaszek-Sharma 6ce8123be1 Upgrade eureka to 1.10.4. 2020-10-06 20:32:08 +02:00
Olga Maciaszek-Sharma d11f91cdb1 Upgrade mockito-core to 3.5.13. 2020-10-06 20:06:08 +02:00
Olga Maciaszek-Sharma 57053ed7eb Upgrade xstream to 1.4.13. 2020-10-06 19:46:21 +02:00
Olga Maciaszek-Sharma 0297304397 Upgrade bcpkix-jdk15on to 1.66. 2020-10-06 19:23:15 +02:00
Olga Maciaszek-Sharma 4bdb799c8c Revert "Upgrade wro4j to 1.9.0." 
This reverts commit 6e70f55049.
 2020-10-06 18:36:18 +02:00
Olga Maciaszek-Sharma 6e70f55049 Upgrade wro4j to 1.9.0. 2020-10-06 18:13:48 +02:00
Olga Maciaszek-Sharma be57fe3d8b Upgrade jquery to 3.5.1. 2020-10-06 18:03:38 +02:00
Olga Maciaszek-Sharma 931cca4f44 Upgrade eureka-jersey to 1.19.4. 2020-10-06 17:43:46 +02:00
Olga Maciaszek-Sharma 40ee698777 Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-netflix-archaius/pom.xml
#	spring-cloud-netflix-concurrency-limits/pom.xml
#	spring-cloud-netflix-core/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-netflix-hystrix-contract/pom.xml
#	spring-cloud-netflix-hystrix-dashboard/pom.xml
#	spring-cloud-netflix-hystrix-stream/pom.xml
#	spring-cloud-netflix-hystrix/pom.xml
#	spring-cloud-netflix-ribbon/pom.xml
#	spring-cloud-netflix-sidecar/pom.xml
#	spring-cloud-netflix-turbine-stream/pom.xml
#	spring-cloud-netflix-turbine/pom.xml
#	spring-cloud-netflix-zuul/pom.xml
#	spring-cloud-starter-netflix-eureka-client/pom.xml
#	spring-cloud-starter-netflix-eureka-server/pom.xml
#	spring-cloud-starter-netflix/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml
#	spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml
 2020-09-22 14:52:20 +02:00
Olga Maciaszek-Sharma 0d7c73c583 Set errexit output (#3894) 2020-09-22 14:48:02 +02:00
Olga Maciaszek-Sharma 0783016676 Fix failing checkstyle. 2020-04-23 16:49:09 +02:00