Commit Graph

465 Commits (f87b2478d508600d8b100d0ed9658640b2cc0cb3)

Author SHA1 Message Date
Andy Wilkinson 970f933806 Merge branch '2.3.x' into 2.4.x
Closes gh-26450
4 years ago
Andy Wilkinson 2dd94b5554 Polish "Use try-with-resources statement"
See gh-26449
4 years ago
weixsun 5ba9db391f Use try-with-resources statements
See gh-26449
4 years ago
Stephane Nicoll ffbd3b819f Update copyright year of changed file
See gh-26417
4 years ago
nguyensach c82de83202 Use try-with-resources statement
See gh-26417
4 years ago
Andy Wilkinson d18af399f9 Merge branch '2.4.x'
Closes gh-26352
4 years ago
Andy Wilkinson 1417c1b0c4 Merge branch '2.3.x' into 2.4.x
Closes gh-26351
4 years ago
Andy Wilkinson 4c42810df9 Ensure that server tests pick up latest snapshots
Closes gh-25921
4 years ago
Andy Wilkinson 47516b50c3 Merge branch '2.4.x'
Closes gh-26246
4 years ago
Andy Wilkinson b1c32f2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-26245
4 years ago
Andy Wilkinson ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests
Fixes gh-26240
4 years ago
Phillip Webb beaf03a008 Update copyright year of changed files 4 years ago
Phillip Webb 6cc116b9fb Merge branch '2.4.x' 4 years ago
Phillip Webb c0e12ce5a3 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb f29c707e6c Increase SampleSessionApplicationTests timeout
Increase timeout in `SampleSessionApplicationTests` to fix flaky local
builds.
4 years ago
dreis2211 4a1924ed73 Fix Spring Data Elasticsearch deprecations
See gh-26078
4 years ago
Andy Wilkinson 288e86d871 Revert "Work around micrometer-metrics/micrometer#2557"
This reverts commit 5e03612a53.

Closes gh-26003
4 years ago
Andy Wilkinson 5e03612a53 Work around micrometer-metrics/micrometer#2557
Closes gh-26002
4 years ago
Andy Wilkinson 67c81100de Merge branch '2.4.x'
Closes gh-25991
4 years ago
Andy Wilkinson 2b9ba96287 Merge branch '2.3.x' into 2.4.x
Closes gh-25990
4 years ago
Andy Wilkinson 0bc5c2ba8c Ensure that containers' static resource handling not MVC's is used
Closes gh-25949
4 years ago
Stephane Nicoll b11602aeaa Polish "Add Quartz actuator endpoint"
This commit reworks the initial proposal so that jobs and triggers are
treated as first class concepts.

`/actuator/quartz` now returns the group names for jobs and triggers.

`actuator/quartz/jobs` returns the job names, keyed by the available
group names, while `/actuator/quartz/triggers` does the same for
triggers.

`/actuator/jobs/{groupName}` provides an overview of a job group. It
provides a map of job names with the class name of the job.
implementation

`/actuator/triggers/{groupName}` provides an overview of a trigger
group. There are five supported trigger implementations: cron, simple,
daily time interval, calendar interval, and custom for any other
implementation. Given that each implementation has specific settings,
triggers are split in five objects.

`/actuator/jobs/{groupName}/{jobName}` provides the full details of a
particular job. This includes a sanitized data map and a list of
triggers ordered by next fire time.

`/actuator/triggers/{groupName}/{triggerName}` provides the full details
of a particular trigger. This includes the state, its type, and a
dedicate object containing implementation-specific settings.

See gh-10364
4 years ago
Andy Wilkinson e49a88cb9b Auto-configure script-based R2DBC database initialization
See gh-24741
4 years ago
dreis2211 a9a37f0dd5 Increase test coverage on Java 16
See gh-25809
4 years ago
Phillip Webb 8da82d2d36 Merge branch '2.4.x'
Closes gh-25790
4 years ago
Phillip Webb 35aeae5a4f Deprecate Bootstrapper
Deprecate the `Bootstrapper` interface entirely and provide a
`BootstrapRegistryInitializer` alternative so that people can migrate.

Unfortunately our previous attempt to fix the typo in the `Bootstrapper`
interface didn't provide us a way to remove the deprecated method
without impacting users. It was also problematic for people who were
implementing `Bootstrapper` rather than using a lambda since they needed
to introduce the deprecated method.

We unfortunately can't see a way to fix the original typo without
introducing a new interface.

