Commit Graph

1106 Commits

Author SHA1 Message Date
Stephane Nicoll
f874c027d8 Polish "Fix dependency management for spring-boot-testcontainers"
See gh-35119
2023-04-25 10:08:20 +02:00
Stephane Nicoll
a323bd90a8 Polish "Reintroduce support for ActiveMQ"
See gh-35048
2023-04-19 13:08:14 +02:00
Phillip Webb
5ac48f5f15 Add testcontainers service connection auto-configuration
Add auto-configuration for `Container` beans that are also
annotated with `@ServiceConnection`. This commit allow
testcontainers to be used at development time and a new section
has been added to the documentation to describe the feature.

Closes gh-35022
2023-04-17 00:49:43 -07:00
Phillip Webb
81a972af8d Refactor testcontainers service connections
Update restcontainers service connections support so that
technology specific `@ServiceConnector` annotations are not longer
required.

A single `@ServiceConnector` annotation can now be used to create
all `ConnectionDetail` beans.

Closes gh-35017
2023-04-17 00:45:39 -07:00
Phillip Webb
11dac5b5b7 Create dedicated spring-boot-testcontainers module
Create a dedicated testcontainers module containing the service
connectors code.

Closes gh-34757
2023-04-17 00:42:31 -07:00
Phillip Webb
00dc942e94 Migrate to Spring Security lambda config
Closes gh-35011
2023-04-14 17:39:48 -07:00
Andy Wilkinson
d4980ea993 Always define connection details beans
Closes gh-34776
2023-04-13 18:02:35 +01:00
Phillip Webb
e9a198a68f Merge branch '3.0.x' 2023-04-12 22:16:35 -07:00
Phillip Webb
8d2f550f8c Merge branch '3.0.x' 2023-04-10 21:14:42 -07:00
Phillip Webb
3ba3558cff Merge branch '2.7.x' into 3.0.x 2023-04-10 21:14:34 -07:00
Phillip Webb
3e9a136143 Polish gradle formatting 2023-04-10 21:14:09 -07:00
Phillip Webb
463701db18 Merge branch '3.0.x' 2023-04-10 16:22:57 -07:00
Phillip Webb
d442bfbeff Polish 2023-04-10 16:22:11 -07:00
Phillip Webb
bb80232fbc Merge branch '3.0.x' 2023-04-07 19:19:04 -04:00
Phillip Webb
25e0954b90 Revert "Set correct Eclipse WTP facet version"
This reverts commit d394ad3d3d.
2023-04-07 19:18:57 -04:00
Phillip Webb
d4c9d265ec Merge branch '3.0.x' 2023-04-07 19:04:19 -04:00
Phillip Webb
d394ad3d3d Set correct Eclipse WTP facet version 2023-04-07 19:03:50 -04:00
Stephane Nicoll
f264e3c65e Upgrade to Hibernate 6.2.0.Final
Closes gh-34876
2023-04-06 16:25:23 +02:00
Andy Wilkinson
95f45eab1f Create service connections from Testcontainers-managed containers
Building upon the auto-configuration support for service connections,
this commit adds support for deriving connection details from a
Testcontainers-managed container. Several service-specific
annotations have been introduced. These annotations can be used on a
container field to indicate that it is a source of the details for
a service connection.

See gh-34658

Co-Authored-By: Phillip Webb <pwebb@vmware.com>
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
2023-03-24 10:04:21 +00:00
Andy Wilkinson
f06536f642 Polish Authorization Server auto-configuration 2023-03-22 19:26:38 +00:00
Madhura Bhave
e6f602cec0 Polish "Add Spring Authorization Server support"
See gh-34003
2023-03-21 17:00:35 -07:00
Steve Riesenberg
25d77ee70b Add Spring Authorization Server support
See gh-34003
2023-03-21 17:00:35 -07:00
Andy Wilkinson
a878e6c91c Upgrade to Liquibase 4.20.0
Closes gh-34578
2023-03-10 19:32:14 +00:00
Phillip Webb
e7c668ac71 Merge branch '3.0.x' 2023-03-02 22:42:37 -08:00
Phillip Webb
d1f89db9a2 Merge branch '2.7.x' into 3.0.x 2023-03-02 22:10:01 -08:00
Phillip Webb
d39c94f437 Refine ConfigurationProcessorIntegrationTests resource detection logic 2023-03-02 21:52:53 -08:00
Phillip Webb
b07269a018 Merge branch '3.0.x' 2023-02-21 23:20:07 -08:00
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Moritz Halbritter
93a4e303be Fix flaky SampleJettyApplicationTests
See gh-33553
2023-01-31 12:22:01 +01:00
Moritz Halbritter
64c2320ce1 Polish "Merge pull request #33553 from michaelweidmann"
See gh-33553
2023-01-31 11:43:33 +01:00
Michael Weidmann
93d46d11e9 Add max http response header size configuration for tomcat and jetty
See gh-33553
2023-01-31 11:43:33 +01:00
Krzysztof Krason
6e46423983 Use diamond operators
See gh-33987
2023-01-26 20:35:08 -08:00
Phillip Webb
5120242996 Merge branch '2.7.x' into 3.0.x 2023-01-26 19:41:42 -08:00
Krzysztof Krason
a8958471f6 Switch anonymous inner classes to lambdas
See gh-33987
2023-01-26 19:34:22 -08:00
Andy Wilkinson
433364601d Merge branch '2.7.x' 2023-01-11 17:04:33 +00:00
Andy Wilkinson
3b2e5e5292 Remove references to https://repo.spring.io/release 2023-01-11 17:03:45 +00:00
Phillip Webb
a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Krzysztof Krason
cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2023-01-09 11:10:20 +01:00
Phillip Webb
f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb
6d16aed36e Merge branch '2.7.x' 2022-12-21 22:26:57 -08:00
Phillip Webb
816728186a Clean ant lib folder before build
Update `spring-boot-smoke-test-ant` so that the ant lib folder is always
cleaned. Prior to this commit, it was possible for the folder to contain
stale artifacts.
2022-12-21 22:25:52 -08:00
Phillip Webb
c257f2b1d2 Merge branch '2.7.x' 2022-12-21 11:37:41 -08:00
Phillip Webb
e8e56dbb11 Remove spring-boot-smoke-test-webflux-ssl
Remove `spring-boot-smoke-test-webflux-ssl` since it's more of
an integration test than a smoke test. We could consider
relocating it to `spring-boot-integration-tests` but since we
have unit tests with a mock PCKCS11 security it's probably
best to see if we can get away without it.

