Commit Graph

15969 Commits

Author SHA1 Message Date
Andy Wilkinson 626e488da5 Merge pull request #12527 from Igor Suhorukov
* gh-12527:
  Polish "Follow project convention for lambda expression"
  Follow project convention for lambda expression
2018-03-17 15:24:31 +00:00
Andy Wilkinson 6c77b012f0 Polish "Follow project convention for lambda expression"
Csee gh-12527
2018-03-17 15:23:50 +00:00
igor-suhorukov 261264cef3 Follow project convention for lambda expression
Closes gh-12527
2018-03-17 15:22:37 +00:00
Stephane Nicoll 78571f50f8 Restore server.error.include-stacktrace default value 2018-03-17 07:00:09 -04:00
Stephane Nicoll 3e826c1a01 Fix typo in Micrometer examples
Closes gh-12529
2018-03-17 06:53:09 -04:00
Phillip Webb e4a21b2393 Merge branch '1.5.x' 2018-03-16 15:09:08 -07:00
Phillip Webb a8f366a554 Fix copyright header for edited files 2018-03-16 15:07:23 -07:00
Phillip Webb 79ad03b584 Merge branch '1.5.x' 2018-03-16 15:06:08 -07:00
Phillip Webb 23892e33d6 Add text/plain error response support
Refine `BasicErrorController` mappings so that only JSON and XML get
structured responses. A simple string response is returned for all
other media types.

Fixes gh-12513
2018-03-16 14:30:42 -07:00
Phillip Webb 620208a802 Polish 2018-03-16 13:39:50 -07:00
Phillip Webb f80db03e75 Remove repositories section from published POM
Fixes gh-12378
2018-03-16 13:23:46 -07:00
Phillip Webb e975dbe3f0 Only use jar shortcut for matching URLs
Update JAR `Handler` logic so that the existing `jarFile` is only used
if the requested URL starts with the same path. Prior to this commit it
was possible to construct a URL with another URL as context. This could
mean that the `handler` was shared and the already resolved `jarFile`
contained in the handler wasn't necessarily suitable.

Fixes gh-12483
2018-03-16 11:56:34 -07:00
Andy Wilkinson 217dbe4a6f Merge pull request #12511 from Onur Kağan Özcan
* gh-12511:
  Upgrade maven dependency plugin version to 3.0.2
2018-03-16 16:59:59 +00:00
Onur Kağan Özcan dfe099b202 Upgrade maven dependency plugin version to 3.0.2
Closes gh-12511
2018-03-16 16:59:21 +00:00
Andy Wilkinson 36ea387a67 Close RandomAccessDataFile when direct JarFile is closed
Previously, the underlying RandomAccessDataFile was not closed when
the JarFile that was using it was closed. This causes a problem on
Windows as the open file handle prevents the file from being deleted.

This commit updates JarFile to close the underlying
RandomAccessDataFile when it is closed and has a JarFileType of
DIRECT.

Previously, when accessing the manifest of a jar file that maps to a
nested directory (BOOT-INF/classes) a new JarFile was created from the
root jar file, the manifest was retrieved, and the new JarFile was
closed. This could lead to the underlying RandomAccessDataFile being
closed while it was still in use.

This commit improves JarFile to retrieve the manifest from the
existing outer JarFile, thereby avoiding the need to create and close
a new JarFile.

Unfortunately, PropertiesLauncher creates a number of scenarios where
a JarFile with a type of direct is closed while it’s still being used.
To accommodate this behaviour, RandomAccessDataFile has been updated
so that it can re-open the underlying RandomAccessFile if it is used
after it has been closed.

Closes gh-12296
2018-03-16 15:58:50 +00:00
Brian Clozel 0162978c78 Support server.error.whitelabel.enabled in WebFlux
This commit disables the default HTML view in the WebFlux error handling
support when `server.error.whitelabel.enabled=false`.
In this case, the original exception will be forwarded down the stream
and handled by the default `WebExceptionHandler` provided by Spring
WebFlux (likely to respond a blank page and an error HTTP response
status).

Closes gh-12520
2018-03-16 16:54:34 +01:00
Brian Clozel 161ecc0575 Bind server.error.whitelabel.enabled to ErrorProperties
Closes gh-12516
2018-03-16 16:54:22 +01:00
Andy Wilkinson 2da4897aa8 Polish 2018-03-16 09:57:35 +00:00
Andy Wilkinson 87782a2db4 Upgrade JDK 10-based CI to jdk-10-ea-46
Closes gh-12515
2018-03-16 08:27:29 +00:00
Phillip Webb e40acf2447 Polish 2018-03-15 19:38:55 -07:00
Phillip Webb 522e3df394 Fix same name configuration properties adapting
Update `SpringConfigurationPropertySources` adapter logic so that and
exact instance match is used when checking if the cache can be used.

Prior to this commit if a property source was replaced with one that
had exactly the same name, the adapted version would not change.

