Commit Graph

31075 Commits

Author SHA1 Message Date
Andy Wilkinson
c35a4cc283 Merge branch '2.4.x'
See gh-25450
2021-02-26 15:46:52 +00:00
Andy Wilkinson
12d3b15244 Ensure that Jersey's filter has a servlet at the end of its chain
See gh-25449
2021-02-26 15:42:13 +00:00
Andy Wilkinson
54ba9e6ddf Merge branch '2.4.x'
Closes gh-25450
2021-02-26 14:30:47 +00:00
Andy Wilkinson
cb600f1c0b Merge branch '2.3.x' into 2.4.x
Closes gh-25449
2021-02-26 14:26:57 +00:00
Andy Wilkinson
8f72ca6521 Use ResourceConfig customization to register endpoints with Jersey
Previously, actuator endpoints were registered with Jersey upon
injection of the ResourceConfig bean into a registrar class rather than
using a ResourceConfigCustomizer. This was done to fix a problem
when running the Actuator on a separate port where the main application
context's customizers were also applied to the management context,
breaking the singleton contract for those resources. This approach
meant that the registration could be performed at any point after the
ResourceConfig had been created. When Jersey's configured as a Filter
this resulted in the registration failing as the attempt was being made
after the Filter lifecyle callbacks which make the ResourceConfig
immutable.

This commit reworks the endpoint registration to be performed using a
ManagementContextResourceConfigCustomizer, a resource config customizer
that's only applied to the ResourceConfig that's used by the Actuator.
When there's a separate management context, this ResourceConfig is
created by the Actuator's auto-configuration and the management context
resource config customizers are applied to it during its creation. The
main application's customizers are not applied. When the actuator is
using the same context as the main application, this ResourceConfig is
created by the main application. In this case a
ResourceConfigCustomizer is defined that delegates to all
ManagementContextResourceConfigCustomizers, allowing them to register
the actuator endpoints with the main ResourceConfig.

Fixes gh-25262
2021-02-26 14:25:24 +00:00
Andy Wilkinson
8ada183422 Merge branch '2.4.x'
Closes gh-25448
2021-02-26 14:07:00 +00:00
Andy Wilkinson
24b2bb9202 Merge branch '2.3.x' into 2.4.x
Closes gh-25447
2021-02-26 14:06:42 +00:00
Andy Wilkinson
1e6506934b Merge pull request #25446 from dreis2211
* gh-25446:
  Split DeploymentIntegrationTests by container
  Rename DeploymentIntegrationTests

Closes gh-25446
2021-02-26 14:06:31 +00:00
dreis2211
4ff9e5edaa Split DeploymentIntegrationTests by container
Prior to this commit, every test started a new testcontainer. By splitting the
tests apart we can make use of static containers that are only instantiated once
per application (TomEE, Wildfly etc.)

See gh-25446
2021-02-26 14:04:17 +00:00
dreis2211
d55d8d6b19 Rename DeploymentIntegrationTests
See gh-25446
2021-02-26 14:04:08 +00:00
Andy Wilkinson
9713bfc765 Enable the logging shutdown hook by default
This commit updates LoggingApplicationListener to register the logging
shutdown hook by default.

The hook is detrimental in a war deployment as it may pin parts of an
application in memory after it has been undeployed. For this reason,
the hook is still disabled by default in war deployments. This is
achieved by setting an attribute on the servlet context in
SpringBootServletInitializer that is then consumed via the Environment
by LoggingApplicationListener.

Closes gh-25046
2021-02-26 14:00:08 +00:00
Andy Wilkinson
33b3753077 Merge pull request #25445 from dreis2211
* gh-25445:
  Ignore empty prefixes in new PrefixedConfigurationPropertySource

