Commit Graph

19540 Commits

Author SHA1 Message Date
Andy Wilkinson bfb0886495 Tolerate Hibernate 5.2
Closes gh-15100
2018-11-08 12:24:22 +00:00
Brian Clozel 159f947870 Polish
Closes gh-15075
2018-11-07 09:40:11 +01:00
up-to-you ae4bc48481 Fix stack-trace line breaks in whitelabel error views
Since gh-12838, the WebFlux whitelabel error view also shows the
stacktrace information if it is available in the model.

This commit adds a CSS directive that preserves white spaces and breaks
lines at newline characters.
2018-11-07 09:40:11 +01:00
Stephane Nicoll 27d1af8ffa Merge branch '2.0.x' 2018-11-07 09:32:50 +01:00
Stephane Nicoll 6ed1f7c7eb Upgrade Maven wrapper to Maven 3.6.0
Closes gh-15123
2018-11-07 09:32:06 +01:00
Stephane Nicoll ded871d111 Merge pull request #15113 from dreis2211
* pr/15113:
  Add missing @Deprecated annotation
2018-11-07 07:54:03 +01:00
dreis2211 6ac788df2f Add missing @Deprecated annotation
Closes gh-15113
2018-11-07 07:53:39 +01:00
Stephane Nicoll 3628c5b2dc Remove redundant declaration on spring-context
Closes gh-15107
2018-11-06 15:28:41 +01:00
Stephane Nicoll 59552319eb Merge pull request #15103 from dreis2211
* pr/15103:
  Polish some Map operations
2018-11-06 07:42:19 +01:00
dreis2211 3e95af2c85 Polish some Map operations
Closes gh-15103
2018-11-06 07:41:55 +01:00
Stephane Nicoll 804f647a34 Merge pull request #15084 from dreis2211
* pr/15084:
  Remove unused static methods in tests
2018-11-05 07:39:55 +01:00
dreis2211 5e35ac6ce5 Remove unused static methods in tests
Closes gh-15084
2018-11-05 07:38:49 +01:00
Stephane Nicoll 0bd69fded8 Fix detection of ScheduledExecutorService
`@EnableScheduling` detects primarily a suitable `TaskScheduler` in the
context and fallbacks to the presence of a `ScheduledExecutorService` if
that is not the case.

This commit improves the auto-configuration to back off when such
scheduled executor service is present, so that the framework
initialization code can pick it up as usual.

Closes gh-15032
2018-11-04 09:58:41 +01:00
Stephane Nicoll c7909318cd Merge branch '2.0.x' 2018-11-04 08:03:23 +01:00
Stephane Nicoll b6886bc002 Merge pull request #15081 from nishantraut
* pr/15081:
  Polish contribution
  Update documentation to remind how JobParameters should be specified
2018-11-04 08:03:07 +01:00
Stephane Nicoll 69d9b7a813 Polish contribution
Closes gh-15081
2018-11-04 07:59:26 +01:00
Nishant Raut 08ddb59f92 Update documentation to remind how JobParameters should be specified
See gh-15081
2018-11-04 07:51:31 +01:00
Stephane Nicoll 0e4763f89d Merge pull request #15082 from jihor
* pr/15082:
  Add reference to Hiatus starter
2018-11-04 07:24:44 +01:00
Dmitry Zhikharev 226ccc2e84 Add reference to Hiatus starter
Closes gh-15082
2018-11-04 07:24:15 +01:00
Brian Clozel da53a0b8d5 Fix HTTP status error template rendering in WebFlux
Prior to this commit, a change in `HttpStatus.toString` since SPR-16898
prevented the default WebFlux `ErrorWebExceptionHandler` to render
template views for exact HTTP status (e.g. "404.html").
This issue does not affect the resolution of series, like "4xx.html".

This commit fixes `DefaultErrorWebExceptionHandler` to use
`HttpStatus.value()` when attempting to resolve error views.

Closes gh-15083
2018-11-03 21:28:48 +01:00
Stephane Nicoll f42a653604 Merge branch '2.0.x' 2018-11-03 16:38:16 +01:00
Stephane Nicoll f5ba9952db Make UndertowAccessLogCustomizer conditional on class
Closes gh-15065
2018-11-03 16:35:03 +01:00
Stephane Nicoll 7257572dbd Merge branch '2.0.x' 2018-11-02 14:00:30 +01:00
Stephane Nicoll d818e1a961 Merge pull request #15060 from jeffsheets
* pr/15060:
  Polish "Update docs to Spock 1.2"
  Update docs to Spock 1.2
