Phillip Webb
3e939cbabd
Polish method order
2020-08-14 17:02:13 -07:00
Phillip Webb
5591a6ab77
Merge branch '2.3.x'
...
Closes gh-22961
2020-08-14 15:11:47 -07:00
Phillip Webb
03d4b89c06
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22960
2020-08-14 15:11:23 -07:00
Maciej Walkowiak
15de956566
Fix typo Assert4J -> AssertJ
...
See gh-22948
2020-08-14 15:09:56 -07:00
Madhura Bhave
bbbbe8e4d2
Make security auto-configs back off when SecurityFilterChain present
...
Closes gh-22739
2020-08-14 12:24:25 -07:00
Andy Wilkinson
c9b8a05321
Merge branch '2.3.x'
2020-08-14 15:41:20 +01:00
Andy Wilkinson
3e35fd480f
Wait longer for server port and improve diagnostics on timeout
...
See gh-22909
2020-08-14 15:34:41 +01:00
Phillip Webb
310ef6e999
Rename volumemount -> configtree
...
Closes gh-22941
2020-08-13 13:28:25 -07:00
Phillip Webb
5579f9d1c4
Polish
2020-08-13 11:53:36 -07:00
Scott Frederick
2a998a4373
Fix DataNeo4jTestReactiveIntegrationTests
...
See gh-22940
2020-08-13 13:45:04 -05:00
Stephane Nicoll
045d2f678d
Document Spring Data Neo4j 6 support
...
Closes gh-22652
2020-08-13 17:51:39 +02:00
Stephane Nicoll
d4ba55f8d6
Do not configure a ReactiveNeo4jTransactionManager
...
The current arrangement with Neo4j does not allow us to know for sure
that the user intends to use `@Transactional` for reactive or imperative
operations.
The main reason for that is that the only trigger for the reactive
auto-configuration is the presence of reactor on the classpath given
that the Neo4j driver ships with both styles in the same jar. And
reactor can be on the classpath for a number of reasons that are
unrelated to imperative access (typically `WebClient`).
This commits removes the auto-configuration of the
ReactiveNeo4jAutoConfiguration and makes sure that if the user defines
one, the regular `PlatformTransactionManager` backs off. This is
a temporarily situation until we can provide a better signal that the
user intends to primarily use imperative repositories.
Closes gh-22940
2020-08-13 16:57:51 +02:00
Andy Wilkinson
4398c71d12
Merge branch '2.3.x'
...
Closes gh-22938
2020-08-13 13:32:27 +01:00
Andy Wilkinson
8c4e6f766c
Revert "Merge pull request #21060 from dsyer"
...
This reverts commit 6547ea56f9 , reversing
changes made to e9e4a34e62 .
Fixes gh-22039
2020-08-13 13:31:45 +01:00
Andy Wilkinson
1c8392e980
Upgrade to Selenium HtmlUnit 2.43.1
...
Closes gh-22937
2020-08-13 12:04:42 +01:00
Andy Wilkinson
7310b7dbcd
Upgrade to Micrometer 1.5.4
...
Closes gh-22936
2020-08-13 12:04:40 +01:00
Andy Wilkinson
1c930396b4
Upgrade to Flyway 6.5.4
...
Closes gh-22935
2020-08-13 12:04:39 +01:00
Stephane Nicoll
2f5145b6a1
Upgrade to Micrometer 1.5.4
...
Closes gh-22932
2020-08-13 13:04:03 +02:00
Andy Wilkinson
a087d706d0
Upgrade to Spring Batch 4.3.0-M2
...
Closes gh-22892
2020-08-13 12:03:07 +01:00
Stephane Nicoll
42ca62b2e7
Merge branch '2.3.x'
...
Closes gh-22931
2020-08-13 11:49:03 +02:00
Stephane Nicoll
df78105a3c
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22930
2020-08-13 11:48:43 +02:00
Stephane Nicoll
f61a632a37
Polish "Fix conditions that lead to auto-configure PushGateway"
...
See gh-22919
2020-08-13 11:47:43 +02:00
smlc
c355b95f6c
Fix conditions that lead to auto-configure PushGateway
...
See gh-22919
2020-08-13 11:41:49 +02:00
Stephane Nicoll
947e484001
Merge branch '2.3.x'
...
Closes gh-22928
2020-08-13 09:44:26 +02:00
Stephane Nicoll
d0662e824a
Fix default value of server.jetty.accesslog.format
...
Closes gh-22921
2020-08-13 09:43:37 +02:00
Scott Frederick
7c7079f91a
Merge branch '2.3.x'
2020-08-12 17:44:52 -05:00
Scott Frederick
4c6a722f18
Fix test for Java version in image building docs
...
See gh-22916
2020-08-12 17:43:37 -05:00
Scott Frederick
092bbd198e
Merge branch '2.3.x'
...
Closes gh-22923
2020-08-12 17:04:54 -05:00
Scott Frederick
005ed8b8db
Use Java version wildcard in image building docs
...
Fixes gh-22916
2020-08-12 17:04:17 -05:00
Scott Frederick
6b15822cb1
Polish "Add pullPolicy option for image building"
...
See gh-22736
2020-08-12 15:16:38 -05:00
anshlykov
c7449b57ce
Add pullPolicy option for image building
...
This commit adds a pullPolicy option to the configuration of the Maven
plugin spring-boot:build-image goal and the Gradle plugin bootBuildImage
task. The new option gives users control over pulling the builder image
and run image from a remote image registry to the local Docker daemon.
See gh-22736
2020-08-12 15:16:38 -05:00
Andy Wilkinson
b35cfb7fb7
Upgrade to Spring Integration 5.4.0-M2
...
Closes gh-22729
2020-08-12 20:17:50 +01:00
Andy Wilkinson
c59b48b690
Upgrade to Spring Kafka 2.5.5.RELEASE
...
Closes gh-22843
2020-08-12 19:19:57 +01:00
Andy Wilkinson
ce729b7188
Upgrade to Spring AMQP 2.2.10.RELEASE
...
Closes gh-22842
2020-08-12 19:19:18 +01:00
Andy Wilkinson
2de48ac6ee
Upgrade to Spring Kafka 2.6.0-M1
...
Closes gh-22730
2020-08-12 19:17:14 +01:00
dreis2211
c00d5c5643
Introduce @ForkedClassPath for testing unmodified class path
...
See gh-22710
2020-08-12 17:21:31 +01:00
Andy Wilkinson
0158213b3f
Upgrade to Spring AMQP 2.3.0-M2
...
Closes gh-22761
2020-08-12 17:20:33 +01:00
Andy Wilkinson
fff9193860
Merge branch '2.3.x'
...
Closes gh-22917
2020-08-12 17:06:30 +01:00
Andy Wilkinson
f43a0b4891
Fix configuration of environment in Kotlin bootBuildImage examples
...
Fixes gh-22913
2020-08-12 17:06:16 +01:00
Phillip Webb
bc3f028a1f
Fix spring.config.activate.on-profile metadata
...
Fix the `spring.config.activate.on-profile` entry which was accidentally
entered as `spring.config.import.on-profile`.
See gh-22497
2020-08-12 07:13:11 -07:00
Stephane Nicoll
5e5c1fb4d0
Upgrade to Spring Data Neumann SR3
...
Closes gh-22844
2020-08-12 15:42:54 +02:00
Andy Wilkinson
147b048a07
Merge branch '2.3.x'
...
See gh-22909
2020-08-12 13:24:50 +01:00
Andy Wilkinson
2b1bb2f18f
Improve diagnostics when remote application does not start as expected
...
See gh-22909
2020-08-12 13:24:17 +01:00
Andy Wilkinson
0d8719adb7
Merge branch '2.3.x'
...
Closes gh-22911
2020-08-12 13:14:33 +01:00
Andy Wilkinson
65ccb514d0
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22910
2020-08-12 13:14:15 +01:00
Johnny Lim
68e2dd626d
Mention configuration customizers for WebTestClient and RestAssured
...
See gh-22765
2020-08-12 13:13:11 +01:00
Stephane Nicoll
25e08d2dee
Restore handling of certain spring.data.neo4j.* properties
...
This commit switches the deprecation level of several properties in the
spring.data.neo4j namespace from error and warning. The server URI and
basic authentication can be used in a deprecated fashion to configure
the new neo4j driver.
Closes gh-22653
2020-08-12 14:07:44 +02:00
Andy Wilkinson
9a2d2effa5
Merge branch '2.3.x'
...
Closes gh-22907
2020-08-12 12:24:38 +01:00
Andy Wilkinson
1381929525
Upgrade to Gradle 6.6
...
Closes gh-22905
2020-08-12 12:24:08 +01:00
Andy Wilkinson
520cfa4638
Merge branch '2.3.x'
...
Closes gh-22904
2020-08-12 11:40:48 +01:00