Commit Graph

1568 Commits

Author SHA1 Message Date
Stephane Nicoll
197e1669e2 Polish 2019-03-25 09:01:13 +01:00
Madhura Bhave
35d7fccb33 Update samples to use configuration properties scanning
Closes gh-12602
2019-03-21 13:30:45 -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
4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Andy Wilkinson
6920c39349 Merge branch '1.3.x' into 1.4.x 2019-03-20 15:06:50 +00:00
Andy Wilkinson
0e009ef047 Use HTTPS to link to the Apache license 2019-03-20 15:00:10 +00:00
Spring Operator
00ab30362c Use HTTPS for external links in XML files
See gh-16270
2019-03-20 14:33:25 +00:00
Andy Wilkinson
b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Spring Operator
b32c0080c3 Update build and setup configuration to use HTTPS
See gh-16247
2019-03-19 17:06: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 Operator
e2837843e1 Update build and setup configuration to use HTTPS
See gh-16244
2019-03-19 16:44:10 +00:00
Spring Operator
7c314122f7 Update build and setup configuration to use HTTPS
See gh-16243
2019-03-19 16:01:05 +00:00
Madhura Bhave
da03d53ac0 Merge branch '2.1.x' 2019-03-18 14:10:58 -07:00
Madhura Bhave
988ba3ff78 Fix author tag 2019-03-18 14:10:28 -07:00
Madhura Bhave
3d0219c315 Merge branch '2.1.x' 2019-03-15 18:09:47 -07:00
Johnny Lim
c5b5f752ed Polish
Closes gh-16219
2019-03-15 17:54:48 -07:00
Andy Wilkinson
68bfb020aa Reduce need for bean method proxying and disable where not needed
Closes gh-9068
2019-03-12 13:18:42 +00:00
Phillip Webb
dd3e8154d9 Merge branch '2.1.x' 2019-03-11 22:15:19 -07:00
Phillip Webb
fc3aa43cc2 Update copyright year for changed files 2019-03-11 22:14:53 -07:00
Andy Wilkinson
aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Andy Wilkinson
8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson
361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Andy Wilkinson
821ee0cf83 Ensure that @Bean methods are only declared on @Configuration classes
Closes gh-16190
2019-03-11 15:01:59 +00: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
cd13a1685c Align HATEAOS sample with latest breaking API changes
See gh-15939
2019-02-28 19:37:00 +00:00
Madhura Bhave
3d03c01bfc Merge branch '2.1.x' 2019-02-20 18:41:58 -08:00
Madhura Bhave
f8e5b9ba47 Fix formatting 2019-02-20 18:41:26 -08:00
Madhura Bhave
6f045d8891 Merge branch '2.1.x' 2019-02-20 16:13:20 -08:00
Madhura Bhave
c3e47541ad EndpointRequest should check that the request is to the mgmt context
Fixes gh-15702
2019-02-20 16:08:26 -08:00
Andy Wilkinson
3a4a431eaa Provide a configuration option to enable lazy initialization
Closes gh-15870
2019-02-14 12:41:49 +00:00
Madhura Bhave
a838aac17d Merge branch '2.1.x' 2019-02-13 18:50:04 -08:00
Madhura Bhave
a34e71c2c8 Fix formatting violations in sample 2019-02-13 18:49:09 -08:00
Madhura Bhave
862ffcbbf4 Merge branch '2.1.x' 2019-02-13 13:33:14 -08:00
Madhura Bhave
bbe555a4f5 Split Jersey management context configuration
This commit splits the management context configuration for jersey
into two separate configurations depending on if the type is SAME or
CHILD. The configuration for the SAME context should only kick in if
there is no existing ResourceConfig bean.

Fixes gh-15891
2019-02-13 13:27:54 -08:00
Andy Wilkinson
2ed7cf84e1 Fix up version numbers following release 2019-01-11 16:20:19 +00:00
Spring Buildmaster
b04710d744 Next development version 2019-01-11 15:59:00 +00:00
Andy Wilkinson
3a7406fe3a Merge branch '2.0.x' into 2.1.x 2018-12-20 15:58:03 +00:00
Andy Wilkinson
0741c90489 Avoid blocking on a Mono indefinitely
Closes gh-15535
2018-12-20 15:31:39 +00:00
Andy Wilkinson
9d2d6d5812 Merge branch '2.1.x' 2018-12-20 15:30:51 +00:00
Andy Wilkinson
9a33d1a2f9 Merge branch '2.0.x' into 2.1.x 2018-12-20 15:30:42 +00:00
Andy Wilkinson
8c68da0882 Avoid blocking on a Mono indefinitely
Closes gh-15535
2018-12-20 15:24:53 +00:00
Andy Wilkinson
61d04db0d7 Minimize and centralize assumptions about build output
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson
7d0a7a65c8 Merge branch '2.1.x' 2018-12-14 14:58:52 +00:00
Andy Wilkinson
b264b4417d Reinstate parent-context sample in list of modules
Closes gh-15469
2018-12-14 14:56:26 +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
f863ce32ee Merge branch '2.1.x' 2018-12-10 16:44:42 -08:00