Johnny Lim
bcec2bbb58
Add more indentation settings to .editorconfig
...
Closes gh-16203
2019-03-12 09:16:04 +01:00
Phillip Webb
fc3aa43cc2
Update copyright year for changed files
2019-03-11 22:14:53 -07:00
Phillip Webb
f02887b6c6
Merge branch '2.0.x' into 2.1.x
2019-03-11 22:14:21 -07:00
Phillip Webb
9c3af103e0
Fix ScheduledTasksEndpointAutoConfigurationTests
...
Update the `CustomEndpointConfiguration` class in
`ScheduledTasksEndpointAutoConfigurationTests` to be package private
so that it can be enhanced by cglib.
Prior to merge commit 361437f4
the class was a lite configuration so
it didn't matter that it was a private class.
2019-03-11 22:12:36 -07:00
Phillip Webb
45ae97a4e9
Merge branch '2.0.x' into 2.1.x
2019-03-11 21:09:35 -07:00
Phillip Webb
03beed603c
Fix ScheduledTasksEndpointTests BaseConfiguration
...
Update the `BaseConfiguration` class in `ScheduledTasksEndpointTests`
to be package private so that it can be enhanced by cglib.
Prior to merge commit 361437f4
the class was a lite configuration so
it didn't matter that it was a private class.
2019-03-11 21:07:20 -07:00
Andy Wilkinson
f0ef693376
Merge branch '2.0.x' into 2.1.x
2019-03-11 16:28:29 +00:00
Andy Wilkinson
c2eeeb032c
Work around javac bug
2019-03-11 16:27:56 +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
f574213cc8
Mark log file endpoint as producing text/plain
...
Closes gh-16188
2019-03-11 08:30:31 +00:00
Andy Wilkinson
7153525ee2
Annotation @JsonTest with @ExtendWith(SpringExtension.class)
...
Closes gh-16183
2019-03-09 20:00:06 +00:00
Andy Wilkinson
eeaf057f47
Merge branch '2.0.x' into 2.1.x
2019-03-08 08:20:24 +00:00
Andy Wilkinson
fd8a2691a5
Upgrade Maven Wrapper and drop back to Maven 3.5.4
...
See gh-16167
2019-03-08 08:19:42 +00:00
Andy Wilkinson
9d06d22b99
Merge branch '2.0.x' into 2.1.x
2019-03-07 10:17:01 +00:00
Andy Wilkinson
affdbeef41
Polish
2019-03-07 10:08:39 +00:00
Andy Wilkinson
f46894dfd3
Merge branch '2.0.x' into 2.1.x
2019-03-07 09:43:02 +00:00
Andy Wilkinson
17a1b2822c
Isolate LoggerContext state to each test
...
Closes gh-16162
2019-03-07 09:37:41 +00:00
Andy Wilkinson
9963ed1249
Merge branch '2.0.x' into 2.1.x
2019-03-07 09:25:31 +00:00
Andy Wilkinson
83216c34e5
Merge branch '1.5.x' into 2.0.x
2019-03-07 09:25:17 +00:00
Andy Wilkinson
3fdf2818b3
Remove reliance on side-effects in LogbackLoggingSystemTests
...
Closes gh-16160
2019-03-07 09:22:42 +00:00
Andy Wilkinson
80f2e2260e
Merge branch '2.0.x' into 2.1.x
2019-03-06 15:11:09 +00:00
Andy Wilkinson
e56580ddc6
Merge branch '1.5.x' into 2.0.x
2019-03-06 15:10:25 +00:00
Andy Wilkinson
2916421188
Revert "Upgrade to Jetty 9.4.15.v20190215"
...
This reverts commit 53e7c5cde1
.
See gh-16118
2019-03-06 15:09:21 +00:00
Andy Wilkinson
a09713ee30
Upgrade to Infinispan 9.4.8.Final
...
Closes gh-16134
2019-03-06 13:34:02 +00:00
Andy Wilkinson
de042114af
Upgrade to Jetty Reactive Httpclient 1.0.3
...
Closes gh-16133
2019-03-06 13:34:00 +00:00
Andy Wilkinson
c54ac68afa
Upgrade to Undertow 2.0.19.Final
...
Closes gh-16132
2019-03-06 13:33:59 +00:00
Andy Wilkinson
33fdc5b471
Upgrade to Rxjava2 2.2.7
...
Closes gh-16131
2019-03-06 13:33:58 +00:00
Andy Wilkinson
2568bd6a83
Upgrade to Netty Tcnative 2.0.22.Final
...
Closes gh-16130
2019-03-06 13:33:57 +00:00
Andy Wilkinson
4f5eff6fa4
Upgrade to Lettuce 5.1.5.RELEASE
...
Closes gh-16129
2019-03-06 13:33:56 +00:00
Andy Wilkinson
e01b76aa45
Upgrade to Hazelcast 3.11.2
...
Closes gh-16128
2019-03-06 13:33:56 +00:00
Andy Wilkinson
ff64e112c9
Merge branch '2.0.x' into 2.1.x
2019-03-06 13:33:00 +00:00
Andy Wilkinson
4cfc532890
Upgrade to Spring Ws 3.0.7.RELEASE
...
Closes gh-16127
2019-03-06 13:30:51 +00:00
Andy Wilkinson
51657e1ad0
Upgrade to Spring Integration 5.0.12.RELEASE
...
Closes gh-16126
2019-03-06 13:30:49 +00:00
Andy Wilkinson
ab05a07807
Upgrade to Neo4j Ogm 3.1.8
...
Closes gh-16125
2019-03-06 13:30:48 +00:00
Andy Wilkinson
7a26a092aa
Upgrade to Hibernate Validator 6.0.15.Final
...
Closes gh-16124
2019-03-06 13:30:46 +00:00
Andy Wilkinson
31892a3488
Upgrade to Elasticsearch 5.6.15
...
Closes gh-16123
2019-03-06 13:30:45 +00:00
Andy Wilkinson
5f35a1d089
Merge branch '1.5.x' into 2.0.x
2019-03-06 13:30:09 +00:00
Andy Wilkinson
3bf7eb4a5b
Upgrade to Jedis 2.9.3
...
Closes gh-16122
2019-03-06 13:27:48 +00:00
Andy Wilkinson
3bf4ee562b
Upgrade to Spring Ws 2.4.5.RELEASE
...
Closes gh-16121
2019-03-06 13:27:48 +00:00
Andy Wilkinson
ac84f76e08
Upgrade to Spring Security Oauth 2.0.17.RELEASE
...
Closes gh-16120
2019-03-06 13:27:48 +00:00
Andy Wilkinson
0fa34d7997
Upgrade to Slf4j 1.7.26
...
Closes gh-16119
2019-03-06 13:27:48 +00:00
Andy Wilkinson
53e7c5cde1
Upgrade to Jetty 9.4.15.v20190215
...
Closes gh-16118
2019-03-06 13:27:48 +00:00
Andy Wilkinson
6459ec9fc1
Upgrade to H2 1.4.198
...
Closes gh-16117
2019-03-06 13:27:48 +00:00
Andy Wilkinson
31ed042190
Return 503 when component or instance is down with WebFlux
...
Closes gh-16109
2019-03-06 13:24:23 +00:00
Stephane Nicoll
8d033e73d1
Polish
...
See gh-16094
2019-03-05 08:18:14 +01:00
Andy Wilkinson
bdab9c4e31
Upgrade to Couchbase Client 2.7.4
...
Closes gh-15914
2019-03-04 15:21:09 +00:00
Stephane Nicoll
4eb73e0050
Recommend that DevTools is excluded with custom packaging arrangement
...
Closes gh-15382
2019-03-04 15:57:47 +01:00
Stephane Nicoll
4f2e788835
Fix import in docs
...
Closes gh-16017
2019-03-04 15:45:59 +01:00