Commit Graph

280 Commits

Author SHA1 Message Date
Phillip Webb
8edf88a08b Polish M2Eclipse ignore configuration
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
2019-06-27 09:42:14 -07:00
Andy Wilkinson
66f1344f7c Merge branch '2.1.x'
Closes gh-17335
Closes gh-17292
2019-06-27 12:00:34 +01:00
Andy Wilkinson
91786bc712 Merge branch '2.0.x' into 2.1.x
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson
256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
Madhura Bhave
d5c0009c6e Rename samples to smoke tests
Closes gh-17197
2019-06-25 11:32:56 -07:00
Spring Buildmaster
fb90803dbf Next development version (v2.1.7.BUILD-SNAPSHOT) 2019-06-19 00:55:05 +00:00
Phillip Webb
e65d1c777e Exclude Gradle bin folder 2019-06-17 19:47:29 -07:00
Phillip Webb
b3d5cd538d Add JUnit 5 checkstyle rules
Add a rule to enforce JUnit 5 usage and conventions.

Closes gh-17093
2019-06-10 16:16:45 -07:00
Phillip Webb
7ed0faa574 Merge branch '2.1.x'
Closes gh-17088
2019-06-07 21:03:13 -07:00
Phillip Webb
80e5762457 Merge branch '2.0.x' into 2.1.x
Closes gh-17087
2019-06-07 20:59:29 -07:00
Phillip Webb
dd3d8b43cd Polish checkstyle settings 2019-06-07 20:55:55 -07:00
Phillip Webb
266d6334b2 Fix checkstyle RedundantModifier test violations 2019-06-07 20:46:33 -07:00
Phillip Webb
4c21dc1c31 Merge branch '2.1.x' 2019-06-07 12:51:32 -07:00
Phillip Webb
866e2b712e Merge branch '2.0.x' into 2.1.x 2019-06-07 12:35:28 -07:00
Phillip Webb
2c8881a908 Merge branch '1.5.x' into 2.0.x 2019-06-07 12:34:13 -07:00
Andy Wilkinson
fb24b5a684 Separate nottp checkstyle configuration
See gh-16682
2019-06-07 11:39:32 -07:00
Andy Wilkinson
aef92b9295 Merge branch '2.1.x'
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae Merge branch '2.0.x' into 2.1.x
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Phillip Webb
db75347eb6 Merge branch '2.1.x' 2019-06-04 14:41:20 -07:00
Phillip Webb
0ef331018e Merge branch '2.0.x' into 2.1.x 2019-06-04 14:30:52 -07:00
Phillip Webb
7fc01971ed Merge branch '1.5.x' into 2.0.x 2019-06-04 14:20:25 -07:00
Phillip Webb
d306b31ce9 Merge branch '2.1.x' 2019-06-04 02:08:00 -07:00
Phillip Webb
ccfbd03482 Merge branch '2.0.x' into 2.1.x 2019-06-04 02:07:14 -07:00
Phillip Webb
5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
Spring Buildmaster
8e84d29e51 Next development version (v2.1.6.BUILD-SNAPSHOT) 2019-05-15 08:12:03 +00:00
Spring Buildmaster
67fa63d0e3 Next Development Version 2019-05-14 08:21:02 +00:00
Spring Buildmaster
15c9ca7455 Next development version (v2.1.5.BUILD-SNAPSHOT) 2019-04-04 03:16:47 +00:00
Spring Buildmaster
8e3cbd9a2f Next development version (v2.0.10.BUILD-SNAPSHOT) 2019-04-03 15:04:03 +00:00
Spring Buildmaster
ca3a864565 Next Development Version 2019-04-03 10:34:44 +00:00
Phillip Webb
52e635b823 Merge branch '2.1.x' 2019-04-02 20:50:22 -07:00
Phillip Webb
912e0a87a8 Merge branch '2.0.x' into 2.1.x 2019-04-02 20:49:44 -07:00
Phillip Webb
8c2e0a61ae Merge branch '1.5.x' into 2.0.x 2019-04-02 20:48:00 -07:00
Phillip Webb
2376f973f4 Merge branch '2.1.x' 2019-04-02 13:46:36 -07:00
Phillip Webb
47c6bf741d Merge branch '2.0.x' into 2.1.x 2019-04-02 13:40:21 -07:00
Phillip Webb
07c000c5b7 Merge branch '1.5.x' into 2.0.x 2019-04-02 13:34:28 -07:00
Andy Wilkinson
36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson
b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Andy Wilkinson
a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Spring Operator
991ba550d3 Update build and setup configuration to use HTTPS
See gh-16245
2019-03-19 16:48:30 +00:00
Spring Buildmaster
3370d65ced Next development version (v2.1.4.BUILD-SNAPSHOT) 2019-02-15 11:19:26 +00:00
Spring Buildmaster
3d02b0296c Next development version (v2.1.3.BUILD-SNAPSHOT) 2019-01-12 03:22:50 +00:00
Spring Buildmaster
9316ebcffc Next development version (v2.0.9.BUILD-SNAPSHOT) 2019-01-11 19:33:46 +00:00
Spring Buildmaster
b04710d744 Next development version 2019-01-11 15:59:00 +00:00
Andy Wilkinson
064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Madhura Bhave
59d2b0a3fb Upgrade tests to Junit5
See gh-14737
2018-12-05 17:49:09 -08:00
Stephane Nicoll
0d4fe4417d Switch master to 2.2.0.BUILD-SNAPSHOT 2018-11-30 12:52:56 +01:00