See gh-32179
2022-12-21 10:19:03 -08:00
Moritz Halbritter
08659baeba Polish away public modifier on tests 2022-12-16 16:08:44 +01:00
Moritz Halbritter
725337f976 Make fields final
Closes gh-33537
2022-12-16 14:28:44 +01:00
Moritz Halbritter
a4779b7859 Merge branch '2.7.x'
Closes gh-33433
2022-12-01 13:33:43 +01:00
cdanger
716a839d54 Fix bug in webserver start when loading PKCS#11 KeyStore
See gh-32179
2022-12-01 11:53:51 +01:00
Andy Wilkinson
5a3972fee7 Merge branch '2.7.x'
Closes gh-33297
2022-11-22 12:02:15 +00:00
Andy Wilkinson
f638c0070a Merge branch '2.6.x' into 2.7.x
Closes gh-33296
2022-11-22 12:01:42 +00:00
Andy Wilkinson
673d301b88 Make Ant smoke test more robust
Closes gh-33295
2022-11-22 12:01:21 +00:00
Stephane Nicoll
656c4b9390 Polish 2022-11-11 18:29:35 +01:00
Madhura Bhave
8cb615e9b6 Remove workarounds for SecurityContextRepository 2022-11-10 14:23:17 -08:00
Madhura Bhave
f4cf722c27 Align default security filter dispatcher types with Spring Security
Fixes gh-33090
2022-11-10 13:53:47 -08:00
Phillip Webb
82254e3b4d Update smoketests to test isolated actuator object mapper use
See gh-32297
See gh-20291
2022-11-09 22:17:16 -08:00
Phillip Webb
32b9945632 Polish 2022-11-08 23:15:30 -08:00
Andy Wilkinson
b357239861 Upgrade to Jakarta Activation 2.1.0
Closes gh-33045
2022-11-08 11:01:17 +00:00
Andy Wilkinson
b67c427259 Upgrade to Servlet 6.0 and related EE 10 specs
Co-authored-by: Phillip Webb <pwebb@vmware.com>

Closes gh-33036
Closes gh-33037
Closes gh-33038
Closes gh-33039
Closes gh-33040
Closes gh-33041
Closes gh-33042
Closes gh-33043
2022-11-07 17:33:38 +00:00
Phillip Webb
d7941c6315 Polish 2022-11-05 18:44:57 -07:00
Phillip Webb
9856286a2d Refine actuator httpexhanges naming
See gh-32885
2022-10-28 12:50:59 -07:00
Phillip Webb
3e50836b1a Rename httptrace endpoint and related classes to httpexchanges
Rename `/actuator/httptrace` to `/actuator/httpexchanges` to better
describe its purpose and to remove confusion with distribute tracing.

This change also takes the opportunity to improve the code by making
the `HttpExchange` class (previously `HttpTrace`) fully immutable.

Closes gh-32885

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-10-27 16:34:42 -07:00
Johnny Lim
5067aab552 Polish
See gh-32840
2022-10-27 16:33:14 +02:00
Phillip Webb
4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Phillip Webb
c8676a81de Merge branch '2.6.x' into 2.7.x 2022-10-25 15:48:04 -07:00
Scott Frederick
c22e76632c Add Build-Jdk-Spec to jar and war manifest when building with Gradle
This commit adds a `Build-Jdk-Spec` attribute to the manifest in a
jar or war file built with the Spring Boot Gradle plugin. This
aligns the Gradle plugin's behavior with the default Maven plugin
behavior.

This removes the need to set a `BP_JVM_VERSION` environment variable
when invoking Cloud Native Buildpacks, as the Paketo buildpacks will
honor `Build-Jdk-Spec` in a jar or war manifest to determine the
default JVM version.

Fixes gh-32829
2022-10-25 15:48:05 -05:00
Andy Wilkinson
99edda735e Polish 2022-10-25 12:57:58 +01:00
Madhura Bhave
ce3c933f77 Adapt to Spring Security changes
Closes gh-32604
2022-10-19 11:46:27 -07:00
Phillip Webb
2e74878ba4 Downgrade to OpenSAML 4.0.1
See gh-32604
2022-10-19 11:46:27 -07:00
Madhura Bhave
cedd553b83 Remove error page security filter
Spring Security now re-applies the authorization rules
to the error page by default. Additionally, it configures
RequestAttributeSecurityContextRepository as the default for
stateless applications allowing those applications to have access
to the original authentication during an error dispatch.

Closes gh-31703
2022-10-19 11:46:27 -07:00
Andy Wilkinson
4f86f685c5 Reinstate support for Infinispan
Closes gh-32556
2022-10-04 11:32:56 +01:00
Phillip Webb
e0b67889a8 Use Stream.toList instead of Stream.collect when possible
Update code to make use of `Stream.toList()` whenever possible.

Closes gh-28177
2022-10-04 00:29:22 -07:00
Brian Clozel
a0735eb3fb Migrate remaining usage of httpclient API
This commit migrates our remaining usage of the httpclient 4.x to use
instead httpclient5, now that the 4.x support has been removed in
`RestTemplate`.

Closes gh-32461
2022-09-29 18:55:42 +02:00
Brian Clozel
5fb2a50ad0 Adapt build dependencies to httpclient5
As htttpclient 4.x is not supported anymore by `RestTemplate`, this
commit changes such dependencies to httpclient5 instead. In some cases,
the httpclient 4.x was transitively brought by a non-Spring dependency.

