 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 |
|
 buildmaster
|
d384bd29c3
|
Bumping versions
|
2020-11-19 17:42:26 +00:00 |
|
|
buildmaster
|
191b889994
|
Going back to snapshots
|
2020-11-17 20:37:53 +00:00 |
|
|
buildmaster
|
300fe19ca0
|
Update SNAPSHOT to 3.0.0-M5
v3.0.0-M5
|
2020-11-17 20:36:52 +00:00 |
|
|
buildmaster
|
b6badeb556
|
Bumping versions
|
2020-11-16 17:42:26 +00:00 |
|
|
buildmaster
|
ab17bbfee2
|
Bumping versions to 2.2.7.BUILD-SNAPSHOT after release
|
2020-11-09 10:28:44 +00:00 |
|
|
buildmaster
|
7240308834
|
Going back to snapshots
|
2020-11-09 10:28:44 +00:00 |
|
|
buildmaster
|
53c5b4ba86
|
Update SNAPSHOT to 2.2.6.RELEASE
v2.2.6.RELEASE
|
2020-11-09 10:24:42 +00:00 |
|
 larosek
|
da54b740f3
|
Allow eurekaServerBootstrap.contextDestroyed to run when stopping Eureka (#3907)
* Allow eurekaServerBootstrap.contextDestroyed to run when stopping Eureka 658599
* Fix formatting and add header in test file
|
2020-11-03 13:33:48 -05:00 |
|
 spencergibb
|
48a044cc71
|
formatting
|
2020-11-02 13:00:43 -05:00 |
|
|
spencergibb
|
839a780e54
|
Merge branch '2.2.x'
|
2020-11-02 12:59:11 -05:00 |
|
|
spencergibb
|
ce82ea3b71
|
Updates equals() for events.
Fixes gh-3918
|
2020-11-02 12:57:46 -05: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 |
|
 joyita07
|
78ca251e96
|
Added support for ReactiveHealthIndicator. (#3903)
|
2020-10-30 14:36:13 +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 |
|
 dependabot-preview[bot]
|
281f68c4e4
|
Bump wiremock-jre8-standalone from 2.26.0 to 2.27.2 (#3890)
Bumps [wiremock-jre8-standalone](https://github.com/tomakehurst/wiremock) from 2.26.0 to 2.27.2.
- [Release notes](https://github.com/tomakehurst/wiremock/releases)
- [Commits](https://github.com/tomakehurst/wiremock/compare/2.26.0...2.27.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
|
2020-10-06 21:19:52 +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 |
|
|
buildmaster
|
036685e153
|
Going back to snapshots
|
2020-10-03 13:53:17 +00:00 |
|
|
buildmaster
|
06d6daad88
|
Update SNAPSHOT to 3.0.0-M4
v3.0.0-M4
|
2020-10-03 13:52:15 +00:00 |
|
 Ryan Baxter
|
27248f12d0
|
We no longer need a special config for releaser
|
2020-10-02 13:52:24 -04:00 |
|
|
Ryan Baxter
|
8eb11b5730
|
Remove build.sh, we no longer need it
|
2020-10-02 13:47:31 -04:00 |
|
 Jay Bryant
|
6640f3b577
|
Wording changes (#3834)
Replacing some terms
|
2020-09-28 16:49:47 +02:00 |
|
|
spencergibb
|
0665640c97
|
Moves class check to beginning of method
|
2020-09-22 09:26:57 -04:00 |
|
|
spencergibb
|
8125e3261a
|
Only run config server bits if class exists.
|
2020-09-22 09:24:18 -04: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 |
|
|
spencergibb
|
965d1cb168
|
Adds ConfigData support for s.c.config.discovery.enabled=true
|
2020-09-21 16:55:55 -04:00 |
|
|
buildmaster
|
ba53b6a551
|
Bumping versions
|
2020-09-17 17:44:37 +00:00 |
|
|
spencergibb
|
d498a6e091
|
Updates spring-cloud-contract to 2.2.4.RELEASE
|
2020-09-01 19:15:25 -04:00 |
|
|
buildmaster
|
34ede67962
|
Bumping versions to 2.2.6.BUILD-SNAPSHOT after release
|
2020-08-28 19:53:11 +00:00 |
|
|
buildmaster
|
24e842cfdd
|
Going back to snapshots
|
2020-08-28 19:53:10 +00:00 |
|
|
buildmaster
|
a1a9d8c599
|
Update SNAPSHOT to 2.2.5.RELEASE
v2.2.5.RELEASE
|
2020-08-28 19:46:50 +00:00 |
|
|
spencergibb
|
a25d364062
|
Merge branch '2.2.x'
|
2020-08-28 12:38:55 -04:00 |
|