2018-11-02 13:59:55 +01:00
Stephane Nicoll 01091aab2a Polish "Update docs to Spock 1.2"
Closes gh-15060
2018-11-02 13:59:03 +01:00
Jeff Sheets 01b17af530 Update docs to Spock 1.2
See gh-15060
2018-11-02 13:58:47 +01:00
Andy Wilkinson 52ea3614d8 Merge branch '2.0.x' 2018-11-01 15:01:57 +00:00
Andy Wilkinson 7d5a76c61f Work around SUREFIRE-1588 by dropping back to 10.0.2+13-Debian-1
See gh-15056
2018-11-01 14:57:33 +00:00
Andy Wilkinson 8f67373581 Merge branch '2.0.x' 2018-11-01 13:04:26 +00:00
Andy Wilkinson d267f1ed69 Use full path when specifying Dockerfile to build
See gh-15058
2018-11-01 13:02:59 +00:00
Andy Wilkinson 022c9dd55b Merge branch '2.0.x' 2018-11-01 12:57:43 +00:00
Andy Wilkinson f210e9c77f Add local docker-lib.sh file when building CI images
Closes gh-15058
2018-11-01 12:53:31 +00:00
Andy Wilkinson 16d4a826a3 Merge branch '2.0.x' 2018-11-01 12:09:48 +00:00
Andy Wilkinson e915006161 Use sha256 hashes for Docker base images to ensure repeatability
Closes gh-15056
2018-11-01 11:32:07 +00:00
Stephane Nicoll 980d8ea0ad Merge branch '2.0.x' 2018-11-01 17:49:56 +09:00
Stephane Nicoll 2927195b02 Fix StaticResourceRequest javadoc examples
Closes gh-15050
2018-11-01 17:48:56 +09:00
Stephane Nicoll 26dc8b9fb5 Update system requirements in the reference docs
Closes gh-15026
2018-11-01 17:36:39 +09:00
Stephane Nicoll dc02616b78 Merge branch '2.0.x' 2018-11-01 17:15:31 +09:00
Stephane Nicoll 9c09af0b74 Merge pull request #15033 from Nooheat
* pr/15033:
  Simplify ArrayList calling addAll() immediately
2018-11-01 17:13:59 +09:00
Nooheat 8380031039 Simplify ArrayList calling addAll() immediately
Closes gh-15033
2018-11-01 17:10:16 +09:00
Andy Wilkinson 8d701e6d4d Revert addition of JDK-12 based CI
See gh-15031
2018-11-01 07:14:06 +00:00
Andy Wilkinson e9124fac0f Correct CI resource config after adding JDK 12 build
See gh-15031
2018-11-01 06:42:30 +00:00
Andy Wilkinson 9bb7edcb88 Remove JDK 9 and 10-based CI and add JDK 12
Closes gh-15031
2018-11-01 06:33:33 +00:00
Stephane Nicoll 8d6d1f4a57 Merge branch '2.0.x' 2018-11-01 10:15:26 +09:00
Stephane Nicoll 62782e5d86 Merge pull request #15049 from mmoayyed
* pr/15049:
  Polish EnableConfigurationPropertiesImportSelector javadoc
2018-11-01 10:14:51 +09:00
Misagh Moayyed e820f04926 Polish EnableConfigurationPropertiesImportSelector javadoc
Closes gh-15049
2018-11-01 10:13:35 +09:00
Andy Wilkinson bbdd731535 Use 11.0.1-jdk for Java 11 CI builds
Closes gh-15030
2018-10-31 09:59:05 +00:00
Andy Wilkinson 228e05487a Test Gradle Plugin against Gradle 5.0-rc-1
Closes gh-15028
2018-10-31 09:47:49 +00:00
Spring Buildmaster 001fc465d4 Next development version (v2.1.1.BUILD-SNAPSHOT) 2018-10-30 10:12:22 +00:00
Phillip Webb 80685f81bf Merge branch '2.0.x' 2018-10-29 22:33:21 -07:00