Fixes gh-25735
4 years ago
Stephane Nicoll e517ee8635 Merge branch '2.4.x'
Closes gh-25618
4 years ago
izeye 09f4d4b9bf Polish
See gh-25617
4 years ago
Andy Wilkinson 4b0600b558 Merge branch '2.4.x'
Closes gh-25576
4 years ago
Andy Wilkinson 3cc36d518d Merge branch '2.3.x' into 2.4.x
Closes gh-25575
4 years ago
Andy Wilkinson 4d3d56abfe Try to stabilize SampleSessionWebFluxApplicationTests
userDefinedMappingsSecureByDefault in
SampleSessionWebFluxApplicationTests may fail with an NPE if the
session times out before the initial response is sent due to the absence
of a SESSION cookie in the response. The test uses a short session
timeout (2 seconds) and we've seen the problem occur on CI when,
presumably, a noisy neighbour has caused some CPU starvation.

This commit increases the timeout to 5 seconds to reduce the chance of
a short period of CPU starvation causing the test to fail.

Closes gh-25572
4 years ago
Andy Wilkinson 5863edfdda Simplify code that makes hal the default json media type
See gh-25546
4 years ago
Andy Wilkinson ed72bca6c8 Provide more pluggable way to indicate DataSource init dependencies
Closes gh-17619
Closes gh-25559
4 years ago
Stephane Nicoll 6aaf9f47be Merge branch '2.4.x'
Closes gh-25524
4 years ago
dreis2211 1a803448f0 Exclude GradleBuild tasks on JDK 16 for now
See gh-25523
4 years ago
Andy Wilkinson 3b235e4960 Merge branch '2.4.x'
See gh-25482
4 years ago
Andy Wilkinson f85c7c9ef1 Merge branch '2.3.x' into 2.4.x
See gh-25481
4 years ago
Andy Wilkinson da3920bd46 Wait for process to exit to avoid race with file deletion
See gh-25457
4 years ago
Andy Wilkinson 4a74521174 Merge branch '2.4.x'
See gh-25482
4 years ago
Andy Wilkinson fefd49cce7 Merge branch '2.3.x' into 2.4.x
See gh-25481
4 years ago
Andy Wilkinson c5cfb8750b Delete files after destroying processes that may be accessing them
Closes gh-25457
4 years ago
Andy Wilkinson 59d8c97634 Merge branch '2.4.x'
Closes gh-25482
4 years ago
Andy Wilkinson e984f0ca31 Merge branch '2.3.x' into 2.4.x
Closes gh-25481
4 years ago
dreis2211 b0a6e92fb6 Speed up spring-boot-server-tests
See gh-25457
4 years ago
Andy Wilkinson c35a4cc283 Merge branch '2.4.x'
See gh-25450
4 years ago
Andy Wilkinson 12d3b15244 Ensure that Jersey's filter has a servlet at the end of its chain
See gh-25449
4 years ago
Andy Wilkinson 54ba9e6ddf Merge branch '2.4.x'
Closes gh-25450
4 years ago
Andy Wilkinson cb600f1c0b Merge branch '2.3.x' into 2.4.x
Closes gh-25449
4 years ago
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 8ada183422 Merge branch '2.4.x'
Closes gh-25448
4 years ago
Andy Wilkinson 24b2bb9202 Merge branch '2.3.x' into 2.4.x
Closes gh-25447
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 888ca442fa Merge branch '2.4.x'
Closes gh-25441
4 years ago
Andy Wilkinson 62737b1274 Merge branch '2.3.x' into 2.4.x
Closes gh-25440
4 years ago
dreis2211 8bacbff629 Remove spring-boot-smoke-test-jta-jndi
See gh-25434
4 years ago
Andy Wilkinson 2f83a6714b Rework DataSource initialization
Previously, DataSource initialization was triggered via a
BeanPostProcessor or a schema created event from JPA. This caused
numerous problems with circular dependencies, bean lifecycle, etc and
added significant complexity.

This commit reworks DataSource initialization to remove the use of a
BeanPostProcessor entirely. In its place, DataSource initialization is
now driven by an InitializingBean with dependency relationships
between beans ensuring that initialization has been performed before
the DataSource is used. This aligns with the approach that's worked
well with Flyway and Liquibase.

More changes are planned to further simplify DataSource initialization.
The changes in this commit are a foundation for those changes. Any new
public API in this commit is highly likely to change before the next
GA.

