Commit Graph

482 Commits

Author SHA1 Message Date
buildmaster
53e3639366 Bumping versions 2021-01-28 17:43:09 +00:00
buildmaster
c145e4610d Bumping versions to 3.0.2-SNAPSHOT after release 2021-01-27 20:49:23 +00:00
buildmaster
659a97ad63 Going back to snapshots 2021-01-27 20:49:22 +00:00
buildmaster
51918d1659 Update SNAPSHOT to 3.0.1 2021-01-27 20:46:52 +00:00
spencergibb
bb72b973bf Merge branch '2.2.x' 2021-01-14 12:24:41 -05:00
spencergibb
4978f8f7de No longer manage xstream dependency version.
xstream is managed as a compile dependency eureka-client now, Spring Cloud Netflix no longer needs to manage it.

See #3955
2021-01-14 12:23:05 -05:00
buildmaster
de5d517bfe Bumping versions 2021-01-09 17:43:17 +00:00
buildmaster
7bf8f60c0e Bumping versions 2020-12-22 17:43:08 +00:00
buildmaster
cdbbb7ad10 Bumping versions to 3.0.1-SNAPSHOT after release 2020-12-21 19:20:50 +00:00
buildmaster
47c678f53b Going back to snapshots 2020-12-21 19:20:49 +00:00
buildmaster
5d19ac3b08 Update SNAPSHOT to 3.0.0 2020-12-21 19:19:21 +00:00
buildmaster
e44e36d31a Going back to snapshots 2020-12-11 22:02:35 +00:00
buildmaster
5d2942158c Update SNAPSHOT to 3.0.0-RC1 2020-12-11 22:01:35 +00:00
buildmaster
c862f34779 Going back to snapshots 2020-12-01 22:43:14 +00:00
buildmaster
5297985e61 Update SNAPSHOT to 3.0.0-M6 2020-12-01 22:42:14 +00: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
buildmaster
191b889994 Going back to snapshots 2020-11-17 20:37:53 +00:00
buildmaster
300fe19ca0 Update SNAPSHOT to 3.0.0-M5 2020-11-17 20:36:52 +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 2020-11-09 10:24:42 +00: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
57053ed7eb Upgrade xstream to 1.4.13. 2020-10-06 19:46:21 +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 2020-10-03 13:52:15 +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 2020-08-28 19:46:50 +00:00
Ryan Baxter
2b0ea67e3d Merge remote-tracking branch 'origin/2.2.x' 2020-08-24 16:48:27 -04:00
Ryan Baxter
eeaeeb3e6f Code review changes 2020-08-24 16:11:59 -04:00
JiaLin
5f3f35fd68 merge changes from upstream 2020-08-19 00:20:44 +08:00
spencergibb
23d15f70bc Updates s-c-build to 2.3.2.BUILD-SNAPSHOT 2020-08-03 13:00:36 -04:00
JiaLin
cbc914259b add client side TLS support 2020-08-01 21:55:32 +08:00
buildmaster
896b33c109 Bumping versions to 2.2.5.BUILD-SNAPSHOT after release 2020-07-31 20:37:36 +00:00
buildmaster
a826a960e6 Going back to snapshots 2020-07-31 20:37:36 +00:00
buildmaster
a579eb4594 Update SNAPSHOT to 2.2.4.RELEASE 2020-07-31 20:33:25 +00:00
buildmaster
f6f2f4726b Going back to snapshots 2020-07-23 18:07:48 +00:00
buildmaster
c56bee9cfd Update SNAPSHOT to 3.0.0-M3 2020-07-23 18:06:49 +00:00
Marcin Grzejszczak
34a07a15e2 Migrated to docs.spring.io & updated sc-build 2020-06-04 15:45:36 +02:00
buildmaster
71781d8468 Going back to snapshots 2020-05-29 18:31:58 +00:00
buildmaster
c9b9040747 Update SNAPSHOT to 3.0.0-M2 2020-05-29 18:31:14 +00:00
buildmaster
21b8599be5 Bumping versions to 2.2.4.BUILD-SNAPSHOT after release 2020-05-28 17:39:17 +00:00
buildmaster
a8539b33db Going back to snapshots 2020-05-28 17:39:17 +00:00
buildmaster
5d983b082e Update SNAPSHOT to 2.2.3.RELEASE 2020-05-28 17:34:08 +00:00
buildmaster
fd702085f5 Bumping versions 2020-04-17 02:26:13 +00:00
buildmaster
2bab1f468b Going back to snapshots 2020-04-09 22:20:03 +00:00
buildmaster
57d4adcb71 Update SNAPSHOT to 3.0.0.M1 2020-04-09 22:19:25 +00:00