Phillip Webb
06e9a97dfd
Merge branch '2.0.x'
2018-11-13 00:41:52 -08:00
Phillip Webb
27714b1e7d
Attempt to fix docker-lib.sh script
...
See gh-15158
2018-11-13 00:04:55 -08:00
Phillip Webb
e8eaeba20c
Attempt to fix docker-lib.sh script
...
See gh-15158
2018-11-12 23:39:54 -08:00
Phillip Webb
e9232288f4
Merge branch '2.0.x'
2018-11-12 22:47:17 -08:00
Phillip Webb
8fcad7bb53
Fix CI curl calls
...
Fix `curl` to follow redirects and use the correct `strip` variable.
See gh-15158
2018-11-12 22:23:34 -08:00
Phillip Webb
8f341fa61d
Switch CI to OpenJDK releases
...
Update the download URLs to archives that include the `javadoc` binary.
See gh-15158
2018-11-12 22:15:26 -08:00
Phillip Webb
7934b08ecd
Update docker-lib.sh for CLI changes
...
Update docker-lib.sh to deal with the latest docker CLI changes.
See gh-15158
2018-11-12 21:21:58 -08:00
Phillip Webb
c5a7704774
Use local docker-lib.sh
...
Update the modified docker image build to use the local docker-lib.sh
file rather than grabbing it from the concourse github.
See gh-15158
2018-11-12 20:39:05 -08:00
Phillip Webb
1480dd81eb
Migrate CI images to tagged Ubuntu release
...
Update the CI image process to build from a tagged ubuntu release. All
images now make use of a shared setup script to install the appropriate
binaries.
Closes gh-15158
2018-11-12 20:11:59 -08:00
Stephane Nicoll
495d1b1567
Merge pull request #15153 from dreis2211
...
* pr/15153:
Polish some Map operations
2018-11-12 09:08:47 +01:00
dreis2211
3b4b0641d9
Polish some Map operations
...
Closes gh-15153
2018-11-12 09:08:25 +01:00
Stephane Nicoll
ab6ab0d533
Merge pull request #15134 from izeye
...
* pr/15134:
Polish contribution
Polish
2018-11-11 11:03:45 +01:00
Stephane Nicoll
a222952a77
Polish contribution
...
Closes gh-15134
2018-11-11 11:03:29 +01:00
Johnny Lim
fd5aa3ebf1
Polish
...
See gh-15134
2018-11-11 11:03:13 +01:00
Stephane Nicoll
2c3b455b8b
Merge branch '2.0.x'
2018-11-11 10:58:44 +01:00
Johnny Lim
8470d649bc
Polish
...
See gh-15134
2018-11-11 10:58:31 +01:00
Stephane Nicoll
575070a8db
Merge pull request #15125 from breglerj
...
* pr/15125:
Polish "Add HANA to the lookup of well-known databases"
Add HANA to the lookup of well-known databases
2018-11-10 18:04:31 +01:00
Stephane Nicoll
089ef9085a
Polish "Add HANA to the lookup of well-known databases"
...
Closes gh-15125
2018-11-10 18:02:01 +01:00
Jonathan Bregler
85754eaddd
Add HANA to the lookup of well-known databases
...
See gh-15125
2018-11-10 17:59:29 +01:00
Stephane Nicoll
0c3056780d
Merge pull request #15124 from breglerj
...
* pr/15124:
Fix HANA validation query
2018-11-10 17:58:18 +01:00
Jonathan Bregler
e74348ee30
Fix HANA validation query
...
This commit updates the validation query for HANA. It should use the
fully qualified dummy table name (SYS.DUMMY) to avoid unexpected results
if there is a local table named DUMMY.
Closes gh-15124
2018-11-10 17:56:51 +01:00
Stephane Nicoll
f274772d43
Merge pull request #15137 from sreeise
...
* pr/15137:
Remove redundant json starter from spring-boot-starter-data-rest
2018-11-09 08:35:17 +01:00
sreeise
6454a8f4ca
Remove redundant json starter from spring-boot-starter-data-rest
...
Closes gh-15137
2018-11-09 08:31:47 +01:00
Andy Wilkinson
e7d921c216
Align test expectations with styling of stack trace div
...
Closes gh-15075
2018-11-08 12:31:21 +00:00
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