Commit Graph

292 Commits

Author SHA1 Message Date
buildmaster
c9c737c11c Update SNAPSHOT to 3.1.0-M3 2021-10-20 02:11:30 +00:00
buildmaster
1d9e0d5499 Going back to snapshots 2021-10-01 17:02:51 +00:00
buildmaster
8419b9b876 Update SNAPSHOT to 3.1.0-M2 2021-10-01 17:01:37 +00:00
buildmaster
bf7699f4e6 Going back to snapshots 2021-07-30 18:06:04 +00:00
buildmaster
3c8e8feeea Update SNAPSHOT to 3.1.0-M1 2021-07-30 18:04:51 +00:00
Olga MaciaszekSharma
aeeee56edc Merge remote-tracking branch 'origin/3.0.x' 2021-07-19 10:25:47 +02:00
maniotie
cf9c645f4a switched junit4 tests to junit jupiter - issue 4011 (#4016) 2021-07-19 10:21:09 +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
spencergibb
ac2d4888b5 Updates version to 3.1.0-SNAPSHOT 2021-07-09 14:10:02 -04:00
buildmaster
cac519d89c Going back to snapshots 2021-05-27 21:14:36 +00:00
buildmaster
04937f0113 Update SNAPSHOT to 3.0.3 2021-05-27 21:12:44 +00:00
buildmaster
e723f67f5a Bumping versions to 3.0.4-SNAPSHOT after release 2021-05-27 08:02:56 +00:00
buildmaster
2176987868 Going back to snapshots 2021-05-27 08:02:56 +00:00
buildmaster
1d46777c20 Update SNAPSHOT to 3.0.3 2021-05-27 08:01:20 +00:00
spencergibb
43fe8c1e62 Removes orphaned contract stubs/restdocs integration 2021-03-18 18:19:54 -04:00
buildmaster
a1e166a814 Bumping versions to 3.0.3-SNAPSHOT after release 2021-03-17 21:41:09 +00:00
buildmaster
a562fd0815 Going back to snapshots 2021-03-17 21:41:08 +00:00
buildmaster
d9bc811fac Update SNAPSHOT to 3.0.2 2021-03-17 21:39:42 +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
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
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
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
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
d11f91cdb1 Upgrade mockito-core to 3.5.13. 2020-10-06 20:06:08 +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
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
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
spencergibb
a25d364062 Merge branch '2.2.x' 2020-08-28 12:38:55 -04:00