See gh-32461
2022-09-29 18:55:41 +02:00
Scott Frederick
2e4529df27 Remove image banner smoke test
See gh-28883
2022-09-29 09:59:27 -05:00
Stephane Nicoll
72fc1f0018 Merge branch '2.7.x'
Closes gh-32512
2022-09-27 08:30:44 +02:00
Stephane Nicoll
9a004a6508 Merge branch '2.6.x' into 2.7.x
Closes gh-32511
2022-09-27 08:30:37 +02:00
Johnny Lim
975affc497 Enable LoaderIntegrationTests with Java 19
See gh-32501
2022-09-27 08:30:13 +02:00
Vedran Pavic
230f2cda84 Migrate to AuthorizationFilter in Spring Security auto-config
This commit updates Servlet based Spring Security auto-configuration
to use AuthorizationFilter, which is intended to supersede
FilterSecurityInterceptor.

See gh-31255
2022-09-22 13:53:54 +01:00
Scott Frederick
f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2022-09-21 14:50:15 -05:00
Andy Wilkinson
2977373505 Polish "Add property to configure Spring Session Redis repository type"
See gh-32205
2022-09-21 17:16:29 +01:00
Vedran Pavic
3093380e35 Add property to configure Spring Session Redis repository type
With Spring Session moving to RedisSessionRepository as the preferred
session repository, Spring Boot auto-configuration should make it
possible to easily switch back to the previous default
(RedisIndexedSessionRepository).

This commit introduces spring.session.redis.repository configuration
property that allows selecting the desired Redis-backed session
repository implementation.

See gh-32205
2022-09-21 17:13:58 +01:00
Andy Wilkinson
64f4da80cb Align with breaking changes in latest Batch snapshots
Batch is now auto-configured to use the context's
PlatformTransactionManager and DataSource or `@BatchDataSource`.
When this does not meet the user's needs, they can use
`@EnableBatchProcessing` or sub-class `DefaultBatchConfiguration` to
take complete control with the auto-configuration backing off.

Closes gh-32330
2022-09-20 15:42:52 +01:00
dreis2211
bac7d62476 Fix Spring Batch deprecations
See gh-32419
2022-09-19 14:31:54 +02:00
Madhura Bhave
b44a7e242c Support Mongo's Stable API in MongoHealthIndicator
Closes gh-30849
2022-09-15 16:48:22 -07:00
Phillip Webb
7f5785182d Switch @SpringBootTest to UseMainMethod.NEVER by default
See gh-22405
2022-09-15 12:37:26 -07:00
Phillip Webb
48f3cd75d4 Refine SpringBootTest.useMainMethod support
Refine `SpringBootContextLoader` so that calls to the main method do
not exit early and the hook is only used when necessary.

See gh-22405
2022-09-15 10:48:58 -07:00
Phillip Webb
41e0bbf4bb Add SpringBootTest.useMainMethod support
Add a new `useMainMethod` attribute to `SpringBootTest` which can be
used to determine how the test should run. The three available options
are:

	- `ALWAYS`
	- `NEVER`
	- `WHEN_AVAILABLE`

The default is `WHEN_AVAILABLE` which will attempt to launch the test
using the `main` method if there is one.

The `SpringBootContextLoader` has been updated to use the new
`SpringApplicationHook` interface when the main method is being used.

Closes gh-22405
2022-09-14 22:37:37 -07:00
Stephane Nicoll
4f6c3ab2b0 Upgrade to JUnit Jupiter 5.9.0
Closes gh-32351
2022-09-14 15:18:40 +02:00
Andy Wilkinson
4e8e5f623b Adapt to recent deprecations in Spring Batch
See gh-32237
2022-09-13 17:44:50 +01:00
Andy Wilkinson
a896fd0a36 Merge branch '2.7.x' 2022-09-10 09:38:18 +01:00
Andy Wilkinson
dffce2553c Merge branch '2.6.x' into 2.7.x 2022-09-10 09:38:09 +01:00
Andy Wilkinson
9fe9f31af1 Polish 2022-09-10 09:38:03 +01:00
Andy Wilkinson
144abee80a Merge branch '2.7.x' 2022-09-10 09:35:08 +01:00
Andy Wilkinson
b512083b3a Merge branch '2.6.x' into 2.7.x 2022-09-10 09:34:57 +01:00
Andy Wilkinson
a262520f08 Disable LoaderIntegrationTests on Java 19 till it GAs
See gh-32280
2022-09-10 09:34:51 +01:00
Stephane Nicoll
aa6e52f029 Merge branch '2.7.x' 2022-09-10 10:32:20 +02:00
Stephane Nicoll
71fa410929 Merge branch '2.6.x' into 2.7.x 2022-09-10 10:32:12 +02:00
Stephane Nicoll
c3416ac97a Disable LoaderIntegrationTests with Java 19
See gh-32295
2022-09-10 10:31:48 +02:00
Phillip Webb
2f78d52c36 Merge branch '2.7.x' 2022-09-08 19:52:40 -07:00
Phillip Webb
55ad2b9371 Remove accidentally committed debug code 2022-09-08 19:52:01 -07:00
Phillip Webb
46be4a3f30 Merge branch '2.7.x' 2022-09-08 19:38:18 -07:00
Phillip Webb
e88a682220 Merge branch '2.6.x' into 2.7.x 2022-09-08 19:37:52 -07:00
Phillip Webb
6e239d551a Update Spring Batch to upstream API changes
Fix Spring Batch tests following upstream changes related to Spring
Batch issue 4130.

Closes gh-32237
2022-09-08 19:35:27 -07:00
Scott Frederick
da4de7d67d Generate the AutoConfiguration.imports file from annotations
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.

