Commit Graph

752 Commits (5577d16823e580d676d46da3eb85984fb6fdc367)

Author SHA1 Message Date
Andy Wilkinson d4be484d27 Upgrade to AssertJ 3.23.1
Closes gh-31331
2 years ago
Andy Wilkinson ab93bc26c7 Merge branch '2.7.x'
Closes gh-31271
2 years ago
Andy Wilkinson a0fee42740 Merge branch '2.6.x' into 2.7.x
Closes gh-31270
2 years ago
Andy Wilkinson 0834dc5b01 Polish "Update smoke tests to avoid conflicts with NAME environment variable"
See gh-31267
2 years ago
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
2 years ago
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 3 years ago
Andy Wilkinson 3d203d0215 Polish 3 years ago
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x'
Closes gh-31178
3 years ago
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x
Closes gh-31177
3 years ago
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs
Closes gh-31176
3 years ago
Scott Frederick 4a8e48f07a Merge branch '2.7.x' 3 years ago
Scott Frederick 108b3314db Merge branch '2.6.x' into 2.7.x
Closes gh-30889
3 years ago
Scott Frederick b0bedc332a Use Testcontainers in Spring Session Reactive smoke tests
Closes gh-30888
3 years ago
Scott Frederick 4f3771f88a Merge branch '2.7.x' 3 years ago
Scott Frederick 7f4b78469e Merge branch '2.6.x' into 2.7.x 3 years ago
Scott Frederick 51343139c2 Remove empty files
See gh-30875
3 years ago
Scott Frederick 03d17dd04a Merge branch '2.7.x' 3 years ago
Scott Frederick 576b72a7a1 Merge branch '2.6.x' into 2.7.x
Closes gh-30877
3 years ago
Scott Frederick 6098b0c91f Merge branch '2.5.x' into 2.6.x
Closes gh-30876
3 years ago
Scott Frederick 8fe47aaebd Remove smoke tests that do nothing without a server
Fixes gh-30875
3 years ago
Scott Frederick 7f395941c7 Add timezone offset to default logging date format patterns
Closes gh-28654
3 years ago
Andy Wilkinson 541ab69aff Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x
Closes gh-30851
3 years ago
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x
Closes gh-30850
3 years ago
Andy Wilkinson 4fd2e0c916 Polish "Fix typos"
See gh-30773
3 years ago
Andy Wilkinson f6d24dc1a8 Fix typos
See gh-30773
3 years ago
Moritz Halbritter 85a4c94dea Merge branch '2.7.x' 3 years ago
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
3 years ago
Andy Wilkinson 061d86e037 Reinstate Session Redis smoke test
See gh-30673
3 years ago
Phillip Webb c7374fd415 Update copyright year of changed files 3 years ago
Moritz Halbritter 1950d06585 Merge branch '2.7.x' 3 years ago
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
3 years ago
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
3 years ago
Andy Wilkinson 9658661bd4 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 7789a18d23 Merge branch '2.6.x' into 2.7.x
Closes gh-30667
3 years ago
Andy Wilkinson d4348279a7 Merge branch '2.5.x' into 2.6.x
Closes gh-30666
3 years ago
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
3 years ago
Andy Wilkinson b871a1e457 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test
Closes gh-29589
3 years ago
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.
3 years ago
dreis2211 eea4611553 Fix references to JDK 1.8 in READMEs
See gh-30447
3 years ago
Andy Wilkinson a59f60c614 Merge branch '2.7.x' 3 years ago
Andy Wilkinson aad59efef2 Merge branch '2.6.x' into 2.7.x
Closes gh-30430
3 years ago
Andy Wilkinson 344aa405ae Merge branch '2.5.x' into 2.6.x
Closes gh-30429
3 years ago
Andy Wilkinson e36ac6c155 Polish "Enable Java 18 for LoaderIntegrationTests"
See gh-30422
3 years ago
Eddú Meléndez e9c433a0b7 Enable Java 18 for LoaderIntegrationTests
See gh-30422
3 years ago
Moritz Halbritter 1d29081e61 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 3e26c584fd Merge branch '2.6.x' into 2.7.x 3 years ago
Moritz Halbritter 27ddcbd551 Merge branch '2.5.x' into 2.6.x 3 years ago
Moritz Halbritter cd5d3dbf8d Disable SampleSessionWebFluxApplicationTests on Linux aarch64
These tests use embedded mongo under the hood.

