1f71927a9f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24587
2020-12-22 09:45:42 +01:00
9e5a6c5228
Harmonize references to ActiveMQ Artemis
...
Closes gh-24586
2020-12-22 09:44:49 +01:00
f9fbadb8d9
Add JavaVersion entry for JDK 16
...
See gh-24453
2020-12-21 09:59:52 +01:00
09fa16c58c
Merge branch '2.3.x' into 2.4.x
2020-12-21 09:59:33 +01:00
306b964ce3
Fix multi-release JAR test on JDK 16
...
See gh-24453
2020-12-21 09:59:01 +01:00
fb207f73e7
Remove deprecated SpringBootContextLoader#getArgs()
...
See gh-24550
2020-12-21 09:44:28 +01:00
2c0bfb7674
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24578
2020-12-21 09:38:37 +01:00
97dd4c0871
Polish
...
See gh-24558
2020-12-21 09:35:41 +01:00
af67e6fa54
Merge branch '2.3.x' into 2.4.x
2020-12-18 18:03:22 -08:00
b82f5a408a
Add a note about disabling git info
...
See gh-24205
2020-12-18 18:02:27 -08:00
f9d1a4526c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24572
2020-12-18 17:26:44 -08:00
a5c8b84511
Update version of git-properties plugin in the docs
...
Closes gh-24567
2020-12-18 17:25:26 -08:00
c231f3da10
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24570
2020-12-18 17:15:01 -08:00
302ba77812
Improve documentation regarding git commit info
...
Closes gh-24205
2020-12-18 17:13:30 -08:00
5317d8a9bb
Change scope of bootstrap registered Binder
...
Update `ConfigDataEnvironment` so that the `Binder` is registered as
a prototype bootstrap instance. This allows it to be accessed early
but still replaced when a more complete version is available.
Fixes gh-24559
2020-12-18 15:16:11 -08:00
e1b158ec66
Add BootstrapRegistry Scope support
...
Update `BootstrapRegistry` so that it can be used to register instances
in either a `singleton` or `prototype` scope. The prototype scope has
been added so that instances can be registered and replaced later
if needed.
See gh-24559
2020-12-18 15:14:04 -08:00
f568aa489c
Fixup title anchors
2020-12-18 15:06:11 -08:00
01537bc54f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24565
2020-12-18 14:16:45 -08:00
c9a09cf6a9
Clarify when SpEL expressions in application properties are evaluated
...
Closes gh-24531
2020-12-18 14:15:27 -08:00
55d9951d90
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24563
2020-12-18 14:05:20 -08:00
1db271c2c5
Reorder documentation about building images
...
Closes gh-24560
2020-12-18 14:02:29 -08:00
e083be7de1
Fix ConfigDataEnvironmentPostProcessorIntegrationTests in Windows
2020-12-18 15:26:03 +00:00
0730949325
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24554
2020-12-17 20:47:13 -08:00
c4e41305d5
Prevent Tomcat URL "reflective access" warnings
...
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.
Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.
Fixes gh-18631
2020-12-17 20:43:41 -08:00
5ca01ce5a8
Make StandardConfigDataResource.getResource public
...
Update `StandardConfigDataResource` to make the `getResource()` method
public so that it can be used by Spring Cloud.
Closes gh-24504
2020-12-16 16:49:39 -08:00
d195815488
Only throw PortInUseException if port is set
...
Refine the `PortInUseException` logic in `NettyWebServer` to only throw
an exception if the port is set. The prevents a misleading exception
from being thrown when a domain socket is being used.
Closes gh-24529
2020-12-16 16:45:16 -08:00
4822516fb7
Merge branch '2.3.x' into 2.4.x
2020-12-16 15:33:58 -08:00
7fd4c53352
Deal with unsupported DisposableServer operations
...
Update `NettyWebServer` to deal with any `UnsupportedOperationException`
thrown from `DisposableServer`. Specifically, this commit allows the
`NettyWebServer` to work with domain socket backed servers which cannot
provide a port.
Fixes gh-24529
2020-12-16 15:29:54 -08:00
361198ebba
Fix tests
...
See gh-11987
2020-12-16 15:25:02 -08:00
a1ea5b49ec
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24542
2020-12-16 14:57:50 -08:00
09e07428cc
Configure CORS in default security configuration for MVC
...
Fixes gh-11987
2020-12-16 14:55:36 -08:00
4e603d9239
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24538
2020-12-16 15:59:28 -06:00
e4d124dc45
Improve error message with Maven build-image and war packaging
...
Fixes gh-24522
2020-12-16 15:58:53 -06:00
d6890e39a7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24536
2020-12-16 13:10:35 -08:00
dfcabe1665
Merge branch '2.3.x' into 2.4.x
...
Fixes gh-24521 in 2.4.2
2020-12-16 14:53:55 -06:00
0ec603cdad
Avoid duplicates in MergedContextConfiguration
...
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.
See gh-24532
2020-12-16 12:50:54 -08:00
0e5df2296e
Fail with Gradle bootBuildImage and war packaging
...
Prior to this commit, running the bootBuildImage Gradle task on a
project configured for war packaging would result in a jar file being
built and used in the image instead of the war file. With this commit
an error will be thrown from the plugin in this case.
Fixes gh-24521
2020-12-16 13:23:43 -06:00
5fdb2ae2fd
Protect PluginApplicationActions against absent plugin classes
...
Closes gh-24526
2020-12-16 09:51:25 +00:00
38e4c2a179
Add ConfigDataEnvironmentUpdateListener support
...
Add an overloaded `ConfigDataEnvironmentPostProcessor.applyTo` method
that accepts a listener that can used to track the updates that were
applied to the `Environment`.
The listener can be used to track the which `ConfigDataLocation` and
the `ConfigDataResource` were used to add a `PropertySource`. The lister
can also be used to tell which profiles were applied.
This enhancement is being added in a patch release because it's will
be useful for Spring Cloud 2020.0.0.
Closes gh-24504
2020-12-15 19:52:20 -08:00
5e1a69e90e
Polish
2020-12-15 19:51:53 -08:00
4fba7d0c60
Merge branch '2.3.x' into 2.4.x
2020-12-15 19:48:52 -08:00
29300530c6
Polish
2020-12-15 19:44:40 -08:00
a2d0b64e9c
Test that empty property files can be used
...
Add an additional test to ensure that empty property files do not
throw ConfigDataLocationNotFoundException exceptions.
See gh-24499
See gh-24515
2020-12-15 11:10:07 -08:00
a67edfbeb7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24518
2020-12-15 17:21:39 +00:00
76198f9a8d
Include properties from test-autoconfigure in config props appendix
...
Closes gh-24486
2020-12-15 17:20:21 +00:00
251e8b2640
Update instruction to add the configuration processor with Maven
...
Closes gh-24498
2020-12-15 14:48:19 +01:00
8e69a821d5
Use BindResult.orElseGet() where beneficial
...
See gh-24477
2020-12-15 11:26:15 +01:00
d1f2aab1e8
Fix non-optional classpath location checking
...
Allow directory locations that exist but do not contribute properties
to be specified without an `optional:` prefix. This commit fixes logic
introduced in commit 3dc03ac275
2020-12-14 20:32:13 -08:00
96510156ae
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24495
2020-12-14 16:19:50 +01:00
26e7e61919
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24494
2020-12-14 16:19:23 +01:00
60f526add0
Remove links to Jetty API and documentation
...
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version
See https://github.com/eclipse/jetty.project/issues/4546
Closes gh-24493
2020-12-14 16:17:25 +01:00
08b692581a
Prepare 2.4.x branch
2020-12-14 14:22:07 +01:00
72d36e0c07
Update copyright year of changed files
2020-12-10 10:46:04 -08:00
14816a6b6c
Support @Name meta-annotations with Kotlin binding
...
Update `ValueObjectBinder` Kotlin support to meta-annotations of
`@Named`.
See gh-24379
2020-12-10 10:44:15 -08:00
32e1289bbc
Use unique names for wildcard property sources
...
Update `StandardConfigDataLoader` to use unique names for property
sources imported from a wildcard location.
Prior to this commit, all the property sources created from the same
wildcard location would have the same name. Each time a property source
that is equal to an existing property source is added, it replaces the
existing property source. Property source equality is name-based so this
resulted in the last property sources from the wildcard location
winning.
This commit updates `StandardConfigDataLoader` to use the resolved
Resource rather than the wildcard location in which it was discovered
in the name of the property source that it creates, ensuring that each
is property source from a wildcard location is uniquely named.
Fixes gh-24428
2020-12-10 10:43:34 -08:00
0533ac58fb
Test the Gradle plugin against 6.7.1
...
Closes gh-24449
2020-12-10 15:33:37 +01:00
0eae6b4f72
Polish
...
See gh-24418
2020-12-10 13:53:06 +01:00
105cf591bf
Merge branch '2.3.x'
...
See gh-24418
2020-12-10 13:52:49 +01:00
ab99de4349
Polish
...
See gh-24418
2020-12-10 13:52:11 +01:00
6b858f3b84
Upgrade to Tomcat 9.0.41
...
Closes gh-24447
2020-12-10 09:30:36 +01:00
dec085fa3c
Upgrade to SQLite JDBC 3.32.3.3
...
Closes gh-24446
2020-12-10 09:30:35 +01:00
9091161cf9
Upgrade to Netty tcNative 2.0.35.Final
...
Closes gh-24445
2020-12-10 09:30:33 +01:00
9d5ea3da29
Upgrade to Netty 4.1.55.Final
...
Closes gh-24444
2020-12-10 09:30:32 +01:00
37f79f83ad
Upgrade to Caffeine 2.8.8
...
Closes gh-24443
2020-12-10 09:30:31 +01:00
ba87a0f23a
Upgrade to Spring Kafka 2.6.4
...
Closes gh-24294
2020-12-10 09:28:58 +01:00
7d032330d2
Upgrade to Spring Batch 4.3.1
...
Closes gh-24291
2020-12-10 09:27:18 +01:00
2786b3dd66
Upgrade to Spring Integration 5.4.2
...
Closes gh-24442
2020-12-10 09:25:36 +01:00
b06e0b50b4
Upgrade to Spring AMQP 2.3.2
...
Closes gh-24288
2020-12-10 09:24:31 +01:00
d339cb1513
Upgrade to Micrometer 1.6.2
...
Closes gh-24281
2020-12-10 09:23:41 +01:00
94b6b62077
Upgrade to Undertow 2.1.5.Final
...
Closes gh-24441
2020-12-10 09:03:03 +01:00
30748b8dd0
Upgrade to Tomcat 9.0.41
...
Closes gh-24440
2020-12-10 09:03:02 +01:00
264cd83f4b
Upgrade to Netty tcNative 2.0.35.Final
...
Closes gh-24439
2020-12-10 09:03:01 +01:00
1c720a56b2
Upgrade to Netty 4.1.55.Final
...
Closes gh-24438
2020-12-10 09:03:00 +01:00
b6b046702f
Upgrade to Caffeine 2.8.8
...
Closes gh-24437
2020-12-10 09:02:58 +01:00
fd91daaf21
Upgrade to ActiveMQ 5.15.14
...
Closes gh-24436
2020-12-10 09:02:57 +01:00
5f8900ea0e
Upgrade to Spring Kafka 2.5.10
...
Closes gh-24293
2020-12-10 09:00:35 +01:00
18e2ce1682
Upgrade to Spring Batch 4.2.5
...
Closes gh-24290
2020-12-10 08:59:47 +01:00
c08310ca35
Upgrade to Spring AMQP 2.2.13
...
Closes gh-24287
2020-12-10 08:56:38 +01:00
388f00612e
Upgrade to Micrometer 1.5.9
...
Closes gh-24427
2020-12-10 08:55:51 +01:00
7f9d0d2d7c
Upgrade to Tomcat 9.0.41
...
Closes gh-24435
2020-12-10 08:20:55 +01:00
1094b7c10c
Upgrade to Activemq 5.15.14
...
Closes gh-24434
2020-12-10 08:20:54 +01:00
b8c68ef374
Upgrade to Undertow 2.0.33.Final
...
Closes gh-24433
2020-12-10 08:20:53 +01:00
a9924c3576
Upgrade to Netty Tcnative 2.0.35.Final
...
Closes gh-24432
2020-12-10 08:20:51 +01:00
55b680e452
Upgrade to Netty 4.1.55.Final
...
Closes gh-24431
2020-12-10 08:20:50 +01:00
6d5e3b2c0d
Upgrade to Caffeine 2.8.8
...
Closes gh-24430
2020-12-10 08:20:49 +01:00
60e69c2c3e
Upgrade to Spring Kafka 2.3.13
...
Closes gh-24292
2020-12-10 08:19:26 +01:00
520b4bba9c
Upgrade to Spring Batch 4.2.5
...
Closes gh-24289
2020-12-10 08:18:45 +01:00
317ec32458
Upgrade to Spring Integration 5.2.10
...
Closes gh-24429
2020-12-10 08:18:17 +01:00
241730bf10
Upgrade to Spring AMQP 2.2.13
...
Closes gh-24286
2020-12-10 08:17:25 +01:00
112503058a
Merge branch '2.3.x'
...
Closes gh-24425
2020-12-09 18:24:22 -08:00
0bfa9cf107
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24424
2020-12-09 18:19:28 -08:00
869141766b
Use deterministic ordering of JavaBean methods
...
Update `JavaBeanBinder` so that methods and fields are sorted before
being processed. This ensures that setters are called in a deterministic
order, rather than the unspecified and variable order that reflection
provides.
Fixes gh-24068
2020-12-09 18:19:07 -08:00
e9aa070c6f
Upgrade to Spring Data 2020.0.2
...
Closes gh-24284
2020-12-09 17:32:08 +01:00
f4ed2e72c5
Upgrade to Spring Data Neumann-SR6
...
Closes gh-24283
2020-12-09 17:30:13 +01:00
6a8ad73e2e
Upgrade to Spring Data Moore-SR12
...
Closes gh-24282
2020-12-09 17:27:30 +01:00
0d472d6f74
Start building against Spring Data 2020.0.2 snapshots
...
See gh-24284
2020-12-09 14:16:47 +01:00
922a7a4f8c
Upgrade to Spring HATEOAS 1.2.2
...
Closes gh-24285
2020-12-09 14:14:27 +01:00
84b92bc531
Upgrade to Spring HATEOAS 1.1.3
...
Closes gh-24419
2020-12-09 14:12:33 +01:00
f375048620
Upgrade to Spring Framework 5.3.2
...
Closes gh-24278
2020-12-09 10:55:25 +01:00
52b5c36750
Upgrade to Micrometer 1.5.8
...
Closes gh-24280
2020-12-09 10:52:26 +01:00
8c676a43bd
Upgrade to Spring Framework 5.2.12
...
Closes gh-24277
2020-12-09 10:51:54 +01:00
275816d9f9
Upgrade to Micrometer 1.3.16
...
Closes gh-24279
2020-12-09 10:49:35 +01:00
e961afd64f
Upgrade to Spring Framework 5.2.12
...
Closes gh-24276
2020-12-09 10:48:56 +01:00
bef5fe29e3
Allow recursive profile group references
...
Update the original fix for issue #24327 so that recursive elements
are tolerated rather than fail.
See gh-24327
2020-12-08 18:58:05 -08:00
0931f04eb0
Polish 'Fail on recursive references in profile groups'
...
See gh-24327
2020-12-08 18:13:57 -08:00
5b74f77ac6
Fail on recursive references in profile groups
...
Update `Profiles` group expansion logic to fail if recursive
references are found.
See gh-24327
2020-12-08 18:13:56 -08:00
0d157e046f
Fix checkstyle violations
...
See gh-21015
2020-12-08 18:12:30 -08:00
e95c514661
Merge branch '2.3.x'
...
Closes gh-24412
2020-12-08 17:28:18 -08:00
49e754f48b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24411
2020-12-08 17:23:33 -08:00
286ef61071
Narrow auto-configure checkstyle suppressions
...
Closes gh-21015
2020-12-08 17:04:03 -08:00
b48f4028a3
Merge branch '2.3.x'
2020-12-08 16:32:45 -08:00
30717b6ae3
Merge branch '2.2.x' into 2.3.x
2020-12-08 16:32:26 -08:00
4f95486822
Polish note about Maven/Gradle restarts
...
See gh-24271
2020-12-08 16:31:46 -08:00
b9e87a4ab2
Merge branch '2.3.x'
...
Closes gh-24410
2020-12-08 16:25:16 -08:00
445c6b8aa6
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24409
2020-12-08 16:25:03 -08:00
10d3121e27
Polish "Triggering a restart" formatting
...
See gh-24271
2020-12-08 16:24:18 -08:00
0503079dc5
Document devtools restart with Maven/Gradle
...
Update the documentation to help avoid confusion for people who aren't
using an IDE.
See gh-24271
2020-12-08 16:20:32 -08:00
3618bddf51
Merge branch '2.3.x'
...
Closes gh-24408
2020-12-08 16:15:31 -08:00
06531b9b71
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24407
2020-12-08 16:08:32 -08:00
89642f0ce8
Add link to appendix from error handling
...
Improve documentation by adding a link from the "Error Handling" section
to the appendix.
Closes gh-24265
2020-12-08 16:06:21 -08:00
cd5ff6e4af
Merge branch '2.3.x'
...
Closes gh-24404
2020-12-08 12:13:02 -08:00
11f285bde5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24403
2020-12-08 12:12:51 -08:00
8c55803931
Polish
...
See gh-24306
2020-12-08 12:08:35 -08:00
93d83342d2
Merge branch '2.3.x'
...
Closes gh-24401
2020-12-08 15:42:52 +01:00
06671aa50e
Stop deferring JPA bootstrap mode by default
...
This commit changes the default value of bootstrap-mode to "default"
rather than "deferred" so that the JPA infrastructure starts in the
main thread rather than asynchronously.
Closes gh-24249
2020-12-08 15:42:14 +01:00
7b2f24aa46
Upgrade to Undertow 2.2.3.Final
...
Closes gh-24397
2020-12-08 05:21:05 +01:00
2fea5d49e7
Upgrade to Tomcat 9.0.40
...
Closes gh-24396
2020-12-08 05:21:03 +01:00
d96323be7b
Upgrade to Nimbus JOSE JWT 9.1.3
...
Closes gh-24395
2020-12-08 05:21:02 +01:00
643bb1ba6b
Upgrade to Mockito 3.6.28
...
Closes gh-24394
2020-12-08 05:21:01 +01:00
a7d52a2b2d
Upgrade to MariaDB 2.7.1
...
Closes gh-24393
2020-12-08 05:20:59 +01:00
3223e7cf39
Upgrade to Kotlin Coroutines 1.4.2
...
Closes gh-24392
2020-12-08 05:20:58 +01:00
8dd34b74c5
Upgrade to jOOQ 3.14.4
...
Closes gh-24390
2020-12-08 05:20:55 +01:00
626b67ffc0
Upgrade to Jetty 9.4.35.v20201120
...
Closes gh-24389
2020-12-08 05:20:54 +01:00
543ccd33d4
Upgrade to Infinispan 11.0.8.Final
...
Closes gh-24388
2020-12-08 05:20:53 +01:00
d7ee9a5b15
Upgrade to HttpCore 4.4.14
...
Closes gh-24387
2020-12-08 05:20:51 +01:00
3fa898c104
Upgrade to Hibernate 5.4.25.Final
...
Closes gh-24386
2020-12-08 05:20:50 +01:00
558f691a8d
Upgrade to Groovy 2.5.14
...
Closes gh-24385
2020-12-08 05:20:48 +01:00
9aa170703d
Upgrade to Dropwizard Metrics 4.1.16
...
Closes gh-24384
2020-12-08 05:20:47 +01:00
2770326356
Upgrade to DB2 JDBC 11.5.5.0
...
Closes gh-24383
2020-12-08 05:20:46 +01:00
ad079bf58a
Upgrade to Caffeine 2.8.7
...
Closes gh-24382
2020-12-08 05:20:44 +01:00
df405e1636
Upgrade to Reactor 2020.0.2
...
Closes gh-24275
2020-12-08 05:13:20 +01:00
f84cb1b765
Upgrade to Reactor Dysprosium-SR15
...
Closes gh-24274
2020-12-08 05:07:59 +01:00
07a1ef3604
Upgrade to Reactor Dysprosium-SR15
...
Closes gh-24273
2020-12-08 05:05:33 +01:00
0df3797c37
Upgrade to Spring Security 5.4.2
...
Closes gh-24297
2020-12-08 04:30:12 +01:00
4fa460d4a5
Start building against Spring Kafka 2.6.4 snapshots
...
See gh-24294
2020-12-08 04:30:12 +01:00
eabcc81b03
Start building against Spring Batch 4.3.1 snapshots
...
See gh-24291
2020-12-08 04:30:11 +01:00
013d8ed990
Start building against Spring AMQP 2.3.2 snapshots
...
See gh-24288
2020-12-08 04:30:11 +01:00
f3ae8d9e8e
Start building against Spring HATEOAS 1.2.2 snapshots
...
See gh-24285
2020-12-08 04:30:10 +01:00
d61724aada
Add @Name support for Kotlin value object binding
...
Fixes gh-24379
2020-12-07 18:51:42 -06:00
64d4648ad1
Upgrade to Spring Security 5.3.6
...
Closes gh-24296
2020-12-07 17:42:46 +01:00
9b4cf0c2fc
Start building against Spring Kafka 2.5.10 snapshots
...
See gh-24293
2020-12-07 17:42:17 +01:00
4d29098e6a
Start building against Spring Batch 4.2.5 snapshots
...
See gh-24290
2020-12-07 17:41:35 +01:00
c17442c37b
Start building against Spring AMQP 2.2.13 snapshots
...
See gh-24287
2020-12-07 17:40:53 +01:00
92d088f33f
Start building against Spring Data Neumann-SR6 snapshots
...
See gh-24283
2020-12-07 17:39:09 +01:00
60523b07b9
Start building against Spring Kafka 2.3.13 snapshots
...
See gh-24292
2020-12-07 16:56:56 +01:00
4c07539a9f
Start building against Spring Batch 4.2.5 snapshots
...
See gh-24289
2020-12-07 16:56:11 +01:00
dab6d0a53f
Start building against Spring AMQP 2.2.13 snapshots
...
See gh-24286
2020-12-07 16:55:43 +01:00
9ce919d6dc
Start building against Spring Data Moore-SR12 snapshots
...
See gh-24282
2020-12-07 16:55:00 +01:00
6e040740c6
Upgrade to Tomcat 9.0.40
...
Closes gh-24375
2020-12-07 15:22:26 +01:00
ddda80909e
Upgrade to Jetty 9.4.35.v20201120
...
Closes gh-24374
2020-12-07 15:22:25 +01:00
9eeae227b0
Upgrade to HttpCore 4.4.14
...
Closes gh-24373
2020-12-07 15:22:23 +01:00
c1ef49ae63
Upgrade to Hibernate 5.4.25.Final
...
Closes gh-24372
2020-12-07 15:22:22 +01:00
1e252ab382
Upgrade to Groovy 2.5.14
...
Closes gh-24371
2020-12-07 15:22:20 +01:00
ae71111893
Upgrade to Dropwizard Metrics 4.1.16
...
Closes gh-24370
2020-12-07 15:22:19 +01:00
dfae03704b
Upgrade to DB2 JDBC 11.5.5.0
...
Closes gh-24369
2020-12-07 15:22:18 +01:00
fa3723eb8b
Upgrade to Caffeine 2.8.7
...
Closes gh-24368
2020-12-07 15:22:16 +01:00
530b3e79a4
Upgrade to Spring Security 5.2.8.RELEASE
...
Closes gh-24366
2020-12-07 12:27:49 +01:00
cabe0ef28b
Upgrade to Neo4j Ogm 3.2.18
...
Closes gh-24365
2020-12-07 12:27:48 +01:00
6779180a94
Upgrade to Infinispan 9.4.21.Final
...
Closes gh-24364
2020-12-07 12:27:47 +01:00
75059beac3
Upgrade to Hibernate 5.4.25.Final
...
Closes gh-24363
2020-12-07 12:27:46 +01:00
aa87b788e2
Upgrade to Jetty 9.4.35.v20201120
...
Closes gh-24362
2020-12-07 12:27:44 +01:00
28cf851ed8
Upgrade to Groovy 2.5.14
...
Closes gh-24361
2020-12-07 12:27:43 +01:00
0ea2ab1005
Upgrade to Tomcat 9.0.40
...
Closes gh-24360
2020-12-07 12:27:42 +01:00
193e3e5e82
Upgrade to Httpcore 4.4.14
...
Closes gh-24359
2020-12-07 12:27:40 +01:00
e06c106a4f
Upgrade to Byte Buddy 1.10.18
...
Closes gh-24358
2020-12-07 12:27:39 +01:00
e8f6f6be17
Upgrade to Netty 4.1.54.Final
...
Closes gh-24357
2020-12-07 12:27:38 +01:00
8498f402e5
Upgrade to Dropwizard Metrics 4.1.16
...
Closes gh-24356
2020-12-07 12:27:36 +01:00
7689609f81
Upgrade to Db2 Jdbc 11.5.5.0
...
Closes gh-24355
2020-12-07 12:27:35 +01:00
cf51d80278
Upgrade to Appengine Sdk 1.9.83
...
Closes gh-24354
2020-12-07 12:27:34 +01:00
264ff95753
Upgrade to Caffeine 2.8.7
...
Closes gh-24353
2020-12-07 12:27:33 +01:00
d8706cdcfe
Upgrade to Jackson 2.10.5.20201202
...
Closes gh-24352
2020-12-07 12:27:31 +01:00
aba4c20823
Upgrade to Couchbase Client 2.7.18
...
Closes gh-24351
2020-12-07 12:27:30 +01:00
ff0725f6bf
Fix HazelcastHealthIndicatorTests
...
See gh-24337
2020-12-05 07:52:53 -08:00
55ae5be84b
Revert "Restore HazelcastHealthIndicatorTests"
...
This reverts commit 5a51b5853e
2020-12-05 07:47:50 -08:00
5a51b5853e
Restore HazelcastHealthIndicatorTests
...
Restore `HazelcastHealthIndicatorTests` which was accidentally replaced
with a version from 2.4.x.
See gh-24337
2020-12-05 07:28:08 -08:00
30c27274e2
Merge branch '2.3.x'
...
Closes gh-24339
2020-12-04 18:31:55 -08:00
5f351a6983
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24338
2020-12-04 18:21:57 -08:00
d8a05090b3
Fix checkstyle BDD Mockito violations
...
See gh-24337
2020-12-04 18:06:54 -08:00
837fc83527
Fix checkstyle header violations
...
See gh-24337
2020-12-04 18:05:53 -08:00
0389a07f7c
Remove deprecated code in EndpointDiscoverer
...
See gh-24317
2020-12-03 16:59:29 -08:00
b9ec88a7a5
Fix Asciidoc build step
...
See gh-24326
2020-12-03 16:30:16 -08:00
977140053b
Merge pull request #24325 from dreis2211
...
* pr/24325:
Remove System.out.println in DevToolsPropertyDefaultsPostProcessor
Closes gh-24325
2020-12-03 16:25:57 -08:00
faec47d332
Remove System.out.println in DevToolsPropertyDefaultsPostProcessor
...
See gh-24325
2020-12-03 16:25:03 -08:00
13a5ec169c
Merge pull request #24323 from dreis2211
...
* pr/24323:
Remove deprecated ExposeExcludePropertyEndpointFilter
Closes gh-24323
2020-12-03 16:18:49 -08:00
3e2d0c6d86
Remove deprecated ExposeExcludePropertyEndpointFilter
...
See gh-24323
2020-12-03 16:18:35 -08:00
d041c7d6b9
Document the granularity for property document imports
...
Closes gh-22987
2020-12-03 12:17:53 -08:00
932fb65107
Correct external application properties load order
...
Fixes gh-24308
2020-12-03 11:55:51 -08:00
3dc03ac275
Refine non-optional classpath location checking
...
Update `StandardConfigDataLocationResolver` to no longer check if
directories exist for classpath resources. Unfortunately checking for
the parent directory of a `ClassPathResource` isn't always possible
without resorting something similar to the
`PathMatchingResourcePatternResolver` which would add a lot of
complexity to the resolver.
In order to ensure that non-optional locations are always resolved,
the `ConfigDataEnvironment` now checks that all imported locations
have been loaded.
Closes gh-24143
2020-12-01 21:33:59 -08:00
01478a25b4
Handle wrapper types in Env actuator
...
This commit modifies the actuator `EnvironmentEndpoint` to allow
primitive wrapper types to be serialized in the response data
structure.
Fixes gh-24307
2020-12-01 15:12:13 -06:00
bd7e89be1a
Start building against Spring Framework 5.3.2 snapshots
...
See gh-24278
2020-11-30 17:18:35 +01:00
7c59d8a32f
Start building against Reactor 2020.0.2 snapshots
...
See gh-24275
2020-11-30 17:17:27 +01:00
065fde2996
Start building against Spring Framework 5.2.12 snapshots
...
See gh-24277
2020-11-30 16:42:38 +01:00
5f81882305
Start building against Reactor Dysprosium-SR15 snapshots
...
See gh-24274
2020-11-30 16:41:32 +01:00
9763ba56ba
Start building against Spring Framework 5.2.12 snapshots
...
See gh-24276
2020-11-30 16:04:27 +01:00
afeb9f29d4
Start building against Reactor Dysprosium-SR15 snasphots
...
See gh-24273
2020-11-30 14:32:15 +01:00
728e474f7f
Mark OriginTrackedPropertiesLoader#isNewDocument private
...
See gh-24268
2020-11-27 09:16:01 +01:00
e6ccbfb017
Merge branch '2.3.x'
...
Closes gh-24259
2020-11-26 09:02:33 +01:00
bb7ad30de4
Fix ErrorAttributeOptions#getIncludes Javadoc
...
See gh-24257
2020-11-26 09:00:52 +01:00
1d6bacf1c8
Fix typo
...
See gh-24245
2020-11-25 14:57:14 +01:00
f248cfe79c
Polish "Check that WebClient is available"
...
See gh-24152
2020-11-25 14:52:47 +01:00
f6255cc691
Check that WebClient is available
...
This commit reinstanties the isWeBClientPresent() check so that
WebTestClientContextCustomizer is only added if a web client is
available.
See gh-24152
2020-11-25 14:38:42 +01:00
b1678ee6ad
Merge branch '2.3.x'
...
Closes gh-24251
2020-11-25 14:36:16 +01:00
9b992af34b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24250
2020-11-25 14:31:30 +01:00
d506f0c73e
Polish "Reduce redis health indicator info command result size"
...
See gh-24208
2020-11-25 14:27:07 +01:00
99cc3f4bfc
Reduce redis health indicator info command result size
...
See gh-24208
2020-11-25 14:23:57 +01:00
8bcc3d1b09
Merge branch '2.3.x'
...
Closes gh-24234
2020-11-23 20:51:58 +01:00
016b69aa78
Polish "Allow to exclude an empty set of ErrorAttributes"
...
See gh-24230
2020-11-23 20:44:18 +01:00
6518f8f7fd
Allow to exclude an empty set of ErrorAttributes
...
See gh-24230
2020-11-23 20:43:59 +01:00
11c81ad245
Merge branch '2.3.x'
...
Closes gh-24223
2020-11-20 11:48:51 +00:00
7efa1e47aa
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24222
2020-11-20 11:48:25 +00:00
12f2529be5
Allow actuator endpoint to have responses with custom HTTP statuses
...
Fixes gh-24123
2020-11-20 11:38:31 +00:00
1f3012b466
Merge branch '2.3.x'
...
Closes gh-24220
2020-11-20 11:36:45 +00:00
0ed7f7f40a
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24219
2020-11-20 11:36:31 +00:00
08b9d1da57
Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
...
See gh-24095
2020-11-20 11:20:31 +00:00
7d712aaa2d
Ensure that MeterRegistry bean is defined before SI looks for it
...
Previously, it was possible for Spring Integration, including its
built-in Micrometer support, to be auto-configured before the
Micrometer auto-configuration had defined the MeterRegistry bean. This
resulted in missing Spring Integration metrics.
Spring Integration is unusual in having its own built-in Micrometer
support that it configures itself. Rather than providing
auto-configuration for Integration's Micrometer support (Which isn't
needed), this commit introduces some auto-configuration that just
affects the ordering of the auto-configuration classes. This ordering
ensures that the MeterRegistry bean has been defined by Spring
Integration is auto-configured. This ensures that the MeterRegistry
bean is known to the BeanFactory when Spring Integration goes looking
for it.
See gh-24095
2020-11-20 11:18:09 +00:00
4a7bc3d096
Require bean name match for Locale(Context)Resolver to back off
...
Web MVC and WebFlux look up by name the Locale(Context)Resolver beans
that they use. Previously, the auto-configured resolvers for MVC and
WebFlux would back off when any bean of the required type was defined,
irrespective of its name. If the name of the user's bean didn't match
the name used by MVC and WebFlux to find the custom resolver, the
custom resolver would be ignored and MVC and WebFlux would use their
defaults. There was no indication of this happening in the condition
evaluation report as all it would show is that the auto-configured
resolver had backed off in favour of the custom resolver. It wouldn't
show anything to explain why the custom resolver had not been used.
This commit updates the auto-configured resolvers to be conditional
on a missing bean of the name required by MVC and WebFlux. If the
user then defines a custom resolver with a different name, the
condition evaluation report will show that the auto-configured
resolver remained as the bean name didn't match.
Fixes gh-24209
2020-11-20 10:35:30 +00:00
e342d7d262
Fix processing of line immediately after # in properties file
...
Fixes gh-24158
2020-11-18 11:33:37 -08:00
c86ce27117
Use non deprecated properties to override web resources cache
...
Closes gh-24203
2020-11-18 17:40:35 +01:00
15c44aa45f
Merge branch '2.3.x'
...
Closes gh-24200
2020-11-18 12:04:29 +00:00
988526bee9
Only attempt unwrapping of interfaces
...
Wrapper's isWrapperFor and unwrap methods both take a Class<?> target
but document that the target should be an interface. Prior to this
change, we were calling isWrapperFor with any Class<?> irrespective of
whether or not it was an interface. When using Oracle UCP each call
to isWrapperFor with an interface results in an exception stack trace
being logged.
This commit upates DataSourceUnwrapper to adhere to Wrapper's contract
by only calling isWrapperFor and unwrap with interfaces.
Fixes gh-24154
2020-11-18 11:35:11 +00:00
f3afd8a0f4
Fix location of Spring LDAP and Spring Session properties
...
Closes gh-23558
2020-11-18 10:28:54 +01:00
e708667fc0
Merge branch '2.3.x'
...
Closes gh-24194
2020-11-18 10:09:23 +01:00
76912d1952
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24193
2020-11-18 10:09:03 +01:00
d3440880c4
Polish "Avoid unnecessary pattern compilation in WebFluxTags"
...
See gh-24147
2020-11-18 09:58:03 +01:00
b22bb7ea04
Avoid unnecessary pattern compilation in WebFluxTags
...
See gh-24147
2020-11-18 09:58:03 +01:00
0ce3e7ec6b
Protect against NPE caused by recursive calls
...
Update `SpringBootConfigurationFactory` so that it no longer attempts
to get a `LoggingSystem`.
The recent `LoggingSystem` update means makes use of the
`SpringFactoriesLoader` class to load candidate logging systems.
Unfortunately, the `SpringFactoriesLoader` class creates a `Logger`
which (when using Log4J2) causes `SpringBootConfigurationFactory` to
run. Calling `LoggingSystem.get` from `SpringBootConfigurationFactory`
results in a recursive call to `SpringFactoriesLoader` which hasn't
yet been fully initialized. We then see an NPE caused by a `null`
`cache`.
This update removes the call to `LoggingSystem.get` with the assumption
that it would never return `null` anyway.
Fixes gh-24163
2020-11-17 17:24:14 -08:00
e8244d8d70
Add CharSequenceToObjectConverter support
...
Update `ApplicationConversionService` with support for converting
`CharSequence` source types by using existing `String` based converters.
The addition is primarily to allow `ConfigTreePropertySource` values
to be converted correctly.
Closes gh-24171
2020-11-17 13:19:10 -08:00
e220536ddb
Merge branch '2.3.x'
...
Closes gh-24186
2020-11-17 21:36:58 +01:00
dea12f7551
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24185
2020-11-17 21:36:34 +01:00
b17895844d
Provide dependency management for elasticsearch-rest-client-sniffer
...
See gh-24173
2020-11-17 21:32:37 +01:00
da2276e7d4
Use stable builder and run images in integration tests
...
Fixes gh-24183
2020-11-17 13:54:10 -06:00
7283ff04eb
Merge branch '2.3.x'
...
Closes gh-24162
2020-11-16 07:21:19 +01:00
b341b478a6
Rename "sla" to "slo" in reference documentation
...
See gh-24160
2020-11-16 07:20:23 +01:00
6df10842d2
Allow Devtools to be enabled irrespective of the launching ClassLoader
...
Closes gh-21424
2020-11-12 13:22:40 +00:00
5b311d805b
Upgrade to Netty 4.1.54.Final
...
Closes gh-24129
2020-11-12 07:25:49 +01:00
62e5f2e8a6
Upgrade to jOOQ 3.14.3
...
Closes gh-24128
2020-11-12 07:25:47 +01:00
56ce2afe8f
Upgrade to Infinispan 11.0.5.Final
...
Closes gh-24127
2020-11-12 07:25:46 +01:00
20edba51ef
Upgrade to AssertJ 3.18.1
...
Closes gh-24126
2020-11-12 07:25:45 +01:00
8311edf722
Upgrade to Neo4j OGM 3.2.18
...
Closes gh-24125
2020-11-12 07:15:26 +01:00
79835dc20f
Upgrade to Netty 4.1.54.Final
...
Closes gh-24124
2020-11-12 07:08:37 +01:00
6b650f8c45
Upgrade to Spring Integration 5.4.1
...
Closes gh-24097
2020-11-11 21:25:09 +00:00
368b40868f
Merge branch '2.3.x'
...
Closes gh-24122
2020-11-11 20:16:51 +00:00
3e243de41b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24121
2020-11-11 20:16:39 +00:00
033c78b945
Fix link to Flyway callback docs
...
See gh-24119
2020-11-11 20:14:08 +00:00
f8a5be8245
Merge pull request #24120 from dreis2211
...
* gh-24120:
Fix deprecation warnings in javadoc comments
Closes gh-24120
2020-11-11 20:10:07 +00:00
5ef6e09c64
Fix deprecation warnings in javadoc comments
...
See gh-24120
2020-11-11 20:09:23 +00:00
51981d5ed3
Upgrade to Spring Session 2020.0.1
...
Closes gh-24098
2020-11-11 19:46:45 +00:00
4a9ca33026
Upgrade to Micrometer 1.6.1
...
Closes gh-24051
2020-11-11 19:35:29 +00:00
e35c8e0214
Upgrade to Micrometer 1.5.7
...
Closes gh-24050
2020-11-11 19:33:12 +00:00
9f10bb1405
Upgrade to Spring Kafka 2.6.3
...
Closes gh-24074
2020-11-11 19:31:50 +00:00
6507175d35
Upgrade to Spring Kafka 2.5.8.RELEASE
...
Closes gh-24075
2020-11-11 19:30:09 +00:00
0053fb7871
Upgrade to Spring Integration 5.3.4.RELEASE
...
Closes gh-24096
2020-11-11 19:28:49 +00:00
10355fc6dc
Upgrade to Spring AMQP 2.3.1
...
Closes gh-24073
2020-11-11 19:27:48 +00:00
795100f27d
Merge branch '2.3.x'
...
See gh-24043
2020-11-11 15:39:23 +00:00
4a630dc7a9
Only skip ..-prefixed locations when found via wildcard
...
Closes gh-23983
2020-11-11 15:36:39 +00:00
8f2de48fc1
Upgrade to Spring Data 2020.0.1
...
Closes gh-24036
2020-11-11 11:45:28 +00:00
634b88b950
Upgrade to Reactor 2020.0.1
...
Closes gh-24110
2020-11-11 10:37:25 +00:00
e8a1c3b9f8
Start building against Spring Integration 5.3.4 snapshots
...
See gh-24096
2020-11-11 09:16:30 +00:00
85cb5d4b3b
Upgrade to Reactor Dysprosium-SR14
...
Closes gh-24109
2020-11-11 09:14:21 +00:00
c3793bd0af
Upgrade to Spring HATEOAS 1.2.1
...
Closes gh-24091
2020-11-11 08:52:07 +01:00
59e0f7317e
Avoid image pulls in integration tests
...
This commit sets the pull policy to `IF_NOT_PRESENT` where possible
in integration tests for the Maven and Gradle plugins to reduce
the number of times the default Paketo builder and run images are
pulled from Docker Hub.
Fixes gh-24113
2020-11-10 16:19:05 -06:00
21d97524d8
Merge branch '2.3.x'
...
Closes gh-24112
2020-11-10 17:38:30 +00:00
e6ab20b029
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24111
2020-11-10 17:37:41 +00:00
31042bfc49
Test inclusion of system scope dependencies in repackaged war
...
Closes gh-22503
2020-11-10 17:35:04 +00:00
82652c7742
Start building against Reactor 2020.0.1 snapshots
...
See gh-24110
2020-11-10 18:22:01 +01:00
afe721bc34
Start building against Reactor Dysprosium-SR14 snapshots
...
See gh-24109
2020-11-10 18:00:10 +01:00
b6fc0913cf
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 17:44:05 +01:00
515b18e142
Merge branch '2.3.x'
...
Closes gh-24108
2020-11-10 17:10:26 +01:00
9e901b6e07
Upgrade to Testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 16:24:16 +01:00
23ad2b4156
Rationalize Testcontainers image versions
...
This commit rationalizes the Docker image names used in integration
tests.
Closes gh-24107
2020-11-10 16:04:27 +01:00
24f29a6516
Polish
...
See gh-24099
2020-11-10 15:52:17 +01:00
78fb3ccc53
Polish
2020-11-10 14:12:37 +01:00
f0a6128db3
Add spring.web.resources.cache.use-last-modified
...
Prior to this commit, packaging a Spring Boot application as a container
image with Cloud Native Buildpacks could result in unwanted browser
caching behavior, with "Last-Modified" HTTP response headers pointing to
dates in the far past.
This is due to CNB resetting the last-modified date metadata for static
files (for build reproducibility and container layer caching) and Spring
static resource handling relying on that information when serving static
resources.
This commit introduces a new configuration property
`spring.web.resources.cache.use-last-modified` that can be used to
disable this behavior in Spring if the application is meant to run as a
container image built by CNB.
The default value for this property remains `true` since this remains
the default value in Spring Framework and using that information in
other deployment models is a perfectly valid use case.
Fixes gh-24099
2020-11-10 13:40:25 +01:00
673a5ac2fd
Upgrade to Spring Framework 5.3.1
...
Closes gh-24035
2020-11-10 11:23:18 +01:00
0c43d13789
Upgrade to Spring Framework 5.2.11
...
Closes gh-24034
2020-11-10 11:21:24 +01:00
45f1133e1e
Merge branch '2.3.x'
2020-11-10 09:49:49 +01:00
339c8d0a26
Revert "Upgrade to Testcontainers 1.15.0"
2020-11-10 09:47:46 +01:00
5123eb0c74
Fix deprecation in Testcontainers 1.15.0
...
See gh-24103
2020-11-10 09:39:18 +01:00
7fb21fbff3
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 08:47:51 +01:00
c1a1b5fe71
Upgrade to Testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 08:46:15 +01:00
48bfdc1314
Revert "Upgrade to testcontainers 1.15.0"
...
This reverts commit b1c446d1b2
2020-11-10 07:49:23 +01:00
b1c446d1b2
Upgrade to testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 07:20:26 +01:00
33d83ebc94
Merge branch '2.3.x'
2020-11-09 14:41:03 +01:00
6aca0275ad
Polish
2020-11-09 14:40:44 +01:00
409e3ccecf
Ignore resolution of copied configuration
...
When a Configuration is copied, any before and after resolve actions
that are registered with its ResolvableDependencies are also copied
over. This means that, when a copied configuration is resolved the
resolution actions may be called on a ResolvableDependencies instances
that isn't the one to which they were added.
Previously, the above-described Gradle behaviour would result in
BootJar accessed the ResolvedConfiguration of a Configuration that may
not have yet been resolved. At best this would trigger Configuration
resolution and at worst it would fail. A failure could occur if the
configuration had been copied so that it could be made resolvable.
The afterResolve action would then try to access the
ResolvedConfiguration of the original Configuration. This would trigger
a resolution attempt that fails due to the original configuration being
marked as unresolvable.
This commit updates the afterResolve action in BootJar to check that
the ResolvableDependencies with which it is called matches the
ResolvableDependencies with which it was original registered. Only
when the two match, and therefore the configuration has actually been
resolved, does processing proceed.
Fixes gh-24072
2020-11-09 10:21:41 +00:00
e2af680f02
Upgrade to SendGrid 4.6.8
...
Closes gh-24090
2020-11-09 08:45:35 +01:00
05a226aa11
Upgrade to Pooled JMS 1.2.1
...
Closes gh-24089
2020-11-09 08:45:34 +01:00
2e119e7f30
Upgrade to Nimbus JOSE JWT 9.1.2
...
Closes gh-24088
2020-11-09 08:45:33 +01:00
2a98e2eb98
Upgrade to Kotlin Coroutines 1.4.1
...
Closes gh-24087
2020-11-09 08:45:31 +01:00
d2d968ba16
Upgrade to jOOQ 3.14.1
...
Closes gh-24086
2020-11-09 08:45:30 +01:00
706de82d39
Upgrade to Hibernate 5.4.23.Final
...
Closes gh-24085
2020-11-09 08:45:29 +01:00
a0d6504669
Upgrade to Couchbase Client 3.0.10
...
Closes gh-24084
2020-11-09 08:45:28 +01:00
599a7737db
Upgrade to Byte Buddy 1.10.18
...
Closes gh-24083
2020-11-09 08:45:26 +01:00
319aa0d478
Upgrade to AppEngine SDK 1.9.83
...
Closes gh-24082
2020-11-09 08:45:25 +01:00
d962a074c3
Upgrade to jOOQ 3.13.6
...
Closes gh-24081
2020-11-09 08:22:32 +01:00
2c67acb970
Upgrade to Hibernate 5.4.23.Final
...
Closes gh-24080
2020-11-09 08:22:31 +01:00
0142ed1e5c
Upgrade to Couchbase Client 3.0.10
...
Closes gh-24079
2020-11-09 08:22:30 +01:00
ebfa494b2e
Upgrade to Byte Buddy 1.10.18
...
Closes gh-24078
2020-11-09 08:22:28 +01:00
df6181f6bf
Upgrade to AppEngine SDK 1.9.83
...
Closes gh-24077
2020-11-09 08:22:27 +01:00
dfe3058dff
Only pick up new maintenance releases when upgrading dependencies
...
Closes gh-24069
2020-11-06 15:55:15 +00:00
4c42affcc6
Start building against Spring Framework 5.3.1 snapshots
...
See gh-24035
2020-11-06 16:43:42 +01:00
2282c73aab
Start building against Spring Framework 5.2.11 snapshots
...
See gh-24034
2020-11-06 16:41:47 +01:00
6a2332d477
Merge branch '2.3.x'
...
Closes gh-24062
2020-11-05 15:55:09 +00:00
44d0ce5ff1
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24060
2020-11-05 15:53:53 +00:00
9c5d1646bd
Show how to configure a case-sensitive physical naming strategy
...
Closes gh-24045
2020-11-05 15:53:32 +00:00
946be4eab6
Merge branch '2.3.x'
...
Closes gh-24059
2020-11-05 16:33:28 +01:00
4a8646bd09
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24058
2020-11-05 16:32:52 +01:00
59ea7c11f6
Use most specific getter when generating metadata
...
This commit makes sure to use the most specific getter if more than
one candidate exists.
Closes gh-24002
2020-11-05 16:01:28 +01:00
ce8427793f
Merge branch '2.3.x'
...
See gh-24053
2020-11-05 12:19:44 +00:00
91f4541a91
Merge branch '2.2.x' into 2.3.x
...
See gh-24052
2020-11-05 12:19:13 +00:00
006d4bc36d
Do not set Tomcat's trust store password when null
...
See gh-24041
2020-11-05 12:18:32 +00:00
06f37f4295
Merge branch '2.3.x'
...
Closes gh-24053
2020-11-05 11:40:07 +00:00
2ffb81f0d9
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24052
2020-11-05 11:35:37 +00:00
2425dcd200
Do not set Tomcat's key store and key pass when null
...
Fixes gh-24041
2020-11-05 11:30:04 +00:00
cb24df148f
Upgrade to Jetty 9.4.34.v20201102
...
Closes gh-24047
2020-11-05 08:24:55 +00:00
e447be6df7
Upgrade to Jetty 9.4.34.v20201102
...
Closes gh-24046
2020-11-05 08:22:31 +00:00
8f39ebf781
Merge branch '2.3.x'
...
Closes gh-24043
2020-11-04 16:53:57 -06:00
62aa1b7aaf
Narrow criteria for hidden property paths
...
A previous change intended to prevent temporary directories created as
an implementation detail of mounting volumes on kubernetes pods from
being used as a source for property files had a side-effect of also
preventing other types of hidden directories from being recognized. This
commit narrows the criteria for considering a directory as hidden,
using the kubernetes `..` prefix convention instead of the Unix `.`
prefix.
Fixes gh-23983
2020-11-04 16:09:54 -06:00
bb5faeaabe
Correct cross-reference in reference documentation
...
See gh-24033
2020-11-04 21:09:10 +00:00
21eb46739c
Merge branch '2.3.x'
...
Closes gh-24033
2020-11-04 17:45:30 +00:00
84cee76700
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24032
2020-11-04 17:42:24 +00:00
d5980be623
Clarify documentation for relaxed binding of environment variables
...
Closes gh-22974
2020-11-04 17:40:27 +00:00
f3648d6fe1
Merge branch '2.3.x'
...
Closes gh-24030
2020-11-04 16:47:38 +00:00
e83f3f40be
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24029
2020-11-04 16:47:23 +00:00
a8b8f43180
Improve description of spring.datasource.initialization-mode
...
Closes gh-21121
2020-11-04 16:46:28 +00:00
a1af99640e
Merge branch '2.3.x'
...
Closes gh-24026
2020-11-04 10:15:26 +00:00
28f7bc37a5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24025
2020-11-04 10:15:07 +00:00
c289ba0c2c
Recommend disabling context root redirects with proxied Tomcat
...
Closes gh-22908
2020-11-04 10:13:55 +00:00
a4505eaeb0
Merge branch '2.3.x'
...
Closes gh-24024
2020-11-04 09:41:41 +00:00
81f672eae3
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24023
2020-11-04 09:40:54 +00:00
28ccf54b21
Ignore schema username when auto-configuring a test DB
...
Previously, when an embedded test database was being auto-configured
any schema username and password specified by the user would result
in a separate embedded test database being created to load the schema.
This then left the actual test database without the schema causing
test failures.
This commit updates the test database auto-configuration to set the
schema username to an empty string in a property source that's added
first to the environment's property sources. This causes any schema
username configured by the user to be ignored, preventing the creation
of a separate database for schema.sql processing.
Fixes gh-19321
2020-11-04 09:30:19 +00:00
2814f91fbf
Merge branch '2.3.x'
...
Closes gh-24022
2020-11-03 20:33:08 +00:00
7c209478b6
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24021
2020-11-03 20:32:57 +00:00
5472fcf433
Fix typo in Spring Session documentation
...
See gh-24020
2020-11-03 20:31:42 +00:00
6cb5a98036
Merge branch '2.3.x'
...
Closes gh-24019
2020-11-03 19:43:28 +00:00
b2a058b6fe
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24018
2020-11-03 19:43:15 +00:00
2f280b01e1
Improve Spring Session back-off documentation
...
Closes gh-23151
2020-11-03 19:42:57 +00:00
bbad377ecc
Merge branch '2.3.x'
...
Closes gh-24017
2020-11-03 18:00:22 +00:00
f3d4b3e5ac
Allow entries to be streamed from JarURLConnections' jar file
...
Fixes gh-23821
2020-11-03 17:59:38 +00:00
f4e90f4512
Merge branch '2.3.x'
...
Closes gh-24016
2020-11-03 17:29:14 +00:00
d1a9dba25d
Polish "Avoid repeated calls of WebFlux and MVC registrations' getters"
...
See gh-23999
2020-11-03 17:23:16 +00:00
4c777c6df7
Deprecate classpath logging listener and stop registering by default
...
Closes gh-23138
2020-11-03 17:21:36 +00:00
2aac5c0095
Avoid repeated calls of WebFlux and MVC registrations' getters
...
See gh-23999
2020-11-03 16:51:39 +00:00
73c444262b
Merge branch '2.3.x'
...
Closes gh-24015
2020-11-03 16:38:49 +00:00
f9ff39a7a6
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24014
2020-11-03 16:38:33 +00:00
35bff55097
Ensure that Quartz can be auto-configured with a Quartz-specific TM
...
Previously, Quartz could be configured with a specific DataSource
using `@QuartzDataSource` but it was not possible to configure a
Quartz-specific transaction manager. This could result in the
different DataSources being used by Quartz itself and Quart'z
DataSourceTransactionManager.
This commit introduces a new qualifier, `@QuartzTransactionManager`,
that can be used to avoid the above-described problem. Any
`@QuartzTransactionManager`-annotated bean will be used by the
Quartz auto-configure configuration instead of the application's main
`TransactionManager`. If no such qualified bean is present, the
application's main TransactionManager, if any, will be used as before.
Fixes gh-20184
2020-11-03 15:56:44 +00:00
d41e739f8c
Merge branch '2.3.x'
...
Closes gh-24013
2020-11-03 14:58:41 +00:00
dc86e8ce30
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24012
2020-11-03 14:58:28 +00:00
6548ca4c11
Implement equals and hashCode in TestTypeExcludeFilter
...
Fixes gh-23978
2020-11-03 14:50:00 +00:00
c722692a8b
Polish "Align MustacheViewResolver with other similar resolvers"
...
See gh-24011
2020-11-03 14:28:11 +00:00
22693c17f3
Align MustacheViewResolver with other similar resolvers
...
The `FreeMarkerViewResolver` (and other template-based resolvers) in
Spring Framework avoid using reflection if they know how to
instantiate the view class. This change aligns with them.
See gh-24011
2020-11-03 14:21:50 +00:00
699f03d5a6
Merge branch '2.3.x'
...
Closes gh-24010
2020-11-03 14:04:38 +00:00
2dce4aa42b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24009
2020-11-03 14:04:08 +00:00
30a0ccab02
Remove use of `@PostConstruct` from main code
...
When running on Java 11 (where `@PostConstruct` is no longer part of
the JRE) and without a dependency on jakarta-annotation-api,
`@PostContruct` annotions are silently dropped. This leads to obscure and
hard-to-track down changes in the behaviour of our auto-configuration
as the `@PostConstruct`-annotated methods are not invoked.
To allow users to run on Java 11 without having jakarta-annotation-api
on the classpath, this commit removes use of `@PostConstruct` from main
code. A Checkstyle rule has also been added to prevent its usage in
main code from being reintroduced.
Closes gh-23723
2020-11-03 13:59:38 +00:00
c93d91175d
Merge branch '2.3.x'
...
Closes gh-24007
2020-11-03 10:27:53 +00:00
2513071b1f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24006
2020-11-03 10:27:38 +00:00
622606d85a
Make it clearer that only the main DataSource bean may be replaced
...
Closes gh-23808
2020-11-03 10:24:44 +00:00
c76b246463
Merge branch '2.3.x'
...
Closes gh-24005
2020-11-03 10:17:17 +00:00
b846143c37
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24004
2020-11-03 10:17:00 +00:00
d32d65b02c
Add tip about providing as much typo info as possible in @Bean methods
...
Closes gh-22925
2020-11-03 10:16:20 +00:00
dbb954734e
Correct replacement for stale-while-revalidate config property
...
Fixes gh-23980
2020-11-02 20:49:00 +00:00
8004a821f2
Fix nested test config discovery for sliced tests
...
Fixes gh-23984
2020-11-02 20:40:27 +00:00
b67d746840
Fix metadata for deprecated logging.file properties
...
See gh-23609
Closes gh-23995
2020-11-02 18:09:27 +01:00
62f26ee36f
Remove code that's no longer used
...
Closes gh-23993
2020-11-02 10:55:12 +01:00
339b21cee7
Merge branch '2.3.x'
...
Closes gh-23992
2020-11-02 10:48:32 +01:00
1e9c9b9d73
Add missing default values in configuration properties metadata
...
Closes gh-23991
2020-11-02 10:44:06 +01:00
fb59432cf5
Use Graal friendly logging factory implementations
...
Update `LoggingSystemFactory` class present checks to use a static
final field so that they work better with Graal.
Closes gh-23985
2020-11-01 12:54:43 -08:00
298880c260
Polish formatting
2020-11-01 12:50:31 -08:00
9c35cd41ad
Polish
...
See gh-23986
2020-11-01 17:07:50 +01:00
f080bb6c25
Fix test that depended on snapshot version
...
A test case would fail to accurately capture the contents
of the layers.idx file unless the test project contained
at least one non-project snapshot dependency, which was only
true when the Spring Boot version was a snapshot.
See gh-23463
2020-10-29 19:40:13 -05:00
d951f28e16
Upgrade to Micrometer 1.6.0
...
Closes gh-23525
2020-10-29 18:58:32 +01:00
1d4a45cf8a
Add dependency management for jOOQ's new jooq-kotlin module
...
Closes gh-23964
2020-10-29 16:35:37 +00:00
c22e655848
Move spring.resources.* properties to spring.web.resources.*
...
Closes gh-23917
2020-10-29 16:08:50 +00:00
929d8fcd3c
Update copyright year of changed files
2020-10-29 09:08:13 -07:00
a41ff4dfab
Merge branch '2.3.x'
2020-10-29 09:07:57 -07:00
b0c2687aa9
Update copyright year of changed files
2020-10-29 09:07:42 -07:00
5642dc6d13
Merge branch '2.3.x'
...
Closes gh-23970
2020-10-29 15:31:59 +00:00
70d9602b3f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23969
2020-10-29 15:31:12 +00:00
e7eb7739dc
Use overriding rather than overridden getter methods in config prop AP
...
Fixes gh-23966
2020-10-29 15:30:46 +00:00
a8705d19e5
Upgrade to Flyway 7.1.1
...
Closes gh-23932
2020-10-29 13:04:00 +00:00
2db8e7eebe
Polish "Add liquibase driver class name property"
...
See gh-23958
2020-10-29 10:06:43 +00:00
8a9b31aa69
Add liquibase driver class name property
...
See gh-23958
2020-10-29 09:11:41 +00:00
dc54394c03
Upgrade to Spring Batch 4.3.0
...
Closes gh-23963
2020-10-29 09:06:38 +01:00
e962714dd3
Upgrade to Spring Session 2020.0.0
...
Closes gh-23788
2020-10-29 09:06:08 +01:00
6f9434ccc4
Upgrade to Spring Integration 5.4.0
...
Closes gh-23781
2020-10-29 09:05:23 +01:00
74e06e8e6a
Refine MetadataCollector logic
...
Update `MetadataCollector` merge logic so that previous items are no
longer added if the current round contains a property of the same name.
Fixes gh-23916
2020-10-28 21:59:06 -07:00
23e5fd798c
Merge branch '2.3.x'
...
Closes gh-23960
2020-10-28 21:18:42 -07:00
b86dcbec72
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23959
2020-10-28 21:18:17 -07:00
cf09451ffb
Retain inner-class data on incremental compile
...
Ensure that metadata sourced from inner-types is not deleted when
performing an incremental compile. Prior to this commit, the source
type was searched using the `Outer$Inner` format. This is not supported
`Elements.getTypeElement` so we now convert the names to `Outer.Inner`.
Closes gh-10886
2020-10-28 21:13:08 -07:00
c0a0c4cbac
Show the source jar of a ClasspathResource
...
Update `TextResourceOrigin` so that it shows the source jar file
of a `ClasspathResource`.
Closes gh-23019
2020-10-28 18:25:28 -07:00
04a40a4c68
Provide content-length header to Docker API calls
...
Docker daemon authorization plugins reject POST or PUT requests that have a
content type `application/json` header but no content length header. This
commit ensures that a content length header is provided in these cases.
This is a cherry-pick of the changes in d5b2836ec9
2020-10-28 17:31:27 -05:00
425a2084ac
Upgrade to Spring Kafka 2.5.7
...
Closes gh-23787
2020-10-28 22:32:55 +01:00
11b55f650c
Upgrade to Spring Kafka 2.3.12
...
Closes gh-23786
2020-10-28 22:28:05 +01:00
124c148c51
Upgrade to Spring Integration 5.2.9
...
Closes gh-23956
2020-10-28 22:27:19 +01:00
b39d1910bc
Fix test failure caused by MavenBuild upgrades
...
See gh-23937
2020-10-28 14:07:27 -07:00
d5b2836ec9
Provide content-length header to Docker API calls
...
Docker daemon authorization plugins reject POST or PUT requests that have a
content type `application/json` header but no content length header. This
commit ensures that a content length header is provided in these cases.
Fixes gh-22840
2020-10-28 15:15:32 -05:00
ab21b55dc4
Revert "Upgrade to Flyway 7.1.0"
...
This reverts commit a6c6aba40d
2020-10-28 19:45:19 +00:00
d43760ba5a
Merge branch '2.3.x'
...
Closes gh-23938
2020-10-28 12:39:08 -07:00
d79c23ef89
Upgrade MavenBuild versions
...
Align versions with those in the main build.
Closes gh-23937
2020-10-28 12:37:30 -07:00
794a4ea0ab
Upgrade to Spring AMQP 2.3.0
...
Closes gh-23785
2020-10-28 20:29:40 +01:00
d112b8a289
Upgrade to Spring AMQP 2.2.12
...
Closes gh-23784
2020-10-28 20:27:50 +01:00
90ee8b5a2a
Upgrade to Spring Integration 5.3.3
...
Closes gh-23780
2020-10-28 20:26:59 +01:00
47a5d7aab6
Upgrade to Micrometer 1.5.6
...
Closes gh-23791
2020-10-28 20:26:17 +01:00
f2afd28b9a
Upgrade to Spring AMQP 2.2.12
...
Closes gh-23783
2020-10-28 20:24:56 +01:00
b3c4d5fe5c
Upgrade to Log4j 2.13.3 in Maven tests
...
See gh-23935
2020-10-28 12:15:33 -07:00
0fe08632eb
Upgrade to Spring Data 2020.0.0
...
Closes gh-23778
2020-10-28 17:52:20 +01:00
a6c6aba40d
Upgrade to Flyway 7.1.0
...
Closes gh-23932
2020-10-28 17:51:27 +01:00
8f2e58e301
Merge branch '2.3.x'
...
Closes gh-23933
2020-10-28 16:03:11 +00:00
58aa34489f
Wait for DataSource init before allowing context refresh to complete
...
Closes gh-22852
2020-10-28 16:01:14 +00:00
b94fe90f24
Upgrade to Spring Data Neumann-SR5
...
Closes gh-23777
2020-10-28 16:37:08 +01:00
9c4e5904e7
Upgrade to Micrometer 1.3.15
...
Closes gh-23790
2020-10-28 16:30:05 +01:00
8bd7cc417e
Upgrade to Spring Data Moore-SR11
...
Closes gh-23776
2020-10-28 16:29:27 +01:00
472c563451
Merge branch '2.3.x'
...
Closes gh-23931
2020-10-28 16:20:22 +01:00
0424689aee
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23930
2020-10-28 16:18:00 +01:00
93e36a97ab
Remove version elements from Maven plugin documentation
...
This commit removes `<version>` from the Maven Plugin documentation
where it makes sense so that versions aren't hardcoded unnecessarily.
Rather, a plugin or dependency management should be in place so those
are not needed.
Closes gh-23909
2020-10-28 13:39:03 +01:00
a3818d690e
Fix custom layout example so that tokens are replaced
2020-10-28 13:37:59 +01:00
74ec5f65d1
Make isPresent check more Graal-friendly
...
Closes gh-23925
2020-10-28 10:30:11 +00:00
506f7acc8d
Streamline use of TestContextAnnotationUtils
...
See gh-12470
2020-10-28 10:20:14 +00:00
d9084eab67
Provide Mockito with a MockResolver that removes Spring-created proxies
2020-10-28 09:43:09 +00:00
6b437ece54
Inherit enclosing class's configuration in nested tests
...
Fixes gh-12470
2020-10-28 08:56:42 +00:00
b0a1c2a740
Upgrade to Spring HATEOAS 1.2.0
...
Closes gh-23779
2020-10-28 09:06:34 +01:00
65d76f2fe8
Upgrade to Mockito 3.6.0
...
Closes gh-23924
2020-10-28 08:25:50 +01:00
a55325f0ad
Upgrade to Lettuce 6.0.1.RELEASE
...
Closes gh-23923
2020-10-28 08:25:41 +01:00
12dcf147be
Polish
...
See gh-21454
2020-10-28 07:09:47 +00:00
c02b16eeeb
Upgrade to Lettuce 5.3.5.RELEASE
...
Closes gh-23922
2020-10-28 08:03:44 +01:00
2e2b371679
Add auto-trimming support to configtree sources
...
Update `ConfigTreePropertySource` with an option to automatically trim
trailing new-line characters.
Closes gh-23826
2020-10-27 22:22:59 -07:00
cf673cee55
Use stricter document properties separator logic
...
Update `OriginTrackedPropertiesLoader` with stricter logic around the
document separator. If the preceding or following lines are comments
then the separator will be ignored.
Closes gh-22963
2020-10-27 21:43:44 -07:00
0588e989af
Don't adapt RandomPropertySource
...
Stop adapting `RandomPropertySource` to `ConfigurationPropertySource`
since it's not useful as a binding source.
Closes gh-21659
2020-10-27 20:41:13 -07:00
11a153869f
Polish 'Support nested @PropertyMapping annotations'
...
See gh-23146
2020-10-27 18:49:04 -07:00
edf4c833c2
Support nested @PropertyMapping annotations
...
Update `AnnotationsPropertySource` so that nested annotations are
supported. Prior to this commit, annotations annotated with
`@PropertyMapping` that contained nested annotation attributes would
result in instances of `TypeMappedAnnotation` being used as properties.
This usually led to errors due to not being able to convert those to
Strings. This commit makes it so that nested annotations are recursively
mapped to properties. This should allow for more complex configuration
to be mapped from annotations.
See gh-23146
2020-10-27 18:48:46 -07:00
f60f3cb38e
Exclude property beans from method validation
...
Exclude `@ConfigurationProperties` beans from method validation so
that `@Validated` can be used on final classes without the method
validation post-processor throwing an exception.
This commit introduces a `FilteredMethodValidationPostProcessor` class
which will use `MethodValidationExcludeFilters` to exclude beans from
method validation processing. Using `@EnableConfigurationProperties`
will automatically register an appropriate filter.
Closes gh-21454
2020-10-27 15:43:00 -07:00
a0862f9146
Support wildcard configtree imports
...
Update `ConfigTreeConfigDataResource` so that a wildcard suffix can
be used to import multiple folders. The pattern logic from
`StandardConfigDataLocationResolver` has been extracted into a new
`LocationResourceLoader` class so that it can be reused.
Closes gh-22958
2020-10-27 14:14:23 -07:00
8b6b0505fb
Upgrade to Spring Framework 5.3.0
...
Closes gh-23774
2020-10-27 16:59:16 +01:00
b9516bc77c
Await registration of http.server.requests meter
...
Previously, the test would make an HTTP request and, as soon as the
response was received, it would check the presence and value of the
http.server.requests meter. This create a race condition between the
meter being registered once the response had been flushed and the
meter's presence being checked. If the check won the race, the test
would fail.
This commit updates the test to wait for up to 5 seconds for the
meter to be present and have a count of 1, matching the single request
that has been made.
Fixes gh-23919
2020-10-27 15:54:22 +00:00
9854e3019b
Polish
2020-10-27 14:59:10 +00:00
41f3470e09
Upgrade to Spring Framework 5.2.10
...
Closes gh-23526
2020-10-27 15:49:21 +01:00
8b49f792cb
Upgrade to Spring Framework 5.2.10
...
Closes gh-23773
2020-10-27 15:48:17 +01:00
4561f068aa
Upgrade to Rsocket 1.1.0
...
Closes gh-23912
2020-10-27 15:10:49 +01:00
689d0c8307
Remove skipping of spring-boot-* projects from DevTools restart triggers
...
Closes gh-23158
2020-10-27 12:09:17 +00:00
1c4b4cb0cd
Provide config properties for configuring WebFlux's locale resolution
...
Previously, the locale context resolver used with WebFlux could only be
configured by provided a custom LocaleContextResolver bean. By
constrast, when using Spring MVC, the spring.mvc.locale and
spring.mvc.locale-resolver properties could be used to configure the
locale and the resolver (fixed or Accept header) respectively.
This commit introduces spring.web.locale and spring.web.locale-resolver
properties and deprecates their spring.mvc equivalents. The new
properties can be used to configure locale resolution with either
Spring MVC or WebFlux.
Closes gh-23449
2020-10-27 11:12:00 +00:00
Stephane Nicoll
dreis2211
izeye
Madhura Bhave
Phillip Webb
Andy Wilkinson
Scott Frederick
Phillip Webb
Billy T. Hernandez
Jim Stockwell
João Guerra
Tobias Gesellchen
xJoeWoo
Wanderlei Souza
Artem Bilan
Stephane Nicoll
Peter Paul Bakker
Sergey Kolesnikov
Brian Clozel
Pascal Schumacher
Michal Růžička
Dave Syer
Evgeniy Cheban
Sebastian Nohn
Stefan Zwanenburg