Closes gh-31228
2022-09-02 15:10:22 -05:00
Brian Clozel
4aa1efa2d8 Fix build with latest Spring for GraphQL changes 2022-09-01 11:26:04 +02:00
Stephane Nicoll
50c099334b Adapt deprecated getIpAddress call with getHost in Redis Tests
Closes gh-32147
2022-08-23 08:25:52 +02:00
Stephane Nicoll
b19f1cedb3 Merge branch '2.7.x'
Closes gh-32137
2022-08-22 16:09:07 +02:00
thegeekyasian
5b1c6381db Adapt deprecated getIpAddress call with getHost in Redis Tests
See gh-32131
2022-08-22 16:06:21 +02:00
Phillip Webb
4ec2e357d9 Merge branch '2.7.x'
See gh-32086
2022-08-17 12:49:52 -07:00
Phillip Webb
60e1cc510c Merge branch '2.6.x' into 2.7.x
See gh-32085
2022-08-17 12:48:21 -07:00
Phillip Webb
bd74344025 Revert "Don't close jar files early"
This reverts commit b42f056ddb.
2022-08-17 11:38:42 -07:00
Andy Wilkinson
0b9c2025fb Fix handling of String Java version in cache smoke test 2022-08-10 11:49:21 +01:00
Andy Wilkinson
f4ddd3b597 Fix EhCache smoke test when building with a toolchain 2022-08-09 21:58:35 +01:00
Stephane Nicoll
748a1c9dbf Revert "Add missing jaxb dependency for EhCache3 smoke test"
This revert a7f06e0 as the version of EhCache already depends on JAXB.
2022-08-09 09:37:09 +02:00
Stephane Nicoll
a7f06e0989 Merge branch '2.6.x' into 2.7.x 2022-08-09 09:26:17 +02:00
Stephane Nicoll
22a5ccfca7 Add missing jaxb dependency for EhCache3 smoke test
See gh-31137
2022-08-09 09:25:59 +02:00
Andy Wilkinson
ba93e6c0ed Restore support for Jersey
Closes gh-28637
2022-08-08 15:45:20 +01:00
Madhura Bhave
846340ad62 Fix redis prefix in tests
See gh-11574
2022-08-05 14:32:39 -07:00
Madhura Bhave
0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2022-08-05 13:32:25 -07:00
Andy Wilkinson
c481299002 Merge branch '2.7.x'
Closes gh-31990
2022-08-04 15:46:44 +01:00
Andy Wilkinson
d8e6d9bed8 Merge branch '2.6.x' into 2.7.x
Closes gh-31989
2022-08-04 15:40:48 +01:00
Andy Wilkinson
329fa8d37d Run cache smoke tests against all cache providers
Closes gh-31137
2022-08-04 15:39:36 +01:00
Johnny Lim
6a4681baf5 Polish
See gh-31948
2022-08-02 15:14:23 +02:00
Brian Clozel
38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2022-08-01 14:33:25 +02:00
Phillip Webb
22144987e9 Update copyright year of changed files 2022-07-29 12:10:03 +01:00
Stephane Nicoll
c413f9adbe Merge branch '2.7.x'
Closes gh-31884
2022-07-27 09:23:39 +02:00
Stephane Nicoll
53a652ec65 Merge branch '2.6.x' into 2.7.x
Closes gh-31883
2022-07-27 09:23:05 +02:00
Stephane Nicoll
59139e632b Polish "Disable auto-detection in tests that start Hazelcast"
See gh-31863
2022-07-27 08:30:17 +02:00
Stephane Nicoll
782e3f75b6 Polish Hazelcast configuration
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
2022-07-27 08:15:53 +02:00
Andy Wilkinson
3405a54f9e Exclude Jetty toolchain dependencies in favor of official API artifacts
Closes gh-31720
2022-07-14 13:55:26 +01:00
Andy Wilkinson
4bd3534b7d Adapt to change in Security's filtering behavior
Spring Security now filters every dispatch by default and not only
once-per-request. Security configuration has been updated in a number of
places to restore the old behavior as needed for the tests to pass.
gh-31703 has been opened to review this and to investigate if we can
now remove the error page security filter and rely on the filtering of
every dispatch instead.

In addition to switching to once-per-request filtering where needed,
this commit also restructures the configuration of the error page
security filter. The restructuring was necessary to ensure that the
privilege evaluator bean has been defined before the conditions on the
error page security filter are evaluated. Without the change, the filter
was no longer being configured as the privilege evaluator hadn't been
defined before the on bean condition was evaluated. We may want to back
port this change as the ordering doesn't appear to have been defined
before and we were just getting lucky.

See gh-31622
See spring-projects/spring-security#11466
2022-07-13 12:09:46 +01:00
Oliver Drotbohm
b10c57551c Upgrade to Hibernate 6.1.1.Final
This commit makes the following potentially breaking changes:

- Dependency management for modules that do not exist in Hibernate
  6.1 has been removed.
- Hibernate's modules are now in the org.hibernate.orm group. Users
  not using the starter or using modules that are not in the starter
  will have to update their build configuration accordingly.
- spring.jpa.hibernate.use-new-id-generator-mappings has been removed
  as Hibernate no longer supports switching back to the old ID
  generator mappings.

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>

Closes gh-31674
2022-07-12 09:36:34 +01:00
Andy Wilkinson
f83f1a5fff Start building against Spring Integration 6.0.0-M4 snapshots
See gh-31624
2022-07-08 12:39:14 +01:00
Andy Wilkinson
e9136e023b Adapt to trailing slashes no longer being matched by default
See gh-31563
2022-07-07 14:16:20 +01:00
dreis2211
458f989cf3 Use switch expressions where appropriate
See gh-31527
2022-06-24 16:19:28 +01:00
Andy Wilkinson
631b1e0d76 Merge branch '2.7.x'
Closes gh-31526
2022-06-24 13:10:10 +01:00
Andy Wilkinson
1e08f545d0 Merge branch '2.6.x' into 2.7.x
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645 Upgrade to Spring Java Format 0.0.34
Closes gh-31524
2022-06-24 12:57:52 +01:00
Stephane Nicoll
498f052a7a Fix deprecation warning 2022-06-23 11:53:56 +02:00
Phillip Webb
e6352eee32 Fix import that should have been replaced during merge
See gh-31502
2022-06-22 16:55:50 -07:00
Phillip Webb
b85469a5a5 Merge branch '2.7.x'
Closes gh-31502
2022-06-22 16:33:42 -07:00
Phillip Webb
d64f601dfd Merge branch '2.6.x' into 2.7.x
Closes gh-31501
2022-06-22 16:31:52 -07:00
Guirong Hu
3592292e4b Use ExceptionHandler when Spring MVC uses a different management port
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.

