Phillip Webb
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
Phillip Webb
a66c4d3096
Unify method visibility of private classes
...
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.
Closes gh-7316
2019-07-03 11:39:47 -07:00
Andy Wilkinson
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01: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
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
b442d3b906
Merge branch '1.5.x' into 2.0.x
2019-06-04 01:49:03 -07:00
Phillip Webb
5fba43aa31
Merge branch '1.5.x' into 2.0.x
2019-06-04 00:05:57 -07:00
Andy Wilkinson
d182ee2246
Merge branch '2.1.x'
...
Closes gh-16637
2019-04-24 10:19:31 +01:00
Andy Wilkinson
ed85735822
Merge branch '2.0.x' into 2.1.x
...
Closes gh-16636
2019-04-24 10:10:01 +01:00
Andy Wilkinson
3e3d7545cc
Merge branch '1.5.x' into 2.0.x
2019-04-24 10:01:50 +01:00
Andy Wilkinson
27990180ab
Merge branch '2.1.x'
...
Closes gh-16626
2019-04-23 14:30:21 +01:00
Andy Wilkinson
73704c84e1
Use latest Docker Java and a compatible version of Jersey
...
Closes gh-16625
2019-04-23 14:29:32 +01: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
Andy Wilkinson
28cf63354a
Merge pull request #16106 from Spring Operator
...
* gh-16106:
Drop AnyEdit from Eclipse setup as it is not available over HTTPS
Update build and setup configuration to use HTTPS
Closes gh-16106
2019-03-12 10:05:06 +00:00
Spring Operator
c9c554b834
Update build and setup configuration to use HTTPS
...
See gh-16106
2019-03-12 10:02:44 +00:00
Stephane Nicoll
8ff0a9c5a9
Merge branch '2.1.x'
2019-03-12 10:51:08 +01:00
Johnny Lim
bcfbabe6cd
Polish
...
Closes gh-16193
2019-03-12 10:50:32 +01:00
Andy Wilkinson
d6a869fa98
Switch to Jakarta EE API dependencies where possible
...
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Andy Wilkinson
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
Andy Wilkinson
4a222cb4e5
Polish "Log a warning when using fallback for pid and log locations"
...
Closes gh-14519
2018-10-04 15:21:05 +01:00
Stephane Nicoll
306c79f0de
Merge branch '1.5.x'
2018-02-26 18:03:32 +01:00
Andy Wilkinson
e1ab62668f
Merge branch '1.5.x'
2018-02-13 15:05:28 +00:00
Andy Wilkinson
9542f5182c
Move scripts for new launch script tests to correct location
...
See gh-11397
2018-02-01 09:26:16 +00:00
Phillip Webb
886b39293c
Merge branch '1.5.x'
2018-01-30 12:51:45 -08:00
Phillip Webb
49c685b7c0
Merge branch '1.5.x'
2018-01-10 12:01:29 -08:00
Johnny Lim
483d123d9b
Fix imports order for Checkstyle
...
Closes gh-11587
2018-01-10 09:46:06 +01:00
Madhura Bhave
32557e4987
Fix imports
2018-01-09 15:47:09 -08:00
Phillip Webb
b3ec2c9d1d
Polish
2018-01-09 12:12:59 -08:00
Andy Wilkinson
d439b73758
Use docker-java 3.0.x for launch script integration tests
2018-01-09 16:37:07 +00:00
Johnny Lim
0f0c6e0729
Polish
...
Closes gh-11536
2018-01-09 09:28:56 +01:00
Phillip Webb
748e0779b6
Update copyright year for changed files
2017-10-10 11:56:13 -07:00
Phillip Webb
4ff65d58a4
Fix integration test POMs
...
Update integration test POMs to use CI friendly version numbers.
See gh-9316
2017-10-04 16:34:42 -07:00
Phillip Webb
89b0ba2c14
Relocate test projects under spring-boot-tests
...
Move integration and deployment tests under a single `spring-boot-tests`
module.
See gh-9316
2017-10-04 16:34:38 -07:00