Fixes gh-12451
2018-03-15 16:14:17 -07:00
Phillip Webb c201c1dac1 Polish 2018-03-15 16:09:14 -07:00
Madhura Bhave 9384e5c3c1 Fix binding to bean with cloned arrays
Fixes gh-12478
2018-03-15 14:14:20 -07:00
Madhura Bhave cb3da28bb9 Enforce length > 1 for H2 and WebServices path
Fixes gh-12485
2018-03-15 12:14:28 -07:00
Madhura Bhave e6149fda1c Assert endpoints basePath starts with '/' or is empty
Fixes gh-12489
2018-03-15 11:39:37 -07:00
Brian Clozel b8e8647391 Fix Servlet requirements in reference docs
As of Spring Framework 5.0, only Servlet 3.1+ containers are supported.
See https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-5.x

This commit updates the reference documentation to reflect that and also
removes sections describing pre-Servlet 3.1 solutions, as those are not
supported anymore.

Fixes gh-12370
2018-03-15 17:25:48 +01:00
Brian Clozel 2561f320e8 War deployment is not supported for WebFlux apps
Even though War deployment is supported by Spring Framework itself for
WebFlux applications, this is not the case currently in Spring Boot.

Fixes gh-12455
2018-03-15 16:58:40 +01:00
Brian Clozel a0b9974796 Polish Couchbase tests 2018-03-15 15:49:21 +01:00
Brian Clozel ac64441611 Merge pull request #12495 from dreis2211
* pr/12495:
  Use ApplicationContextRunner in tests
2018-03-15 14:36:00 +01:00
dreis2211 ca30739bf9 Use ApplicationContextRunner in tests
Closes gh-12495
2018-03-15 14:28:56 +01:00
Andy Wilkinson 19b726854d Upgrade to Mariadb 2.2.3
Closes gh-12503
2018-03-15 13:00:08 +00:00
Andy Wilkinson 6da049b7e3 Upgrade to Solr 6.6.3
Closes gh-12502
2018-03-15 13:00:08 +00:00
Andy Wilkinson c940f49bb3 Upgrade to Johnzon Jsonb 1.1.7
Closes gh-12501
2018-03-15 13:00:07 +00:00
Andy Wilkinson 3aafbce4f8 Upgrade to Byte Buddy 1.7.11
Closes gh-12500
2018-03-15 13:00:06 +00:00
Andy Wilkinson b948e32f12 Upgrade to Couchbase Client 2.5.6
Closes gh-12499
2018-03-15 13:00:05 +00:00
Andy Wilkinson d5e588d50a Merge branch '1.5.x' 2018-03-15 12:51:51 +00:00
Andy Wilkinson cfcc387593 Add dependency management for Spring AMQP's testing modules
Closes gh-12393
2018-03-15 12:51:02 +00:00
Andy Wilkinson 53924de556 Merge branch '1.5.x' 2018-03-15 12:47:52 +00:00
Brian Clozel 4a0b69aa1f Merge pull request #12492 from tsachev
* pr/12492:
  Fix Javadoc for ServiceLevelAgreementBoundary
2018-03-15 13:41:59 +01:00
Andy Wilkinson f553de4486 Upgrade to Infinispan 8.2.10.Final
Closes gh-12498
2018-03-15 12:41:52 +00:00
Andy Wilkinson 394054c7b7 Upgrade to Tomcat 8.5.29
Closes gh-12497
2018-03-15 12:41:52 +00:00
Andy Wilkinson 85096824be Upgrade to Mysql 5.1.46
Closes gh-12496
2018-03-15 12:41:52 +00:00
Vladimir Tsanev bf433e7f17 Fix Javadoc for ServiceLevelAgreementBoundary
Closes gh-12492
2018-03-15 13:40:13 +01:00
Brian Clozel 57147241cb Make WebClientCustomizer optional for WebClient
This commit removes the required dependency on `WebClientCustomizer`
instances when creating `WebClient` beans, making it optional.

Closes gh-12458
2018-03-15 10:47:45 +01:00
Phillip Webb d1e51d7f98 Explicitly set asyncSupported for reactive servers
Update `JettyReactiveWebServerFactory`/`TomcatReactiveWebServerFactory`
to explicitly set `asyncSupported` to `true`.

Fixes gh-12486
2018-03-14 16:09:45 -07:00
Brian Clozel 079851ebb4 Merge pull request #12472 from igor-suhorukov
* pr/12472:
  avoid check class by string name
2018-03-15 00:00:33 +01:00
igor-suhorukov 4c61d8abfe avoid check class by string name 2018-03-14 23:59:42 +01:00
Phillip Webb 09e0f1e841 Merge pull request #12459 from izeye
* pr/12459:
  Add missing super() calls
2018-03-14 15:56:53 -07:00
Johnny Lim 2e6914ea88 Add missing super() calls
Closes gh-12459
2018-03-14 15:56:53 -07:00
Brian Clozel a08deff0ce Fix WelcomePageHandlerMapping order
This commit fixes 220f8cd and moves the order for
`WelcomePageHandlerMapping` to `2` since the previous order was
conflicting with the resource mapping.

Closes gh-12335
2018-03-14 23:38:17 +01:00