Phillip Webb
f12ab1ff90
Update copyright header of changed files
2019-04-03 16:13:00 -07:00
Phillip Webb
eefd10d4d1
Merge branch '2.0.x' into 2.1.x
2019-04-02 19:40:28 -07:00
Phillip Webb
f875b74e67
Reformat samples with spring-javaformat 0.0.8
...
See gh-16418
2019-04-02 19:39:23 -07:00
Madhura Bhave
eff2f92c48
Fix formatting following formatter update
2019-04-02 15:55:34 -07:00
Andy Wilkinson
864942ad4f
Merge branch '2.0.x' into 2.1.x
2019-03-28 09:35:53 +00:00
Spring Operator
1a4c6f2dac
Use HTTPS for external links wherever possible
...
See gh-16319
2019-03-27 20:06:52 +00:00
Andy Wilkinson
e2de2c8238
Merge branch '1.5.x' into 2.0.x
2019-03-27 20:06:35 +00:00
Andy Wilkinson
1a674ab702
Merge branch '1.4.x' into 1.5.x
2019-03-27 20:06:24 +00:00
Andy Wilkinson
3a5a087b1f
Merge branch '1.3.x' into 1.4.x
2019-03-27 20:06:16 +00:00
Andy Wilkinson
c4d44574b2
Correct link to Groovy MarkupTemplateEngine documentation
...
See gh-16316
2019-03-27 20:05:29 +00:00
Andy Wilkinson
ba4671f0ab
Merge branch '1.5.x' into 2.0.x
2019-03-27 19:59:36 +00:00
Spring Operator
bbbfee6480
Use HTTPS for external links wherever possible
...
See gh-16318
2019-03-27 15:01:19 +00:00
Andy Wilkinson
94633cfd89
Merge branch '1.4.x' into 1.5.x
2019-03-27 14:04:32 +00:00
Spring Operator
189eeefbb1
Use HTTPS for external links wherever possible
...
See gh-16317
2019-03-27 12:30:55 +00:00
Andy Wilkinson
baec3d6e8e
Merge branch '1.3.x' into 1.4.x
2019-03-27 12:22:40 +00:00
Andy Wilkinson
9be96c49e2
Polish "Use HTTPS for external links wherever possible"
...
See gh-16316
2019-03-27 11:44:18 +00:00
Spring Operator
e401d02ced
Use HTTPS for external links wherever possible
...
See gh-16316
2019-03-27 11:35:54 +00:00
Andy Wilkinson
4900505425
Merge branch '2.0.x' into 2.1.x
2019-03-26 13:53:57 +00:00
Andy Wilkinson
fedb40a2bf
Merge branch '1.5.x' into 2.0.x
2019-03-26 13:48:32 +00:00
Andy Wilkinson
79c53de30c
Merge branch '1.4.x' into 1.5.x
2019-03-26 13:44:03 +00:00
Spring Operator
4e2739eceb
Use HTTPS for external links from XML files where possible
...
See gh-16312
2019-03-26 13:43:05 +00:00
Andy Wilkinson
46d6fb0e1c
Merge branch '1.3.x' into 1.4.x
2019-03-26 13:40:26 +00:00
Spring Operator
adc2462689
Use HTTPS for external links from XML files where possible
...
See gh-16311
2019-03-26 13:37:30 +00:00
Andy Wilkinson
91726f3162
Update the samples to use Spring Java Format 0.0.7
2019-03-20 17:30:25 +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
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
988ba3ff78
Fix author tag
2019-03-18 14:10:28 -07:00
Johnny Lim
c5b5f752ed
Polish
...
Closes gh-16219
2019-03-15 17:54:48 -07:00
Phillip Webb
fc3aa43cc2
Update copyright year for changed files
2019-03-11 22:14:53 -07: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
Madhura Bhave
f8e5b9ba47
Fix formatting
2019-02-20 18:41:26 -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
Madhura Bhave
a34e71c2c8
Fix formatting violations in sample
2019-02-13 18:49:09 -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
b264b4417d
Reinstate parent-context sample in list of modules
...
Closes gh-15469
2018-12-14 14:56:26 +00:00