Stephane Nicoll
d04f2583f1
Merge branch '2.3.x'
...
Closes gh-23005
2020-08-19 10:09:43 +02:00
Stephane Nicoll
9a374f7d67
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23004
2020-08-19 10:09:22 +02:00
dreis2211
06eb7e9777
Mention correct JUnit 5 annotations in Kotlin testing section
...
See gh-23002
2020-08-19 10:07:40 +02:00
Scott Frederick
341615d7d0
Merge branch '2.3.x'
...
Closes gh-23000
2020-08-18 17:07:25 -05:00
Scott Frederick
3f80638a36
Fail on layertools extract with launch script
...
This commit adds a check to the `layertools extract` command to
ensure that the jar file being processed is readable and has a
valid directory.
Fixes gh-22993
2020-08-18 17:06:31 -05:00
Scott Frederick
b7fdf8fe87
Preserve user-provided values in MongoClientSettings
...
Prior to this commit, values from MongoProperties would always
overwrite matching fields in MongoClientSettings. This commit
preserves all values in MongoClientSettings if the client app
provides the MongoClientSettings bean, and only overwrites from
MongoProperties if no MongoClientSettings bean is provided.
Fixes gh-22321
2020-08-17 16:07:40 -05:00
Stephane Nicoll
8c0318edc7
Polish "Consider RecordFilterStrategy in Kafka auto-configuration"
...
See gh-22973
2020-08-17 13:54:20 +02:00
dreis2211
61838eede1
Fix typos in docs
...
See gh-22945
2020-08-17 13:27:46 +02:00
Stephane Nicoll
80e9bfb9a6
Merge branch '2.3.x'
2020-08-17 13:26:58 +02:00
Stephane Nicoll
6b679b7d64
Polish
...
See gh-22945
2020-08-17 13:24:51 +02: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
Phillip Webb
310ef6e999
Rename volumemount -> configtree
...
Closes gh-22941
2020-08-13 13:28:25 -07:00
Stephane Nicoll
045d2f678d
Document Spring Data Neo4j 6 support
...
Closes gh-22652
2020-08-13 17:51:39 +02: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
2c120eb161
Merge branch '2.3.x'
...
Closes gh-22900
2020-08-12 09:51:44 +02:00
Stephane Nicoll
38baaf31d3
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22899
2020-08-12 09:51:25 +02:00
Stephane Nicoll
ee2363fca7
Polish "Harmonize Discover the HTTP Port at Runtime How-To"
...
See gh-22898
2020-08-12 09:50:44 +02:00
John Franco
303768b2b5
Harmonize Discover the HTTP Port at Runtime How-To
...
See gh-22898
2020-08-12 09:48:57 +02:00
Madhura Bhave
4799b26d2c
Merge branch '2.3.x'
...
Closes gh-22897
2020-08-11 12:25:48 -07:00
Madhura Bhave
eeca767c49
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22895
2020-08-11 12:22:43 -07:00
Madhura Bhave
cdbb7f441a
Do not ignore null/empty values from SPRING_APPLICATION_JSON
...
Fixes gh-21542
2020-08-11 12:22:08 -07:00
Stephane Nicoll
8bcf5186dc
Merge branch '2.3.x'
...
Closes gh-22891
2020-08-11 16:51:58 +02:00
Stephane Nicoll
92445fcc54
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22890
2020-08-11 16:51:34 +02:00
Stephane Nicoll
ccffd50285
Document the limitation of default value detection
...
Closes gh-22685
2020-08-11 16:51:00 +02:00
Stephane Nicoll
64a5aa9340
Polish
2020-08-11 16:41:47 +02:00
Stephane Nicoll
44e807738b
Merge branch '2.3.x'
...
Closes gh-22889
2020-08-11 15:54:03 +02:00
Stephane Nicoll
ac7320d7fe
Document that Cassandra's application.conf is not considered
...
Closes gh-21787
2020-08-11 15:53:06 +02:00
Stephane Nicoll
5bd69fcd61
Merge branch '2.3.x'
...
Closes gh-22874
2020-08-11 13:40:21 +02:00
Stephane Nicoll
dc4de06b35
Restore customization of the Couchbase cache manager
...
With the upgrade to the new Couchbase SDK and the related changes in
Spring Data Couchbase, CacheManagerCustomizer can no longer be used to
customize the Couchbase cache manager as it is an immutable class.
This commit introduces a dedicated callback for the
CouchbaseCacheManagerBuilder that is used by the auto-configuration and
update the documentation to refer to it with a sample usage.
Closes gh-22573
2020-08-11 13:32:17 +02:00
dreis2211
11df8216ad
Fix some doc anchors
...
See gh-22839
2020-08-10 14:34:22 +02:00
Stephane Nicoll
fcab5d6ce1
Merge branch '2.3.x'
2020-08-10 14:33:50 +02:00
Stephane Nicoll
2b578296f9
Merge branch '2.2.x' into 2.3.x
2020-08-10 14:33:37 +02:00
Stephane Nicoll
8962d6ca21
Polish
2020-08-10 14:31:16 +02:00
Brian Clozel
6336007038
Merge branch '2.3.x'
...
Closes gh-22826
2020-08-07 16:01:25 +02:00
Brian Clozel
fea535d176
Update HTTP/2 auto-configuration for Jetty
...
Prior to this commit, the HTTP/2 server auto-configuration for Jetty
would require Conscrypt as a hard dependency.
This commit updates the auto-configuration for more flexibility and now
allows the following deployments:
* JDK9+ with the JDK ALPN implementation
* JDK8u252+ with the backported ALPN implementation
* Conscrypt with no JDK requirement
The auto-configuration now improves detection and guides developers in
case there is a missing `jetty-alpn-*-server` dependency.
The reference docs in the HOWTO section has been updated accordingly.
Closes gh-22188
2020-08-07 15:42:23 +02:00
Andy Wilkinson
4b17bfd889
Merge branch '2.3.x'
2020-08-06 13:34:31 +01:00
Andy Wilkinson
327138c227
Merge branch '2.2.x' into 2.3.x
2020-08-06 13:34:12 +01:00
Andy Wilkinson
63f7c75b61
Polish
2020-08-06 13:34:01 +01:00
Andy Wilkinson
792c4f46ef
Merge branch '2.3.x'
...
Closes gh-22759
2020-08-06 09:22:11 +01:00
Andy Wilkinson
c121f9f61f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22758
2020-08-06 09:21:29 +01:00
Andy Wilkinson
b53f54f2cf
Add tip about using AopTestUtils.getTargetProxy with proxied spy beans
...
Closes gh-22281
2020-08-06 09:21:11 +01:00
Madhura Bhave
b9abcf1615
Fail hard if spring.profiles.include is used with new config processing
...
Closes gh-22693
2020-08-05 14:41:32 -07:00
Andy Wilkinson
9c417d280c
Merge branch '2.3.x'
...
Closes gh-22749
2020-08-05 18:15:59 +01:00
Andy Wilkinson
a160755da5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22748
2020-08-05 18:15:45 +01:00