Closes gh-25445
2021-02-26 10:18:48 +00:00
dreis2211
4b694560eb Ignore empty prefixes in new PrefixedConfigurationPropertySource
See gh-25445
2021-02-26 10:18:03 +00:00
Madhura Bhave
a8592f36d4 Add prefix support for property source
We configure the `SystemEnvironmentPropertySource` as a `Prefixed` property
source. When adapting this to a `ConfigurationPropertySource, a
`PrefixedConfigurationPropertySource` will be created for it.
A `PrefixedConfigurationPropertySource` will resolve property
such as `foo.bar` to `my.foo.bar` for a prefix of `my`.

Closes gh-3450
2021-02-25 12:53:34 -08:00
Andy Wilkinson
888ca442fa Merge branch '2.4.x'
Closes gh-25441
2021-02-25 18:04:25 +00:00
Andy Wilkinson
62737b1274 Merge branch '2.3.x' into 2.4.x
Closes gh-25440
2021-02-25 18:04:10 +00:00
Andy Wilkinson
04e1ad614c Merge pull request #25434 from dreis2211
* gh-25434:
  Remove spring-boot-smoke-test-jta-jndi

Closes gh-25434
2021-02-25 18:03:56 +00:00
dreis2211
8bacbff629 Remove spring-boot-smoke-test-jta-jndi
See gh-25434
2021-02-25 18:02:25 +00:00
Andy Wilkinson
b36caec413 Merge branch '2.4.x'
Closes gh-25438
2021-02-25 17:33:00 +00:00
Andy Wilkinson
d48551ff12 Merge branch '2.3.x' into 2.4.x
Closes gh-25437
2021-02-25 17:32:40 +00:00
Andy Wilkinson
94fe45a371 Merge pull request #25409 from wolfs
* gh-25409:
  Enable stricter validation for Gradle plugin

Closes gh-25409
2021-02-25 17:32:19 +00:00
Stefan Wolf
86ca32e694 Enable stricter validation for Gradle plugin
See gh-25409
2021-02-25 17:28:51 +00:00
Stephane Nicoll
9e3cfc5d7a Merge branch '2.4.x'
Closes gh-25432
2021-02-25 15:58:51 +01:00
Stephane Nicoll
2fde67dc10 Merge pull request #25411 from jxblum
* pr/25411:
  Fix grammatical error in documentation

Closes gh-25411
2021-02-25 15:58:35 +01:00
John Blum
cec4d45cf6 Fix grammatical error in documentation
See gh-25411
2021-02-25 15:57:56 +01:00
Andy Wilkinson
84984fb148 Merge branch '2.4.x'
Closes gh-25431
2021-02-25 14:28:41 +00:00
Andy Wilkinson
ecf8437d4a Merge branch '2.3.x' into 2.4.x
Closes gh-25430
2021-02-25 14:28:28 +00:00
Andy Wilkinson
cda7c686fd Merge pull request #25412 from dreis2211
* gh-25412:
  Update Testcontainers image versions

Closes gh-25412
2021-02-25 14:28:19 +00:00
dreis2211
101d88a840 Update Testcontainers image versions
See gh-25412
2021-02-25 14:27:41 +00:00
Andy Wilkinson
10109e75b3 Upgrade to Testcontainers 1.15.2
Closes gh-25429
2021-02-25 13:53:29 +00:00
Andy Wilkinson
d822604ed2 Upgrade to MockK 1.10.6
Closes gh-25428
2021-02-25 13:53:27 +00:00
Andy Wilkinson
f411bcd1a5 Upgrade to Maven Resolver 1.6.1
Closes gh-25427
2021-02-25 13:53:26 +00:00
Andy Wilkinson
f876f413c9 Upgrade to Maven Invoker 3.1.0
Closes gh-25426
2021-02-25 13:53:25 +00:00
Andy Wilkinson
bc9637c8b3 Upgrade to Maven Common Artifact Filters 3.2.0
Closes gh-25425
2021-02-25 13:53:24 +00:00
Andy Wilkinson
e99184bb7f Upgrade to JNA 5.7.0
Closes gh-25424
2021-02-25 13:53:22 +00:00
Andy Wilkinson
8d7bdb3762 Merge branch '2.4.x' 2021-02-25 13:52:13 +00:00
Andy Wilkinson
b477312100 Upgrade to Testcontainers 1.15.2
Closes gh-25423
2021-02-25 13:51:44 +00:00
Andy Wilkinson
9af8ad432a Upgrade to MockK 1.10.6
Closes gh-25422
2021-02-25 13:51:43 +00:00
Andy Wilkinson
070d3d434c Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25421
2021-02-25 13:51:41 +00:00
Andy Wilkinson
0d781b5619 Merge branch '2.3.x' into 2.4.x 2021-02-25 13:51:03 +00:00
Andy Wilkinson
5f0d72487e Upgrade to Testcontainers 1.15.2
Closes gh-25420
2021-02-25 13:50:16 +00:00
Andy Wilkinson
ac78f55ba8 Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25419
2021-02-25 13:48:53 +00:00
Scott Frederick
4be04b0ea2 Support image building with Maven and war packaging
This commit updates the Maven image building goal to support building
images from executable and non-executable war files.

Fixes gh-23823
2021-02-24 15:23:33 -06:00
Scott Frederick
a80c4ad38d Support image building with Gradle and war packaging
This commit updates the Gradle image building task to support building
images from executable and non-executable war files.

Fixes gh-23825
2021-02-24 14:42:46 -06:00
Andy Wilkinson
f09630f73c Allow additional keys to be configured for value sanitization
Closes gh-25384
2021-02-24 19:28:29 +00:00
Andy Wilkinson
10ef991e1d Sanitize sensitive portion of the value of url and urls keys
Closes gh-25387
2021-02-24 14:42:25 +00:00
Andy Wilkinson
e3ad6b5c35 Merge branch '2.4.x'
Closes gh-25407
2021-02-24 12:27:41 +00:00
Andy Wilkinson
29bbbc3b79 Merge branch '2.3.x' into 2.4.x
Closes gh-25406
2021-02-24 12:27:23 +00:00
Andy Wilkinson
11b77037f1 Make TestFailuresPlugin compatible with Gradle's configuration cache
Closes gh-25405
2021-02-24 12:26:03 +00:00
Andy Wilkinson
9836b060d4 Test the Gradle plugin against 7.0-milestone-2
Closes gh-25404
2021-02-24 11:28:45 +00:00