Commit Graph

30675 Commits (ace3376a0be1e6a1ef855b86a28edfa2c77fac53)
 

Author SHA1 Message Date
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
4 years ago
Andy Wilkinson 24b2bb9202 Merge branch '2.3.x' into 2.4.x
Closes gh-25447
4 years ago
Andy Wilkinson 1e6506934b Merge pull request #25446 from dreis2211
* gh-25446:
  Split DeploymentIntegrationTests by container
  Rename DeploymentIntegrationTests

Closes gh-25446
4 years ago
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
4 years ago
dreis2211 d55d8d6b19 Rename DeploymentIntegrationTests
See gh-25446
4 years ago
Andy Wilkinson 62737b1274 Merge branch '2.3.x' into 2.4.x
Closes gh-25440
4 years ago
Andy Wilkinson 04e1ad614c Merge pull request #25434 from dreis2211
* gh-25434:
  Remove spring-boot-smoke-test-jta-jndi

Closes gh-25434
4 years ago
dreis2211 8bacbff629 Remove spring-boot-smoke-test-jta-jndi
See gh-25434
4 years ago
Andy Wilkinson d48551ff12 Merge branch '2.3.x' into 2.4.x
Closes gh-25437
4 years ago
Andy Wilkinson 94fe45a371 Merge pull request #25409 from wolfs
* gh-25409:
  Enable stricter validation for Gradle plugin

Closes gh-25409
4 years ago
Stefan Wolf 86ca32e694 Enable stricter validation for Gradle plugin
See gh-25409
4 years ago
Stephane Nicoll 2fde67dc10 Merge pull request #25411 from jxblum
* pr/25411:
  Fix grammatical error in documentation

Closes gh-25411
4 years ago
John Blum cec4d45cf6 Fix grammatical error in documentation
See gh-25411
4 years ago
Andy Wilkinson ecf8437d4a Merge branch '2.3.x' into 2.4.x
Closes gh-25430
4 years ago
Andy Wilkinson cda7c686fd Merge pull request #25412 from dreis2211
* gh-25412:
  Update Testcontainers image versions

Closes gh-25412
4 years ago
dreis2211 101d88a840 Update Testcontainers image versions
See gh-25412
4 years ago
Andy Wilkinson b477312100 Upgrade to Testcontainers 1.15.2
Closes gh-25423
4 years ago
Andy Wilkinson 9af8ad432a Upgrade to MockK 1.10.6
Closes gh-25422
4 years ago
Andy Wilkinson 070d3d434c Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25421
4 years ago
Andy Wilkinson 0d781b5619 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson 5f0d72487e Upgrade to Testcontainers 1.15.2
Closes gh-25420
4 years ago
Andy Wilkinson ac78f55ba8 Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25419
4 years ago
Andy Wilkinson 29bbbc3b79 Merge branch '2.3.x' into 2.4.x
Closes gh-25406
4 years ago
Andy Wilkinson 11b77037f1 Make TestFailuresPlugin compatible with Gradle's configuration cache
Closes gh-25405
4 years ago
Andy Wilkinson 999c36b6f2 Merge branch '2.3.x' into 2.4.x
Closes gh-25393
4 years ago
Andy Wilkinson a1a61a44cb Upgrade to Gradle 6.8.3
Closes gh-25392
4 years ago
Stephane Nicoll 7c5a5c6663 Merge branch '2.3.x' into 2.4.x
Closes gh-25385
4 years ago
Stephane Nicoll e41f7fec23 Merge pull request #25382 from mustafau
* pr/25382:
  Update copyright year of changed file
  Fix wording error in build-info goal description

Closes gh-25382
4 years ago
Stephane Nicoll 77daae1480 Update copyright year of changed file
See gh-25382
4 years ago
Mustafa Ulu abc90db32f Fix wording error in build-info goal description
See gh-25382
4 years ago
Stephane Nicoll 9e6302ee6a Merge branch '2.3.x' into 2.4.x
Closes gh-25371
4 years ago
Stephane Nicoll c867b2c293 Merge pull request #25353 from shakuzen
* pr/25353:
  Polish HTTP client metrics documentation wording

Closes gh-25353
4 years ago
Tommy Ludwig bd2a890899 Polish HTTP client metrics documentation wording
See gh-25353
4 years ago
Spring Buildmaster d2abf64a44 Next development version (v2.4.4-SNAPSHOT) 4 years ago
Stephane Nicoll 526474f3b8 Add username alias for Postgres's PGSimpleDataSource
Closes gh-25363
4 years ago
Andy Wilkinson bb56de715b Upgrade to Spring Security 5.4.5
This commit also downgrade JOSE JWT to address an incompatibility with
the OIDC SDK 8.x. The OIDC SDK has also been upgraded to the latest 8.x
release to align with the version used by Spring Security.

Closes gh-25221
Fixes gh-25070
4 years ago
Andy Wilkinson 08f73e01da Upgrade to Spring Kafka 2.6.6
Closes gh-25292
4 years ago
Andy Wilkinson 50a258a9ec Upgrade to Spring Integration 5.4.4
Closes gh-25289
4 years ago
Andy Wilkinson 332ab5e1c6 Upgrade to Spring AMQP 2.3.5
Closes gh-25290
4 years ago
Andy Wilkinson a2695f215c Upgrade to Spring Data 2020.0.5
Closes gh-25002
4 years ago
Andy Wilkinson 0a72f4de81 Merge branch '2.3.x' into 2.4.x
Closes gh-25357
4 years ago
Andy Wilkinson 90fb65d4ea Upgrade to 0.0.6 of the changelog generator
Closes gh-25355
4 years ago
Andy Wilkinson 83a18a31ea Start using 0.0.6 snapshots of the changelog generator
See gh-25355
4 years ago
Andy Wilkinson 04b2f56a4d Merge branch '2.3.x' into 2.4.x
See gh-25343
4 years ago
Andy Wilkinson ceaca0cf6d Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson 532e7587b8 Correct the version input for changelog generation
See gh-25107
4 years ago
Spring Buildmaster 748e52df57 Next development version (v2.3.10.BUILD-SNAPSHOT) 4 years ago
Andy Wilkinson daf067e49a Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson 6eb51eb2c3 Start building against Spring Data 2020.0.5 snapshots
See gh-25002
4 years ago
Andy Wilkinson 78cbe7a4d9 Update Sonatype credentials used to publish to Central 4 years ago