Fixes gh-13042
Fixes gh-23736
4 years ago
Andy Wilkinson db781a0d84 Merge branch '2.4.x'
See gh-25077
4 years ago
Andy Wilkinson 788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
4 years ago
Andy Wilkinson 67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
4 years ago
Phillip Webb d8b6960997 Merge branch '2.4.x'
Closes gh-25077
4 years ago
Phillip Webb 257608a3a3 Merge branch '2.3.x' into 2.4.x
Closes gh-25076
4 years ago
Phillip Webb 939b5dfc26 Add junit-platform-launcher dependency
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
4 years ago
Phillip Webb c9a2c4e326 Merge branch '2.4.x' 4 years ago
Madhura Bhave d07e351eff Polish " Change info endpoint to be secure and unexposed by default"
See gh-24715
4 years ago
Hatef Palizgar 53c1e79810 Change info endpoint to be secure and unexposed by default
See gh-24715
4 years ago
Phillip Webb a196a9bd8f Merge branch '2.4.x'
Closes gh-24949
4 years ago
Phillip Webb 69fbd2f8aa Delegate `usesPathPatterns()` call to mappings
Update `CompositeHandlerMapping` so that the `usesPathPatterns()` method
returns `true` if any of the delegate mappings return `true`.

Closes gh-24877
4 years ago
Stephane Nicoll 012a199773 Remove Spring Data Solr support
In preparation to the upgrade to Spring Data 2021.0, this commit removes
auto-configuration for Spring Data Solr.

Closes gh-24939
4 years ago
Stephane Nicoll a18f01addf Remove bitronix support
See gh-24806
4 years ago
Madhura Bhave b62325a056 Merge branch '2.4.x' 4 years ago
Madhura Bhave 86e94b95c3 Merge branch '2.3.x' into 2.4.x 4 years ago
Madhura Bhave 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
4 years ago
Stephane Nicoll 1e8d5c37ed Merge branch '2.4.x'
Closes gh-24607
4 years ago
izeye 5e3f618f9d Polish
See gh-24604
4 years ago
Phillip Webb 82791b4eda Improve performance of Tomcat 'jar:war:file' URLs
Update jar `Handler` fallback logic to directly support Tomcat
'jar:war:file' URLs. This commit allows contents to be accessed without
the JDK needing to extracted the nested jar to the temporary folder.

Closes gh-24553
4 years ago
Phillip Webb abd0b484bc Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb b351288f48 Fix integration test app detection
See gh-18631
4 years ago
Phillip Webb a2a153ade6 Fix name clash with integration test apps
Rename "app" projects in `spring-boot-launch-script-tests` and
`spring-boot-loader-tests` to something unique.

See gh-18631
4 years ago
Phillip Webb 0730949325 Merge branch '2.3.x' into 2.4.x
Closes gh-24554
4 years ago
Phillip Webb 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
4 years ago
Madhura Bhave a1ea5b49ec Merge branch '2.3.x' into 2.4.x
Closes gh-24542
4 years ago
Madhura Bhave 09e07428cc Configure CORS in default security configuration for MVC
Fixes gh-11987
4 years ago
Phillip Webb 72d36e0c07 Update copyright year of changed files 4 years ago
Stephane Nicoll 60530b9b5b Merge branch '2.3.x'
Closes gh-24348
4 years ago
Stephane Nicoll 07e32bf52e Merge branch '2.2.x' into 2.3.x
Closes gh-24347
4 years ago
Stephane Nicoll f64b7f8465 Use proper CentOS base image
See gh-24344
4 years ago
Stephane Nicoll a5a8545801 Switch integration tests to CentOS 7
This commit upgrades the docker image for CentOS to Centos 7.9 as
CentOs 6 is EOL since November 30. Given that CentOS 7 does no longer
support SysVinit, this commit also updates the integration tests to not
test this OS anymore.

Closes gh-24344
4 years ago
Phillip Webb 30c27274e2 Merge branch '2.3.x'
Closes gh-24339
4 years ago
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
4 years ago
Phillip Webb 837fc83527 Fix checkstyle header violations
See gh-24337
4 years ago
Andy Wilkinson e4380275e5 Merge branch '2.3.x'
Closes gh-24224
4 years ago
Andy Wilkinson 4e9f702681 Only run deployment tests when war has material changes
Closes gh-24137
4 years ago
Andy Wilkinson 4a9ca33026 Upgrade to Micrometer 1.6.1
Closes gh-24051
4 years ago
Stephane Nicoll b6fc0913cf Merge branch '2.3.x'
Closes gh-24104
4 years ago
Stephane Nicoll 515b18e142 Merge branch '2.3.x'
Closes gh-24108
4 years ago
Stephane Nicoll 9e901b6e07 Upgrade to Testcontainers 1.15.0
Closes gh-24103
4 years ago
Stephane Nicoll 23ad2b4156 Rationalize Testcontainers image versions
This commit rationalizes the Docker image names used in integration
tests.

Closes gh-24107
4 years ago
Andy Wilkinson 43b0e2f25c Work around Micrometer JvmGcMetrics introspection failure
Closes gh-23998
4 years ago
Andy Wilkinson 4a47ed97b8 Merge branch '2.3.x'
Closes gh-23997
4 years ago