See gh-31495
2022-06-22 16:13:26 -07:00
dreis2211
a639685053 Remove obsolete Java compatibility code
See gh-31452
2022-06-19 10:22:23 +02:00
Andy Wilkinson
3cf6dc25a8 Merge branch '2.7.x'
See gh-31403
2022-06-16 17:34:23 +01:00
Andy Wilkinson
f285d9e7cf Merge branch '2.6.x' into 2.7.x
See gh-31402
2022-06-16 17:33:53 +01:00
Andy Wilkinson
252cf94332 Fix requiresUnpack following Bouncy Castle upgrade
See gh-31400
2022-06-16 17:32:40 +01:00
Andy Wilkinson
d370d19e7a Merge branch '2.7.x'
Closes gh-31403
2022-06-16 12:14:52 +01:00
Andy Wilkinson
5e1cd28d3f Merge branch '2.6.x' into 2.7.x
Closes gh-31402
2022-06-16 12:14:28 +01:00
Lars Grefer
e8a1a0399a Upgrade to Bouncycastle 1.71
Closes gh-31400
2022-06-16 12:14:06 +01:00
Phillip Webb
d84557f1f9 Merge branch '2.7.x'
Closes gh-31396
2022-06-15 10:53:17 -07:00
Phillip Webb
bcbcc53a09 Merge branch '2.6.x' into 2.7.x
Closes gh-31395
2022-06-15 10:51:40 -07:00
Phillip Webb
b42f056ddb Don't close jar files early
Update `JarFile` and related classes so that `close()` is not longer
called early.

Prior to this commit, we would always immediately close the underlying
jar file to prevent file locking issues with our build. This causes
issues on certain JVMs when they attempt to verify a signed jar.

The file lock issues have now been solved by returning a custom input
stream from `JarUrlConnection` which captures and delegates the close
method.

Fixes gh-29356
2022-06-15 10:51:01 -07:00
Stephane Nicoll
b536b209ab Refine assertions on exception messages 2022-06-14 18:20:27 +02:00
Andy Wilkinson
d4be484d27 Upgrade to AssertJ 3.23.1
Closes gh-31331
2022-06-10 13:44:21 +01:00
Andy Wilkinson
ab93bc26c7 Merge branch '2.7.x'
Closes gh-31271
2022-06-08 12:18:36 +01:00
Andy Wilkinson
a0fee42740 Merge branch '2.6.x' into 2.7.x
Closes gh-31270
2022-06-08 12:09:14 +01:00
Andy Wilkinson
0834dc5b01 Polish "Update smoke tests to avoid conflicts with NAME environment variable"
See gh-31267
2022-06-08 12:08:40 +01:00
Vedran Pavic
95e0d6c0f7 Update smoke tests to avoid conflicts with NAME environment variable
This commit updates several smoke tests in order to avoid conflicts
with NAME environment variable that is present in WSL and causes
project build to fail. Previous attempt to fix this in 7da42d71 was
incomplete.

See gh-31267
2022-06-08 11:34:19 +01:00
Andy Wilkinson
4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson
5dfa5adb75 Merge branch '2.7.x'
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson
455ee0ce22 Merge branch '2.6.x' into 2.7.x
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8 Remove redundant throws declarations from internal APIs
Closes gh-31176
2022-05-26 15:47:35 +01:00
Scott Frederick
4a8e48f07a Merge branch '2.7.x' 2022-05-06 14:49:08 -05:00
Scott Frederick
108b3314db Merge branch '2.6.x' into 2.7.x
Closes gh-30889
2022-05-06 14:44:57 -05:00
Scott Frederick
b0bedc332a Use Testcontainers in Spring Session Reactive smoke tests
Closes gh-30888
2022-05-06 14:38:35 -05:00
Scott Frederick
4f3771f88a Merge branch '2.7.x' 2022-05-05 16:08:18 -05:00
Scott Frederick
7f4b78469e Merge branch '2.6.x' into 2.7.x 2022-05-05 15:59:37 -05:00
Scott Frederick
51343139c2 Remove empty files
See gh-30875
2022-05-05 15:58:55 -05:00
Scott Frederick
03d17dd04a Merge branch '2.7.x' 2022-05-05 15:39:27 -05:00
Scott Frederick
576b72a7a1 Merge branch '2.6.x' into 2.7.x
Closes gh-30877
2022-05-05 15:37:29 -05:00
Scott Frederick
6098b0c91f Merge branch '2.5.x' into 2.6.x
Closes gh-30876
2022-05-05 15:36:57 -05:00
Scott Frederick
8fe47aaebd Remove smoke tests that do nothing without a server
Fixes gh-30875
2022-05-05 15:35:38 -05:00
Scott Frederick
7f395941c7 Add timezone offset to default logging date format patterns
Closes gh-28654
2022-05-03 17:09:27 -05:00
Andy Wilkinson
541ab69aff Merge branch '2.7.x' 2022-05-03 15:18:20 +01:00
Andy Wilkinson
4cd850cfc0 Merge branch '2.6.x' into 2.7.x
Closes gh-30851
2022-05-03 15:17:13 +01:00
Andy Wilkinson
fa327a783d Merge branch '2.5.x' into 2.6.x
Closes gh-30850
2022-05-03 15:14:00 +01:00
Andy Wilkinson
4fd2e0c916 Polish "Fix typos"
See gh-30773
2022-05-03 14:09:53 +01:00
Andy Wilkinson
f6d24dc1a8 Fix typos
See gh-30773
2022-05-03 14:09:37 +01:00
Moritz Halbritter
85a4c94dea Merge branch '2.7.x' 2022-04-25 15:32:08 +02:00
Moritz Halbritter
b406971094 Remove hyphen from asserting-party
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*

