Commit Graph

2173 Commits

Author SHA1 Message Date
Benjamin Ihrig 6c270f0e5a Add SAP Hana Cloud Platform to CloudPlatform
Closes gh-9487
2017-06-14 11:30:18 +02:00
Phillip Webb b94bb00fa1 Remove need for attached test-jar artifacts
Remove test-jar artifacts from Maven projects and relocate classes. The
majority of utilities now live in the `spring-boot-testsupport` module.

This update will help us to deploy artifacts using the standard Maven
deploy plugin in the future (which doesn't support the filtering of
individual artifacts).

Fixes gh-9493
2017-06-12 21:11:35 -07:00
Phillip Webb 54efc36dd8 Fix MustacheViewResolver following upstream change
Update MustacheViewResolver following the upstream rename of
`createUrlBasedView` to `createView`.
2017-06-12 11:24:09 -07:00
Andy Wilkinson da211d9751 Upgrade to Narayana 5.6.1.Final
Closes gh-9479
2017-06-12 18:36:39 +01:00
Andy Wilkinson 700af8ed00 Merge branch '1.5.x' 2017-06-12 14:25:26 +01:00
Andy Wilkinson 2e2fde0dcd Stop using URLResource API that was deprecated in Undertow 1.4.16
Closes gh-9464
2017-06-12 14:24:43 +01:00
Andy Wilkinson f7e9ec5f42 Minimise our usage of SocketUtils.findAvailableTcpPort
Closes gh-9382
2017-06-09 14:45:09 +01:00
Johnny Lim bbab520926 Polish
Closes gh-9438
2017-06-09 08:54:55 +03:00
Spring Buildmaster 05d4d0281c Next Development Version 2017-06-08 12:47:16 +00:00
Andy Wilkinson a03ddd331c Polishing 2017-06-07 17:14:26 +01:00
Andy Wilkinson c32fab13fd Upgrade to Reactor Bismuth M2
Closes gh-9427
2017-06-07 16:38:44 +01:00
Andy Wilkinson dc7498244d Merge branch '1.5.x' 2017-06-07 10:41:05 +01:00
Andy Wilkinson 5b30269ac9 Polish "Copy conversion service when performing environment conversion"
Closes gh-9246
2017-06-07 10:24:15 +01:00
Rubinson,Ethan(erubinson) a424081803 Copy conversion service when performing environment conversion
Previously, when a web environment was converted to a
StandardEnvironment, any customizations of the source environment's
ConversionService were lost.

This commit updates the logic that performs the conversion to copy
the source's ConversionService to the converted environment, thereby
ensuring that any customizations are retained.

Closes gh-9259
See gh-9246
2017-06-07 10:21:56 +01:00
Andy Wilkinson d844a0cf66 Merge branch '1.5.x' 2017-06-06 14:57:40 +01:00
Andy Wilkinson aa6dbdbae2 Ensure that listeners are called when application fails to run
Closes gh-9054
2017-06-06 14:53:05 +01:00
Phillip Webb 2c7dd9f519 Polish 2017-06-02 16:00:39 -07:00
Andy Wilkinson 8c1820afe3 Merge branch '1.5.x' 2017-06-02 11:25:32 +01:00
Andy Wilkinson b9a09fcd64 Abandon failure analysis if start of cycle cannot be determined
Previously, BeanCurrentlyInCreationFailureAnalyzer would return
a FailureAnalysis for any BeanCurrentlyInCreationException even if
it could not determine where the cycle begins. This could lead to an
inaccurate diagram of the cycle being output.

This commit updates BeanCurrentlyInCreationFailureAnalyzer so that
it abandons its analysis and returns null if it is unable to determine
where the cycle begins.

Closes gh-8164
2017-06-02 11:08:29 +01:00
Stephane Nicoll 605dee4700 Allow to reset a log level
This commit ensures that `setLogLevel` on the `LoggingSystem` accepts
a `null` level. A `null` level means any customization sets on that
level should be removed and the default configuration should be used
instead.

Effectively, the level of the parent logger is going to be used when
`setLevel` is called with `null` for a given logger.

Most JMX clients do not accept to pass `null` for an argument so an
empty String is translated to null in that specific case.

Closes gh-8776
2017-06-01 14:31:07 +02:00
Andy Wilkinson 5ef29653c7 Polish 2017-05-31 15:05:19 +01:00
Stephane Nicoll 431a12adea Merge branch '1.5.x' 2017-05-30 14:28:14 +02:00
Stephane Nicoll 08a8bb0f8b Revert "Add failure analyzer for BeanCreationException"
Closes gh-9220
2017-05-30 14:23:47 +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
Johnny Lim 6939ff1e65 Polish
Closes gh-9330
2017-05-28 17:46:43 +02:00
Madhura Bhave 6f022565a5 Make SystemEnvironmentPropertySource origin aware
Closes gh-9252
2017-05-26 11:25:49 -07:00
Madhura Bhave 2009da6169 Clear configurationProperty from context before bind
Fixes gh-9295
2017-05-24 11:01:21 -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 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
rajadilipkolli 3e797c326a Use try-with-resources to close resources automatically
See gh-8045
2017-05-23 17:34:35 +01:00
Stephane Nicoll 419f5df9ae Merge branch '1.5.x' 2017-05-23 10:47:55 +02:00
Stephane Nicoll 2ca92e2a45 Add failure analyzer for BeanCreationException
Closes gh-9220
2017-05-23 10:46:34 +02:00
Andy Wilkinson d4140d6a69 Configure Undertow to eagerly initialize Filters by default
Closes gh-9232
2017-05-22 16:58:16 +01:00
Andy Wilkinson 6acf789264 Merge branch '1.5.x' 2017-05-22 16:50:19 +01:00
hengyunabc 8c46644231 Polish "Fail startup when Tomcat's context fails to start"
Closes gh-9095
2017-05-22 16:18:29 +01:00
hengyunabc 217b237b37 Fail startup when Tomcat's context fails to start
See gh-9095
2017-05-22 16:18:29 +01:00
Stephane Nicoll 390be7a59d Merge branch '1.5.x' 2017-05-22 15:44:26 +02:00
Stephane Nicoll b61b1f0e08 Make sure Atomikos default are applied consistently
This commit makes sure to apply Atomikos defaults also adds a test that
validates Atomikos defaults are consistent.

As a side effect of that, `threadedTwoPhaseCommit` is now `false` (which
is effectively what users got with no customization anyway since that
default was changed in Atomikos 3.7

Closes gh-9141
2017-05-22 15:43:12 +02:00
Madhura Bhave 2ccefbc275 Simplify MapBinderTests 2017-05-18 13:14:08 -07:00