Stephane Nicoll
7aa84cf395
Fix checkstyle violation
2017-05-29 17:09:13 +02:00
Stephane Nicoll
a05dd4a1b3
Polish
2017-05-29 16:23:36 +02:00
Stephane Nicoll
e8aa3a3a8e
Upgrade to Maven War Plugin 3.1.0
...
Closes gh-9344
2017-05-29 16:16:43 +02:00
Stephane Nicoll
0c8893f4e9
Upgrade to Maven Invoker Plugin 3.0.0
...
Closes gh-9298
2017-05-29 15:06:59 +02:00
Stephane Nicoll
294bcbe962
Merge branch '1.5.x'
2017-05-29 14:56:34 +02:00
Stephane Nicoll
9b2ad6100e
Fix reference of custom layout example
...
Closes gh-9342
2017-05-29 14:56:14 +02:00
Stephane Nicoll
a125d604df
Merge branch '1.5.x'
2017-05-29 11:50:20 +02:00
Stephane Nicoll
b8591206d5
Polish
2017-05-29 11:49:46 +02:00
Stephane Nicoll
062dc3cb9a
Upgrade to Neo4J OGM 2.1.3
...
Closes gh-9335
2017-05-29 11:48:55 +02:00
Stephane Nicoll
6664ce19d6
Merge branch '1.5.x'
2017-05-29 10:40:14 +02:00
Stephane Nicoll
544d516563
Merge branch '1.4.x' into 1.5.x
2017-05-29 10:26:52 +02:00
Stephane Nicoll
250d5f9a52
Deprecate Atomikos console logs properties
...
Those properties are no longer honoured with Atomikos 3.8 and we're
using 3.9 by default.
Closes gh-9292
2017-05-29 10:18:35 +02:00
Stephane Nicoll
337e645263
Upgrade to Atomikos 4.0.4
...
Closes gh-5591
2017-05-29 09:44:10 +02:00
Stephane Nicoll
270317728f
Merge pull request #9330 from izeye:polish-20170626
...
* pr/9330:
Polish
2017-05-28 17:47:02 +02:00
Johnny Lim
6939ff1e65
Polish
...
Closes gh-9330
2017-05-28 17:46:43 +02:00
Stephane Nicoll
9332a3a4ae
Merge branch '1.5.x'
2017-05-28 17:46:00 +02:00
Stephane Nicoll
b5709fd618
Polish
...
See gh-9330
2017-05-28 17:44:58 +02:00
Madhura Bhave
6f022565a5
Make SystemEnvironmentPropertySource origin aware
...
Closes gh-9252
2017-05-26 11:25:49 -07:00
Madhura Bhave
d745b69630
Replace usages of EnvironmentTestUtils
2017-05-24 14:59:04 -07:00
Madhura Bhave
05254fe322
Deprecate EnvironmentTestUtils in favor of TestPropertyValues
...
Fixes gh-9253
2017-05-24 14:58:40 -07:00
Madhura Bhave
2009da6169
Clear configurationProperty from context before bind
...
Fixes gh-9295
2017-05-24 11:01:21 -07:00
Brian Clozel
fed8c8a681
Adapt WebFlux.fn auto-config to SPR-15536
...
Since SPR-15536, WebFlux.fn is now configured with `@EnableWebFlux`,
along the annotated controllers. Both `RouterFunction` and Controller
instances can now live within the same application and they share
the same web infrastructure.
This commit removes the custom auto-configuration for `RouterFunction`
and relies on `@EnableWebFlux` for that.
Closes gh-9165
2017-05-24 14:54:05 +02:00
Andy Wilkinson
0bce35fef9
Upgrade to Sqlite Jdbc 3.18.0
...
Closes gh-9311
2017-05-24 12:51:43 +01:00
Andy Wilkinson
9c6aa3eaf0
Upgrade to Mongo Driver Reactivestreams 1.4.0
...
Closes gh-9310
2017-05-24 12:51:43 +01:00
Andy Wilkinson
9ca2694c86
Upgrade to Mockito 2.8.9
...
Closes gh-9309
2017-05-24 12:51:43 +01:00
Andy Wilkinson
23eedce868
Upgrade to Assertj 3.8.0
...
Closes gh-9308
2017-05-24 12:51:42 +01:00
Andy Wilkinson
6c907764bb
Upgrade to Thymeleaf Layout Dialect 2.2.2
...
Closes gh-9307
2017-05-24 12:51:42 +01:00
Andy Wilkinson
6febc188b9
Upgrade to Hikaricp 2.6.2
...
Closes gh-9306
2017-05-24 12:51:41 +01:00
Andy Wilkinson
f494a3bb62
Upgrade to Hazelcast 3.8.2
...
Closes gh-9305
2017-05-24 12:51:41 +01:00
Andy Wilkinson
37ba0f4eff
Upgrade to Caffeine 2.5.1
...
Closes gh-9304
2017-05-24 12:51:41 +01:00
Andy Wilkinson
63b80d0d5f
Merge branch '1.5.x'
2017-05-24 12:48:41 +01:00
Andy Wilkinson
7254ae84ab
Upgrade to Artemis 1.5.5
...
Closes gh-9303
2017-05-24 12:48:28 +01:00
Andy Wilkinson
d8bc4751c8
Upgrade to Undertow 1.4.15.Final
...
Closes gh-9302
2017-05-24 12:48:28 +01:00
Andy Wilkinson
b5174bed5d
Merge pull request #9291 from Mark Paluch
...
* gh-9291:
Polish "Adapt to relocated packages in Spring Data Cassandra"
Adapt to relocated packages in Spring Data Cassandra
2017-05-24 11:12:29 +01:00
Andy Wilkinson
48fb0f4ad5
Polish "Adapt to relocated packages in Spring Data Cassandra"
...
Closes gh-9291
2017-05-24 11:11:53 +01:00
Mark Paluch
7e8e2c486e
Adapt to relocated packages in Spring Data Cassandra
...
See gh-9291
2017-05-24 11:11:36 +01:00
Phillip Webb
6531423519
Fix following upstream API change
...
Update implementations of `WebFluxConfigurer` to no longer return an
`Optional` validator.
2017-05-23 17:04:44 -07:00
Phillip Webb
05111a17b8
Polish
2017-05-23 17:04:44 -07:00
Madhura Bhave
6c629369d3
Add support for binding to immutable collection
...
Fixes gh-9290
2017-05-23 15:40:36 -07:00
Andy Wilkinson
db9ec87b14
Merge branch '1.5.x'
2017-05-23 22:18:35 +01:00
Andy Wilkinson
7f6081318f
Avoid limitation of javac's type inferencing
2017-05-23 22:10:57 +01:00
Madhura Bhave
233ef67a04
Allow nested square brackets in map key when binding
...
Fixes gh-3202
2017-05-23 14:06:06 -07:00
Andy Wilkinson
e8170cf00d
Merge branch '1.5.x'
2017-05-23 22:03:17 +01:00
Andy Wilkinson
19a61c6591
Polish
2017-05-23 22:03:09 +01:00
Andy Wilkinson
bbc82cb621
Merge branch '1.5.x'
2017-05-23 21:58:00 +01:00
Andy Wilkinson
5f3088ed31
Ensure that Jetty fails to start when its thread pool is misconfigured
...
Previously, if Jetty's thread pool was misconfigured, the Server would
still start successfully.
When it is started, the Server examines its Connectors to determine
how many threads are required. If its thread pool does not meet the
Connectors' requirements, an IllegalStateException is thrown and the
Server fails to start. However, JettyEmbeddedServletContainer
temporarily removes the Server's Connectors while it is being started
so that requests will not be accepted until the application is ready.
This has the unwanted side-effect of causing a misconfigured thread
pool to go undetected as the Connectors' thread requirements are not
taken into consideration.
The verification of the thread pool configuration and the starting of
the Connectors is done in the Server's doStart() method which has
three steps that are of interest:
1. Verify the Server's thread pool configuration
2. Start any managed beans that have been added to the Server
3. Start the Server's Connectors.
To allow the thread pool configuration to be verified while still
preventing the Connectors from being started, the Connectors need to
be removed in step 2. This is achieved by registering a managed bean
with the Server that nulls out the Server's Connectors as part of its
doStart() method.
Closes gh-8917
2017-05-23 21:52:14 +01:00
Andy Wilkinson
6c3a27dadf
Merge branch '1.5.x'
2017-05-23 20:44:46 +01:00
Andy Wilkinson
f7127e5522
Ensure that closing a JarFile closes all underlying resources
...
Closes gh-8871
2017-05-23 20:42:59 +01:00
Andy Wilkinson
68b79da71b
Merge pull request #8045 from Raja Kolli
...
* gh-8045:
Polish "Use try-with-resources to close resources automatically"
Use try-with-resources to close resources automatically
2017-05-23 19:39:44 +01:00
Andy Wilkinson
d5438c299c
Polish "Use try-with-resources to close resources automatically"
...
- Apply code formatting
- Use try-with-resources in many other places that were missed in the
pull request
Closes gh-8045
2017-05-23 19:38:48 +01:00