Closes gh-30785
2022-04-25 15:26:38 +02:00
Andy Wilkinson
061d86e037 Reinstate Session Redis smoke test
See gh-30673
2022-04-25 13:18:56 +01:00
Phillip Webb
c7374fd415 Update copyright year of changed files 2022-04-20 15:30:20 -07:00
Moritz Halbritter
1950d06585 Merge branch '2.7.x' 2022-04-20 08:26:35 +02:00
Moritz Halbritter
6c400daa48 Rename 'identityprovider' property to 'asserting-party'
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*

The old property names are still supported, but will lead to a warning
in the logs.

Closes gh-30642
2022-04-20 08:25:58 +02:00
Brian Clozel
21eab010de Disable Redis Session smoke test
This commit temporarily disables the Redis Session smoke test, as it
relies on the Session Actuator endpoint being present.

Since spring-projects/spring-session#1711, the default session
repository contributed is not of type `FindByIndexNameSessionRepository`
and thus cannot support the Session endpoint use case.

Until gh-30673 is resolved, this test is disabled.

See gh-30673
2022-04-15 16:44:23 +02:00
Andy Wilkinson
9658661bd4 Merge branch '2.7.x' 2022-04-14 14:53:40 +01:00
Andy Wilkinson
7789a18d23 Merge branch '2.6.x' into 2.7.x
Closes gh-30667
2022-04-14 14:51:22 +01:00
Andy Wilkinson
d4348279a7 Merge branch '2.5.x' into 2.6.x
Closes gh-30666
2022-04-14 14:51:09 +01:00
Andy Wilkinson
8f1b8622ba Ensure that webEnvironment=NONE creates non-web context
Previously, if spring.main.web-application-type was configured in
application.properties to servlet or reactive, setting
webEnvironment=NONE on @SpringBootTest would not work correctly and
a servlet or reactive web application context would be created
based on the value of spring.main.web-application-type.

This commit updates the test context bootstapper to set
spring.main.web-application-type to none when webEnvironment has been
set to none. This is done in the merged context configuration's
property source properties which are applied to the environment in a
high-precedence test property source that will override configuration
in application.properties.

Closes gh-29695
2022-04-14 14:44:30 +01:00
Andy Wilkinson
b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson
48f8021d88 Migrate @Local*Port annotations to spring-boot-test
Closes gh-29589
2022-04-12 08:48:43 +01:00
Brian Clozel
d476d8e37b Move GraphQL test document files
After changes performed in spring-projects/spring-graphql#338, GraphQL
test documents now have a different test location.
2022-04-04 16:43:47 +02:00
dreis2211
eea4611553 Fix references to JDK 1.8 in READMEs
See gh-30447
2022-03-28 09:38:24 +02:00
Andy Wilkinson
a59f60c614 Merge branch '2.7.x' 2022-03-25 11:15:08 +00:00
Andy Wilkinson
aad59efef2 Merge branch '2.6.x' into 2.7.x
Closes gh-30430
2022-03-25 11:14:57 +00:00
Andy Wilkinson
344aa405ae Merge branch '2.5.x' into 2.6.x
Closes gh-30429
2022-03-25 11:14:46 +00:00
Andy Wilkinson
e36ac6c155 Polish "Enable Java 18 for LoaderIntegrationTests"
See gh-30422
2022-03-25 11:02:57 +00:00
Eddú Meléndez
e9c433a0b7 Enable Java 18 for LoaderIntegrationTests
See gh-30422
2022-03-25 11:02:42 +00:00
Moritz Halbritter
1d29081e61 Merge branch '2.7.x' 2022-03-23 13:47:03 +01:00
Moritz Halbritter
3e26c584fd Merge branch '2.6.x' into 2.7.x 2022-03-23 13:46:49 +01:00
Moritz Halbritter
27ddcbd551 Merge branch '2.5.x' into 2.6.x 2022-03-23 13:46:33 +01:00
Moritz Halbritter
cd5d3dbf8d Disable SampleSessionWebFluxApplicationTests on Linux aarch64
These tests use embedded mongo under the hood.

See gh-30082
2022-03-23 13:45:25 +01:00
Moritz Halbritter
1cd16f6718 Merge branch '2.7.x' 2022-03-23 12:10:58 +01:00
Moritz Halbritter
1fec2f0e9b Merge branch '2.6.x' into 2.7.x 2022-03-23 12:06:57 +01:00
Moritz Halbritter
4e09289076 Merge branch '2.5.x' into 2.6.x
# Conflicts:
#	spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java
2022-03-23 12:04:30 +01:00
Moritz Halbritter
1d15e8c8e2 Disable SampleMongoApplicationTests on Linux aarch64
See gh-30082
2022-03-23 12:03:35 +01:00
Andy Wilkinson
1ee7ac3cd6 Merge branch '2.7.x' 2022-03-22 10:36:52 +00:00
Andy Wilkinson
7eff00b818 Merge branch '2.6.x' into 2.7.x
Closes gh-30360
2022-03-22 10:36:36 +00:00
Andy Wilkinson
f04a85957e Merge branch '2.5.x' into 2.6.x
Closes gh-30359
2022-03-22 10:36:17 +00:00
Andy Wilkinson
5473cd3abc Try to stabilize SampleSessionWebFluxApplicationTests
Closes gh-30353
2022-03-22 10:20:31 +00:00
Brian Clozel
755836aab8 Update formlatest GraphQlTester changes
See spring-projects/spring-graphql#278
2022-03-21 15:34:08 +01:00
dreis2211
be981e45d1 Remove checks for Java 9 compatibility in build.gradle files
See gh-30335
2022-03-21 10:48:50 +01:00
Chris Dennis
3ed3d3eb36 Restore Ehcache 3 Support
See gh-30002
2022-03-19 09:33:47 +01:00
Andy Wilkinson
00193517f0 Merge branch '2.7.x' 2022-03-09 15:38:00 +00:00
Andy Wilkinson
f488db9e49 Merge branch '2.6.x' into 2.7.x 2022-03-09 15:37:47 +00:00
Andy Wilkinson
0d4d225ebb Merge branch '2.5.x' into 2.6.x 2022-03-09 15:37:40 +00:00
Andy Wilkinson
a58cd050e5 Disable LoaderIntegrationTests when all runtimes are incompatible
See gh-29524
2022-03-09 15:36:53 +00:00
Andy Wilkinson
f5ca568014 Remove versions less than 17 from JavaVersion enum
Closes gh-29503
2022-03-09 15:16:59 +00:00
Brian Clozel
81754c8bc4 Upgrade to Spring GraphQL 1.0.0-SNAPSHOT
This commit switches to 1.0.0-SNAPSHOT for Spring GraphQL, before its
upcoming 1.0.0-M6 version.

