51a5b841dd
Merge branch '2.0.x'
2018-11-27 12:51:16 +00:00
4a385e89bd
Mention fully executable jars in Jersey’s scanning limitations
...
Closes gh-3413
2018-11-27 12:51:05 +00:00
669eeef29b
Merge branch '2.0.x'
2018-11-27 12:36:22 +00:00
1f994b70b5
Correct description of file generated by heapdump endpoint
...
Closes gh-15016
2018-11-27 12:35:35 +00:00
1d029a09e2
Start building against Spring Data Lovelace-$R3 snapshots
...
See gh-15191
2018-11-27 12:17:37 +00:00
f9a3b79e97
Merge branch '2.0.x'
2018-11-27 12:12:07 +00:00
ae5d5235f6
Upgrade to Spring Data Kay-SR12
...
Closes gh-14893
2018-11-27 12:11:14 +00:00
376e7fdfa1
Document profile activation limitation of .spring-boot-devtools.properties
...
Closes gh-15151
2018-11-27 12:09:56 +00:00
6729e56f6b
Merge branch '2.0.x'
2018-11-27 12:00:36 +00:00
e74b084c67
Auto-configure codec customizations and JSON when using @WebFluxTest
...
Closes gh-15070
2018-11-27 11:48:30 +00:00
ac77fc9dcf
Ignore .writing files in Integration samples tests
...
Previously, a temporary .writing file could be found and an attempt made to
access its contents. If the temporary file was deleted between it being found
and its contents being read, the test would fail with a FileNotFoundException.
This commit updates the test to ignore .writing files so that it will only
examine the contents of the final file once Integration has finished
writing it an atomically moved it to its final location.
2018-11-27 11:24:25 +00:00
f6a22a05b8
Merge branch '2.0.x'
2018-11-27 11:21:22 +00:00
ab8e4d5987
Merge pull request #15163 from Vedran Pavic
...
* gh-15163:
Polish "Auto-configure Spring Session's cookie serializer"
Auto-configure Spring Session's cookie serializer
2018-11-27 11:15:27 +00:00
9553d4f64b
Polish "Auto-configure Spring Session's cookie serializer"
...
Closes gh-15163
2018-11-27 11:08:15 +00:00
0daf83efab
Auto-configure Spring Session's cookie serializer
...
See gh-15163
2018-11-27 11:08:05 +00:00
312bd13529
Merge branch '2.0.x'
2018-11-27 10:48:30 +00:00
516d0eff3a
Merge branch '1.5.x' into 2.0.x
2018-11-27 10:48:16 +00:00
17b38dc264
Upgrade to Spring Data Releasetrain Ingalls-SR17
...
Closes gh-15305
2018-11-27 10:47:28 +00:00
dfab0b4231
Upgrade to Spring Framework 5.1.3
...
Closes gh-15186
2018-11-27 11:40:06 +01:00
8fa8e6872c
Merge branch '2.0.x'
2018-11-27 11:07:32 +01:00
e89d1a8ebe
Upgrade to Spring Framework 5.0.11
...
Closes gh-15189
2018-11-27 11:06:57 +01:00
997209fd04
Merge branch '1.5.x' into 2.0.x
2018-11-27 11:06:03 +01:00
9bc85af19c
Upgrade to Spring Framework 4.3.21
...
Closes gh-15188
2018-11-27 11:05:12 +01:00
8928cd1982
Deprecate spring.rabbitmq.template.queue
...
Closes gh-15301
2018-11-27 09:55:45 +01:00
a240e22593
Adapt to Rabbit internal change
...
See gh-15271
2018-11-27 08:31:46 +01:00
cf525dabd2
Merge branch '2.0.x'
2018-11-26 17:53:53 +00:00
69edf8960f
Correct stale reference to embeddedLaunchScriptProperties with Gradle
...
Closes gh-15094
2018-11-26 17:53:27 +00:00
de8c353cec
Merge branch '2.0.x'
2018-11-26 17:40:46 +00:00
898d9f80f3
Merge branch '1.5.x' into 2.0.x
2018-11-26 17:40:35 +00:00
7cf9b984aa
Warn about unpack's use of the temporary directory
...
Closes gh-15180
2018-11-26 17:38:05 +00:00
fa7be63fbb
Merge branch '2.0.x'
2018-11-26 16:53:00 +00:00
7ddbb37bd5
Polish
2018-11-26 16:52:49 +00:00
073ac7bc99
Fix Thymeleaf security dialect tests on Windows
2018-11-26 16:15:15 +00:00
a0d0ecf9d4
Test the Gradle plugin against Gradle 5.0
...
Closes gh-15171
2018-11-26 16:02:54 +00:00
5a9ff6a3cb
Merge branch '2.0.x'
2018-11-26 15:51:52 +00:00
5201584c60
Upgrade to Neo4j Ogm 3.1.5
...
Closes gh-15293
2018-11-26 15:51:01 +00:00
55721f06df
Upgrade to Kotlin 1.2.71
...
Closes gh-15292
2018-11-26 15:50:59 +00:00
c73fdc4ce4
Merge branch '2.0.x'
2018-11-26 12:09:21 +00:00
d2756319cb
Polish
2018-11-26 12:09:14 +00:00
1c4a26557c
Polish
2018-11-26 11:47:35 +00:00
c1bbcb6908
Merge branch '2.0.x'
2018-11-26 11:41:55 +00:00
4bc32e6358
Use a HandlerInterceptor for timing long tasks
...
Closes gh-15204
2018-11-26 11:30:06 +00:00
e1db713169
Merge branch '2.0.x'
2018-11-26 10:38:01 +00:00
958c3861ee
Merge branch '1.5.x' into 2.0.x
2018-11-26 10:37:45 +00:00
f43a83fa4f
Upgrade to Junit Jupiter 5.3.2
...
Closes gh-15286
2018-11-26 10:41:08 +01:00
ae1979f1ff
Merge branch '2.0.x'
2018-11-26 10:35:37 +01:00
5f0ac46d78
Unwrap DataSource target rather than plain instanceof calls
...
Closes gh-15227
2018-11-26 10:35:10 +01:00
8cdbbddc6d
Merge pull request #15206 from ttddyy
...
* pr/15206:
Polish "Perform best effort to retrieve DataSourceProxy"
Perform best effort to retrieve DataSourceProxy
2018-11-26 10:23:11 +01:00
e424dfbe15
Polish "Perform best effort to retrieve DataSourceProxy"
...
Closes gh-15206
2018-11-26 10:18:48 +01:00
26f9a92837
Perform best effort to retrieve DataSourceProxy
...
Prior to this commit, `DataSourceJmxConfiguration` with tomcat
`DataSource`, it can only find `DataSourceProxy` if the given
`DataSource` is a direct child of it. Since it uses `instanceof`, it
could not find `DataSourceProxy` if the `DataSource` is
wrapped(delegated) or proxied.
This is because `DataSourceProxy#unwrap()` always returns null; thus
cannot use this method to directly obtain `DataSourceProxy`.
In this commit, updated the check logic to perform the best effort to
retrieve `DataSourceProxy`. If given `DataSource` is wrapped or proxied
by spring, tries to unwrap or get target datasource recursively to find
`DataSourceProxy`.
See gh-15206
2018-11-26 10:18:48 +01:00
Andy Wilkinson
Vedran Pavic
Stephane Nicoll
Tadaya Tsuyukubo