5fb1ca6043
Upgrade to Johnzon 1.2.9
...
Closes gh-24762
2021-01-12 09:55:41 +01:00
37f653121f
Upgrade to Jetty Reactive HTTPClient 1.1.5
...
Closes gh-24761
2021-01-12 09:55:40 +01:00
3ae9639cbb
Upgrade to Jackson Bom 2.11.4
...
Closes gh-24760
2021-01-12 09:55:38 +01:00
371e59cd80
Upgrade to Hibernate Validator 6.1.7.Final
...
Closes gh-24759
2021-01-12 09:55:37 +01:00
e48e48988a
Upgrade to Hibernate 5.4.27.Final
...
Closes gh-24758
2021-01-12 09:55:35 +01:00
66daeab221
Upgrade to Hazelcast 3.12.11
...
Closes gh-24757
2021-01-12 09:55:34 +01:00
682c952306
Upgrade to Dropwizard Metrics 4.1.17
...
Closes gh-24756
2021-01-12 09:55:32 +01:00
7ab9fad062
Upgrade to Byte Buddy 1.10.19
...
Closes gh-24755
2021-01-12 09:55:31 +01:00
b3bc79b10f
Upgrade to AppEngine SDK 1.9.84
...
Closes gh-24754
2021-01-12 09:55:29 +01:00
8058370f3e
Upgrade to Spring Framework 5.3.3
...
Closes gh-24699
2021-01-12 08:28:33 +01:00
bd21c43d71
Simplify resource registration
...
Simplify resource registration by using the new Spring Framework API
that allows `Resource` instances to be registered directly.
See gh-24745
2021-01-11 16:40:42 -08:00
f1fcfa6fc3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24748
2021-01-11 14:53:57 -08:00
72dd3b5628
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24747
2021-01-11 14:21:56 -08:00
f9e3e0d532
Register default resource path using a Resource
...
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.
Closes gh-24745
2021-01-11 14:20:46 -08:00
53a6fa2fed
Respect spring.dao.exceptiontranslation setting
...
Update `DataSourceTransactionManagerAutoConfiguration` to respect
the `spring.dao.exceptiontranslation` setting. If `exceptiontranslation`
is `false` then we create a classic `DataSourceTransactionManager`
rather than a `JdbcTransactionManager`.
Fixes gh-24321
2021-01-11 13:57:47 -08:00
cff3e4c831
Fix tests following upstream framework changes
2021-01-11 13:39:21 -08:00
039df1d96d
Test spring.profiles.include in profile file
...
Add a test to ensure that `spring.profiles.include` is not silently
ignored when used in a profile-specific file.
See gh-24733
2021-01-11 12:04:14 -08:00
26a68ca2cf
Polish
2021-01-11 12:04:07 -08:00
31de36565f
Upgrade to Reactor 2020.0.3
...
Closes gh-24698
2021-01-11 16:29:13 +01:00
5ae9fbedcd
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24738
2021-01-11 11:33:30 +00:00
7625a979db
Configure bootRun to use project's Java toolchain by default
...
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.
This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.
Fixes gh-24517
2021-01-11 11:21:53 +00:00
3c3aa9e486
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24735
2021-01-11 11:03:35 +00:00
064de4e073
Check configured JavaLauncher when determining version of the JVM
...
Previously, bootRun assumed that the Java version of the JVM that would
run the application would be the same as the Java version of the JVM
that is running the build. This assumption does not hold true when
Gradle's toolchain support is used to configure tasks that fork a new
JVM to use a version other than that being used by Gradle itself.
This commit updates the BootRun task to query the JavaLauncher property
when determining the version of Java on which the application will be
run. Toolchain support and the JavaLauncher property are new in Gradle
6.7. To support earlier versions of Gradle, NoSuchMethodError is caught
we continue as if no JavaLauncher has been configured and use the local
JVM's Java version.
Fixes gh-24512
2021-01-11 10:36:16 +00:00
097f878981
Upgrade to Kafka 2.6.1
...
Closes gh-24247
2021-01-11 09:20:59 +01:00
50019a7f44
Upgrade to Thymeleaf Layout Dialect 2.5.2
...
Closes gh-24731
2021-01-11 09:20:24 +01:00
aad3de2ba7
Upgrade to Spring Retry 1.3.1
...
Closes gh-24730
2021-01-11 09:20:22 +01:00
d7e6f963ab
Upgrade to Netty 4.1.56.Final
...
Closes gh-24729
2021-01-11 09:20:20 +01:00
5f63b22286
Upgrade to Johnzon 1.2.9
...
Closes gh-24728
2021-01-11 09:20:19 +01:00
8867544d0d
Upgrade to Jetty Reactive HTTPClient 1.1.5
...
Closes gh-24727
2021-01-11 09:20:17 +01:00
fc6fa74691
Upgrade to Jackson Bom 2.11.4
...
Closes gh-24726
2021-01-11 09:20:16 +01:00
d691d63b1e
Upgrade to Hibernate Validator 6.1.7.Final
...
Closes gh-24725
2021-01-11 09:20:14 +01:00
bc0a1ff852
Upgrade to Hibernate 5.4.27.Final
...
Closes gh-24724
2021-01-11 09:20:13 +01:00
487f694872
Upgrade to Dropwizard Metrics 4.1.17
...
Closes gh-24723
2021-01-11 09:20:11 +01:00
a60b5e0f70
Upgrade to Byte Buddy 1.10.19
...
Closes gh-24722
2021-01-11 09:20:10 +01:00
180493422d
Upgrade to AppEngine SDK 1.9.84
...
Closes gh-24721
2021-01-11 09:20:08 +01:00
9e389c8376
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24710
2021-01-08 17:07:45 +00:00
5ad4d627fd
Fix classpath index so entries match those expected by the launcher
...
This reverts commit ad164269e9
2021-01-08 15:32:19 +00:00
b8a1869569
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24707
2021-01-08 15:53:53 +01:00
826d79be3e
Clarify behaviour of WebServerFactory in reference guide
...
Closes gh-24705
2021-01-08 15:50:16 +01:00
40f1f9a25c
Start building against Spring Kafka 2.6.5 snapshots
...
See gh-24703
2021-01-08 09:24:42 +01:00
a27b87a118
Start building against Spring AMQP 2.3.3 snapshots
...
See gh-24702
2021-01-08 09:23:34 +01:00
0bfb072467
Start building against Spring Integration 5.4.3 snapshots
...
See gh-24701
2021-01-08 09:22:59 +01:00
5bfc0285c6
Start building against Spring Data 2020.0.3 snapshots
...
See gh-24700
2021-01-08 09:22:03 +01:00
11d20eba82
Start building against Spring Framework 5.3.3 snapshots
...
See gh-24699
2021-01-08 08:36:21 +01:00
9f70b71036
Start building against Reactor 2020.0.3 snapshots
...
See gh-24698
2021-01-08 08:35:34 +01:00
210438ee5b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24689
2021-01-07 15:59:37 -06:00
a302238e21
Remove layout parameters from build-image Maven goal
...
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.
Fixes gh-24105
2021-01-07 15:59:02 -06:00
ef7a82756e
Allow overriding ThemeResolver and FlashMapManager beans
...
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.
Fixes gh-24207
2021-01-07 10:29:13 -06:00
17c0c7d9d6
Fix javadoc typo in ConfigDataLocation
...
See gh-24660
2021-01-06 17:39:39 -08:00
48661e79f5
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24683
2021-01-06 17:30:55 -08:00
7cbd57b635
Log FailureAnalyzer errors at trace level
...
Update `FailureAnalyzers` to log errors at `trace` rather than `debug`.
This should reduce noise when an analyzer unexpectedly fails and the
user is running with `--debug`.
Fixes gh-24630
2021-01-06 17:29:24 -08:00
76aa33b65a
Merge branch '2.3.x' into 2.4.x
2021-01-06 17:01:53 -08:00
a24ec9d372
Merge branch '2.2.x' into 2.3.x
2021-01-06 17:01:22 -08:00
46629ef5e4
Migrate away from pivotal-legacy/homebrew-tap
...
Update formula to use spring-boot rather than springboot. This will
allow both taps to be used at the same time.
See gh-24659
2021-01-06 16:58:05 -08:00
04616a01cf
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24681
2021-01-06 16:47:24 -08:00
ef09982b39
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24680
2021-01-06 16:46:50 -08:00
25033ee5e7
Migrate away from pivotal-legacy/homebrew-tap
...
Update reference documentation to the new spring-io/homebrew-tap repo.
Closes gh-24659
2021-01-06 16:45:10 -08:00
920136d908
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24678
2021-01-06 16:44:32 -08:00
73a2a4b383
Consider context-path for WebTestClient baseUrl
...
Fixes gh-24168
2021-01-06 16:42:09 -08:00
5b126b01c0
Replace binder as contributors are processed
...
Update `ConfigDataEnvironment` so that the bootstrap `Binder` is
replaced as contributors are processed. The final `Binder` is now
also added without the `FAIL_ON_BIND_TO_INACTIVE_SOURCE` option so
that properties can be bound at the last stage even if values exist
in an inactive profile-specific document.
Closes gh-24669
2021-01-06 13:31:29 -08:00
ac4243d615
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24672
2021-01-06 12:33:53 -08:00
52e47c4275
Fix test for JSR-350 @Nonnull
...
Closes gh-24647
2021-01-06 12:33:25 -08:00
2b497b6aff
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24670
2021-01-06 12:23:45 -08:00
848ed65f5b
Add test for JSR-350 @Nonnull
...
Closes gh-24647
2021-01-06 12:04:58 -08:00
c014bb9880
Merge branch '2.3.x' into 2.4.x
...
See gh-24647
2021-01-06 14:24:13 +01:00
67d1f355d7
Fix Nullable reference
...
See gh-24647
2021-01-06 14:23:38 +01:00
4e6f15a466
Merge branch '2.3.x' into 2.4.x
...
See gh-24647
2021-01-06 08:58:48 +01:00
2bd78355dc
Reference javax.annotation.Nonnull support in reference guide
...
See gh-24647
2021-01-06 08:58:13 +01:00
c9f9246c59
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24657
2021-01-05 16:03:01 -08:00
9b9c3edfcd
Polish "Return -1 port for non-listening WebServers"
...
See gh-24606
2021-01-05 16:02:26 -08:00
5c61df3131
Return -1 port for non-listening WebServers
...
Update `WebServer` implementations to return -1 from `getPort()` if
the server isn't listening on a port. This aligns the implementations
with the interface Javadoc.
See gh-24606
2021-01-05 15:56:25 -08:00
ab8080353e
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24654
2021-01-05 14:08:41 -08:00
2ad9a47d08
Support JSR-305 annotations on endpoint methods
...
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.
Closes gh-24647
2021-01-05 14:07:22 -08:00
505340909a
Support symlinks in configtree property paths
...
Prior to this commit, the configtree property source would not traverse
into a sub-directory in a property path if the sub-directory was a
symbolic link. This commit allows symlinked sub-directories to be
traversed like any other sub-directory in the property path.
Fixes gh-24530
2021-01-05 14:04:59 -06:00
615a8ae56e
Ignore documents that do not apply when checking mandatory locations
...
Closes gh-24584
2021-01-05 10:47:06 -08:00
89f29c933f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24649
2021-01-05 17:13:30 +00:00
fe3217d2c4
Exclude starters from Javadoc aggregation
...
See gh-24648
2021-01-05 17:12:39 +00:00
e1ec70ac36
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24643
2021-01-05 08:28:13 +01:00
f33c7bc27c
Polish "Remove unnecessary semicolon"
...
See gh-24628
2021-01-05 08:24:03 +01:00
097104584c
Remove unnecessary semicolon
...
See gh-24628
2021-01-05 08:15:32 +01:00
86e94b95c3
Merge branch '2.3.x' into 2.4.x
2021-01-04 13:36:36 -08:00
9928d74a9e
Revert fix to enable cors for actuator endpoints
...
The fix causes a Jersey application to fail in the absence
of a `CorsFilter` or `CorsConfigurationSource` bean.
See gh-11987
2021-01-04 12:25:43 -08:00
c19f7e696e
Polish
...
See gh-24597
2021-01-04 16:39:27 +01:00
1bc1258341
Polish "Make a field final"
...
See gh-24629
2021-01-03 17:58:46 +01:00
0e3990931e
Make a field final
...
See gh-24629
2021-01-03 17:58:14 +01:00
052565ef2b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24626
2021-01-01 09:18:13 +01:00
261b7a5b18
Update copyrights to 2021
...
See gh-24625
2021-01-01 09:17:13 +01:00
5e3f618f9d
Polish
...
See gh-24604
2020-12-23 16:08:21 +01:00
e3d7ab0e3b
Merge branch '2.3.x' into 2.4.x
2020-12-23 16:08:08 +01:00
d0a1c49873
Polish
...
See gh-24604
2020-12-23 16:07:27 +01:00
1261e08371
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24602
2020-12-23 11:14:37 +01:00
d86eba3b6b
Upgrade to Thymeleaf 3.0.12
...
Closes gh-24599
2020-12-23 10:57:36 +01:00
ff59bb3abf
Configure resources filtering encoding
...
Closes gh-24576
2020-12-23 10:44:06 +01:00
4cdfd6f13d
Polish "Handle missing manifest files in JarTypeFilter"
...
See gh-24597
2020-12-23 09:12:58 +01:00
86eecb01b3
Handle missing manifest files in JarTypeFilter
...
This commit makes sure that a jar file without a manifest is handled
properly (i.e. included in the repackaged archive).
See gh-24597
2020-12-23 09:11:24 +01:00
b29ac37db6
Add docs about using InMemoryOAuth2AuthorizedClientService
...
Closes gh-24596
2020-12-22 12:18:47 -08:00
a0afec120d
Add docs about using InMemoryOAuth2AuthorizedClientService
...
Closes gh-24313
2020-12-22 12:13:17 -08:00
a714ba44ea
Update documentation containing examples of WebSecurityConfigurerAdapter
...
Closes gh-24551
2020-12-22 11:17:30 -08:00
0691ba600f
Polish "Detect Persistent and RelationshipProperties with Neo4j"
...
See gh-24239
2020-12-22 12:30:48 +01:00
ab4b1c4e61
Detect Persistent and RelationshipProperties with Neo4j
...
See gh-24239
2020-12-22 12:15:03 +01:00
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
Stephane Nicoll
Phillip Webb
Andy Wilkinson
Scott Frederick
asheCarry
Madhura Bhave
Stefan Partusch
dreis2211
Andrey Kolchanov
izeye
Rob Edwards
Gerrit Meier
Phillip Webb
Billy T. Hernandez
Jim Stockwell
João Guerra
Tobias Gesellchen
xJoeWoo
Wanderlei Souza
Artem Bilan
Stephane Nicoll
Peter Paul Bakker
Sergey Kolesnikov