This commit adapts to the changes introduced in
spring-projects/spring-graphql#317 : now that `GraphQlClient` has been
introduced, `GraphQlTester` has been aligned with the new
infrastructure. The `@GraphQlTest` and `@SpringBootTest` testing support
is now using different variants for each.

All samples have been updated to use the proper GraphQL terminology, see
and spring-projects/spring-graphql#310 .

See gh-29637
2022-03-08 17:54:54 +01:00
Andy Wilkinson
0bf1090e29 Merge branch '2.7.x' 2022-03-07 14:58:08 +00:00
Andy Wilkinson
a3cdc4e799 Merge branch '2.6.x' into 2.7.x
Closes gh-30088
2022-03-07 14:57:32 +00:00
Andy Wilkinson
344f71c75a Merge branch '2.5.x' into 2.6.x
Closes gh-30087
2022-03-07 14:57:20 +00:00
Andy Wilkinson
4bcb7e2f77 Prevent ActiveProfilesTests from binding to 8080
Due to gh-29695, smoketest.profile.ActiveProfilesTests starts a web
server bound to the default port (8080) despite the test setting
`webEnvironment` to `NONE`.

This commit works around the problem by running the tests with
server.port set to zero.

Closes gh-30086
2022-03-07 14:55:00 +00:00
Andy Wilkinson
0833e9eab8 Relax alias checking for CI on Windows 2022-03-03 15:46:33 +00:00
Andy Wilkinson
ddc953468c Merge branch '2.7.x' 2022-03-03 11:05:49 +00:00
Andy Wilkinson
308fe7c552 Merge branch '2.6.x' into 2.7.x
Closes gh-30047
2022-03-03 11:05:39 +00:00
Andy Wilkinson
97222236fe Merge branch '2.5.x' into 2.6.x
Closes gh-30046
2022-03-03 11:05:27 +00:00
Andy Wilkinson
57f935faed Use a more relaxed AliasCheck for CI on Windows
ContextHandler.ApproveAliases has been deprecated. We tried to
replace it with AllowedResourceAliasChecker but it does not
behave in the same way and causes CI failures on Windows.
ContextHandler.ApproveAliases always returns true so we should
hardcode our own implementation that does the same.

Closes gh-30045
2022-03-03 11:01:48 +00:00
Andy Wilkinson
132bf686f8 Merge branch '2.7.x' 2022-02-22 20:13:28 +00:00
Andy Wilkinson
2d9177dd9d Merge branch '2.6.x' into 2.7.x
Closes gh-29955
2022-02-22 20:11:47 +00:00
Andy Wilkinson
3614c8d1f8 Merge branch '2.5.x' into 2.6.x
Closes gh-29954
2022-02-22 20:08:31 +00:00
Andy Wilkinson
1e8d29f7aa Configure Kotlin compilation JVM target by convention
Closes gh-29952
2022-02-22 18:11:51 +00:00
Moritz Halbritter
d42f675959 Merge branch '2.7.x' 2022-02-21 10:36:05 +01:00
Moritz Halbritter
d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
2022-02-21 10:34:38 +01:00
Moritz Halbritter
42808ff13c Merge branch '2.7.x'
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
2022-02-17 10:56:23 +01:00
Moritz Halbritter
7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
2022-02-17 10:18:46 +01:00
Moritz Halbritter
303979fb65 Merge branch '2.7.x' 2022-02-17 09:17:35 +01:00
Moritz Halbritter
7d68b58c8f Load auto-configurations from META-INF/spring-boot
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
2022-02-17 09:17:23 +01:00
Phillip Webb
ff4b92a3ba Update copyright year of changed files 2022-02-16 20:44:54 -08:00
Stephane Nicoll
39e230b5d6 Merge branch '2.6.x' into 2.7.x 2022-02-16 16:51:37 +01:00
Stephane Nicoll
78797572ac Merge branch '2.5.x' into 2.6.x 2022-02-16 16:51:27 +01:00
Stephane Nicoll
fa6a1463d0 Polish 2022-02-16 16:51:16 +01:00
Moritz Halbritter
fdb1010cbc Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
2022-02-16 15:48:27 +01:00
Moritz Halbritter
8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
2022-02-16 13:55:16 +01:00
Stephane Nicoll
587b278bb4 Merge branch '2.7.x' 2022-02-16 11:27:10 +01:00
Stephane Nicoll
719fb2e8e5 Upgrade to Jetty 9.4.45.v20220203
Closes gh-29843
2022-02-16 09:46:10 +01:00
Stephane Nicoll
dc171c6462 Upgrade to Jetty 9.4.45.v20220203
Closes gh-29791
2022-02-14 13:43:43 +01:00
Stephane Nicoll
a99582a3bb Upgrade to Jetty 9.4.45.v20220203
Closes gh-29771
2022-02-14 13:43:23 +01:00
Stephane Nicoll
3b4832445b Merge branch '2.7.x' 2022-02-05 14:02:00 +01:00
Stephane Nicoll
098a57affb Upgrade to R2DBC Borca-RELEASE
See gh-28524
2022-02-05 13:37:20 +01:00
Stephane Nicoll
8c8c9c5f28 Upgrade to H2 2.1.210
H2 2.x contains several important changes such as moving the primary key
generation mechanism to a sequence-based identifier. This commit fixes
a number of tests that were failing.