See gh-30082
3 years ago
Moritz Halbritter 1cd16f6718 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 1fec2f0e9b Merge branch '2.6.x' into 2.7.x 3 years ago
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
3 years ago
Moritz Halbritter 1d15e8c8e2 Disable SampleMongoApplicationTests on Linux aarch64
See gh-30082
3 years ago
Andy Wilkinson 1ee7ac3cd6 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 7eff00b818 Merge branch '2.6.x' into 2.7.x
Closes gh-30360
3 years ago
Andy Wilkinson f04a85957e Merge branch '2.5.x' into 2.6.x
Closes gh-30359
3 years ago
Andy Wilkinson 5473cd3abc Try to stabilize SampleSessionWebFluxApplicationTests
Closes gh-30353
3 years ago
Brian Clozel 755836aab8 Update formlatest GraphQlTester changes
See spring-projects/spring-graphql#278
3 years ago
dreis2211 be981e45d1 Remove checks for Java 9 compatibility in build.gradle files
See gh-30335
3 years ago
Chris Dennis 3ed3d3eb36 Restore Ehcache 3 Support
See gh-30002
3 years ago
Andy Wilkinson 00193517f0 Merge branch '2.7.x' 3 years ago
Andy Wilkinson f488db9e49 Merge branch '2.6.x' into 2.7.x 3 years ago
Andy Wilkinson 0d4d225ebb Merge branch '2.5.x' into 2.6.x 3 years ago
Andy Wilkinson a58cd050e5 Disable LoaderIntegrationTests when all runtimes are incompatible
See gh-29524
3 years ago
Andy Wilkinson f5ca568014 Remove versions less than 17 from JavaVersion enum
Closes gh-29503
3 years ago
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
3 years ago
Andy Wilkinson 0bf1090e29 Merge branch '2.7.x' 3 years ago
Andy Wilkinson a3cdc4e799 Merge branch '2.6.x' into 2.7.x
Closes gh-30088
3 years ago
Andy Wilkinson 344f71c75a Merge branch '2.5.x' into 2.6.x
Closes gh-30087
3 years ago
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
3 years ago
Andy Wilkinson 0833e9eab8 Relax alias checking for CI on Windows 3 years ago
Andy Wilkinson ddc953468c Merge branch '2.7.x' 3 years ago
Andy Wilkinson 308fe7c552 Merge branch '2.6.x' into 2.7.x
Closes gh-30047
3 years ago
Andy Wilkinson 97222236fe Merge branch '2.5.x' into 2.6.x
Closes gh-30046
3 years ago
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
3 years ago
Andy Wilkinson 132bf686f8 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 2d9177dd9d Merge branch '2.6.x' into 2.7.x
Closes gh-29955
3 years ago
Andy Wilkinson 3614c8d1f8 Merge branch '2.5.x' into 2.6.x
Closes gh-29954
3 years ago
Andy Wilkinson 1e8d29f7aa Configure Kotlin compilation JVM target by convention
Closes gh-29952
3 years ago
Moritz Halbritter d42f675959 Merge branch '2.7.x' 3 years ago
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
3 years ago
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
3 years ago
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
3 years ago
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 3 years ago
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
3 years ago
Phillip Webb ff4b92a3ba Update copyright year of changed files 3 years ago
Stephane Nicoll 39e230b5d6 Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 78797572ac Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll fa6a1463d0 Polish 3 years ago
Moritz Halbritter fdb1010cbc Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Stephane Nicoll 587b278bb4 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 719fb2e8e5 Upgrade to Jetty 9.4.45.v20220203
Closes gh-29843
3 years ago
Stephane Nicoll dc171c6462 Upgrade to Jetty 9.4.45.v20220203
Closes gh-29791
3 years ago
Stephane Nicoll a99582a3bb Upgrade to Jetty 9.4.45.v20220203
Closes gh-29771
3 years ago
Stephane Nicoll 3b4832445b Merge branch '2.7.x' 3 years ago
Stephane Nicoll 098a57affb Upgrade to R2DBC Borca-RELEASE
See gh-28524
3 years ago
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>
3 years ago