Commit Graph

804 Commits

Author SHA1 Message Date
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
Stephane Nicoll
a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
2022-01-06 17:38:06 +01:00
Phillip Webb
06398eabed Merge branch '2.7.x' 2022-01-04 12:26:24 -08:00