Closes gh-29651

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-02-05 13:36:53 +01:00
Stephane Nicoll
b22e3d51dc Merge branch '2.7.x' 2022-02-04 10:10:29 +01:00
Henning Poettker
e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility
See gh-29200
2022-02-04 09:57:59 +01:00
Phillip Webb
a282f912e6 Organize imports
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
Stephane Nicoll
41fb9cf562 Merge branch '2.7.x' 2022-02-01 11:15:49 +01:00
Stephane Nicoll
f812b33cbd Merge branch '2.6.x' into 2.7.x
Closes gh-29613
2022-02-01 11:07:31 +01:00
Stephane Nicoll
136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll
7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou
b49418aaaf Enforce use of BDDMockito
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
2022-02-01 09:37:15 +01:00
Andy Wilkinson
35b5b5672d Merge branch '2.7.x' 2022-01-20 12:37:16 +00:00
Andy Wilkinson
2c049f2b40 Merge branch '2.6.x' into 2.7.x
Closes gh-29501
2022-01-20 12:36:49 +00:00
Madhura Bhave
3460c24a16 Ignore context path when calling privilege evaluator
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.

This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.

Closes gh-29299

Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
2022-01-20 12:36:18 +00:00
Andy Wilkinson
1fa541d4de Merge branch '2.7.x' 2022-01-19 17:24:42 +00:00
Andy Wilkinson
fa9a4a6452 Merge branch '2.6.x' into 2.7.x 2022-01-19 17:24:29 +00:00
Andy Wilkinson
4c422b9f3c Merge branch '2.5.x' into 2.6.x 2022-01-19 17:24:17 +00:00
Andy Wilkinson
b60612dabb Disable LoaderIntegrationTests when Docker's unavailable
Closes gh-29385
2022-01-19 17:23:30 +00:00
Phillip Webb
13f6729b37 Merge branch '2.7.x' 2022-01-18 18:49:08 -08:00
Phillip Webb
e95c514fd5 Merge branch '2.6.x' into 2.7.x 2022-01-18 18:48:53 -08:00
Phillip Webb
f6cdc27b2a Merge branch '2.5.x' into 2.6.x 2022-01-18 18:48:40 -08:00
Phillip Webb
eca05c42fb Further refine LoaderIntegrationTests for CI
Update `LoaderIntegrationTests` to filter compatible JDKs early.

See gh-29385
2022-01-18 18:47:41 -08:00
Phillip Webb
e18cbe5fe2 Merge branch '2.7.x' 2022-01-18 18:19:46 -08:00
Phillip Webb
8aacf4cb36 Merge branch '2.6.x' into 2.7.x 2022-01-18 18:19:07 -08:00
Phillip Webb
392de30390 Merge branch '2.5.x' into 2.6.x 2022-01-18 18:18:56 -08:00
Phillip Webb
de8f8c3e64 Refine LoaderIntegrationTests for CI
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.

See gh-29385
2022-01-18 18:16:47 -08:00
Phillip Webb
2d1854a682 Merge branch '2.7.x' 2022-01-18 17:42:34 -08:00
Phillip Webb
1f77533b09 Merge branch '2.6.x' into 2.7.x
Closes gh-29463
2022-01-18 17:37:10 -08:00
Phillip Webb
44537d4494 Merge branch '2.5.x' into 2.6.x
Closes gh-29462
2022-01-18 17:36:59 -08:00
Phillip Webb
3d908079ef Run LoaderIntegrationTests against multiple JDKs
Update `LoaderIntegrationTests` to run against OpenJDK 8, 11 and 17 as
well as Oracle JDK 17.

Closes gh-29385
2022-01-18 17:36:48 -08:00
Andy Wilkinson
26fecbe230 Upgrade to Thymeleaf and Security Extras 3.1.0-M1
Closes gh-49452
Closes gh-49453
2022-01-18 16:01:29 +00:00
Andy Wilkinson
12cd97a20c Reinstate support for Thymeleaf 2022-01-18 16:01:29 +00:00
Phillip Webb
cb97aff1e7 Merge branch '2.7.x' 2022-01-14 13:57:35 -08:00
Phillip Webb
9278a502c7 Merge branch '2.6.x' into 2.7.x 2022-01-14 13:57:25 -08:00
Phillip Webb
14fe9347b5 Merge branch '2.5.x' into 2.6.x 2022-01-14 13:56:47 -08:00
Phillip Webb
3f7bf7d34f Modify SpringApplication Environment rather than setting it
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
2022-01-14 13:47:22 -08:00
Phillip Webb
13f257a706 Merge branch '2.7.x' 2022-01-12 15:44:47 -08:00
Phillip Webb
8147eb6d6d Merge branch '2.6.x' into 2.7.x 2022-01-12 15:43:44 -08:00
Phillip Webb
e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00
Phillip Webb
27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb
3d6840e715 Merge branch '2.7.x'
Closes gh-29376
2022-01-12 15:32:51 -08:00
Phillip Webb
fee45e056a Merge branch '2.6.x' into 2.7.x
Closes gh-29375
2022-01-12 15:32:34 -08:00
Phillip Webb
91d2b1b988 Merge branch '2.5.x' into 2.6.x
Closes gh-29374
2022-01-12 15:32:00 -08:00
Phillip Webb
eb6b48fff0 Use side-effect free environment with tests rather than converting
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb
1b7db2750d Merge branch '2.7.x'
Closes gh-29373
2022-01-12 14:08:04 -08:00
Phillip Webb
e1c84e2972 Merge branch '2.6.x' into 2.7.x
Closes gh-29372
2022-01-12 14:07:48 -08:00
Phillip Webb
72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb
7c16668bf3 Log Docker output to aid debugging
Add an SLF4J logger so that we can see real time output of the
Docker container.

See gh-29370
2022-01-12 14:03:27 -08:00
Stephane Nicoll
69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 2022-01-06 17:41:26 +01:00