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
Phillip Webb
b25e92f3e2
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:24:34 -08:00
Phillip Webb
760dcffd8b
Merge branch '2.7.x'
2022-01-04 12:22:54 -08:00
Andy Wilkinson
1dbfcf8b57
Reinstate support for Spring Data Couchbase
...
Closes gh-28976
2022-01-04 16:38:16 +00:00
dreis2211
d8deee7cf6
Update to JDK 17 in launch script tests
...
See gh-29201
2022-01-04 16:24:12 +01:00
izeye
728206dba0
Polish GraphQL changes
...
See gh-29140
Closes gh-29194
2022-01-03 17:36:57 +01:00
Brian Clozel
88ee4fab36
Polish
...
See gh-29140
2021-12-21 10:33:51 +01:00
Brian Clozel
f61c87c3a7
Revert "Merge branch '2.7.x'"
...
This reverts commit f0677a119c
, reversing
changes made to 938d58f32c
.
2021-12-21 09:05:06 +01:00
Brian Clozel
f0677a119c
Merge branch '2.7.x'
2021-12-21 09:04:10 +01:00
Brian Clozel
c522a8007b
Add smoke test for Spring GraphQL
...
See gh-29140
2021-12-21 08:34:49 +01:00
Madhura Bhave
48a6470ddb
Merge branch '2.7.x' into main
2021-12-17 17:51:48 -08:00
Madhura Bhave
d9d161cd6b
Allow previously authorized users to access the error page
...
Prior to this commit, the `ErrorPageSecurityFilter` verified if
access to the error page was allowed by invoking the
`WebInvocationPrivilegeEvaluator` with the Authentication from the
`SecurityContextHolder`.
This meant that access to the error page was denied for a `null` Authentication
or `AnonymousAuthenticationToken` in cases where the error page required
authenticated access. This prevented authorized users from accessing the
error page in case the Authentication wasn't retrievable for the error dispatch,
which is the case for `@Transient` authentication or stateless session policy.
This commit updates the `ErrorPageSecurityFilter` to check access to the error page
only if the error is an authn or authz error in cases where an authentication object
is not found in the SecurityContextHolder. This makes the error response consistent
when bad credentials or no credentials are used while also allowing access to previously
authorized users.
Fixes gh-28953
2021-12-17 16:58:58 -08:00
Phillip Webb
7981a82785
Merge branch '2.7.x'
2021-12-16 13:50:15 -08:00
Phillip Webb
f676602c96
Merge branch '2.5.x' into 2.6.x
2021-12-16 13:49:12 -08:00
Phillip Webb
783981ba98
Merge branch '2.4.x' into 2.5.x
2021-12-16 13:48:25 -08:00
Phillip Webb
d336a96b7f
Update web.xml xsd references to for 3.1 version
...
See gh-29075
2021-12-16 13:45:12 -08:00
Phillip Webb
003fb229fd
Merge branch '2.7.x'
2021-12-16 13:07:22 -08:00
Phillip Webb
c0023118a9
Merge branch '2.7.x'
...
Closes gh-29079
2021-12-15 22:19:36 -08:00
Phillip Webb
6e01c3edbe
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29077
2021-12-15 22:17:22 -08:00
Phillip Webb
17363d1b3a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-29076
2021-12-15 22:16:37 -08:00
Phillip Webb
1749c893dc
Update web-app version to 3.1
...
Update the web-app version specified in `web.xml` to 3.1 in order to
make Eclipse happy.
Closes gh-29075
2021-12-15 22:14:52 -08:00
Andy Wilkinson
3b23c542a0
Test servlet 3.1 compatibility in deployment tests
...
Closes gh-28906
2021-12-09 12:24:43 +00:00
Andy Wilkinson
fe7b13ec46
Upgrade to Spring Framework 6 and Jakarta EE 9
...
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872
See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson
b6ba46942b
Remove Atmosphere sample to prepare for Servlet 5 upgrade
...
Closes gh-28786
2021-11-30 15:55:49 +00:00
Andy Wilkinson
c25890354b
Remove Hazelcast 3 smoke test to prepare for Hazelcast 5 upgrade
...
Closes gh-28827
2021-11-30 15:55:49 +00:00
Andy Wilkinson
90e8a7da3a
Remove Hibernate 5.2 smoke test to prepare for EE 9 upgrade
...
Closes gh-28826
2021-11-30 15:55:49 +00:00
Andy Wilkinson
28bce49057
Remove Jetty 10 smoke tests to prepare for Jetty 11 upgrade
...
Closes gh-28825
2021-11-30 15:55:48 +00:00
Andy Wilkinson
ba19440f8c
Drop support for EhCache 3 until it supports Jakarta EE 9
...
Closes gh-28800
2021-11-30 15:55:48 +00:00
Andy Wilkinson
a17d6f9791
Drop support for Infinispan until it is Jakarta EE 9 compatible
...
Closes gh-28799
2021-11-30 15:55:48 +00:00
Scott Frederick
015dca1956
Remove support for Thymeleaf
...
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson
85f9949513
Remove support for Jolokia
...
Closes gh-28704
2021-11-30 15:55:47 +00:00
Andy Wilkinson
8bf2ffd93c
Drop support for Jersey until jersey-spring6 is available
...
Closes gh-28808
2021-11-30 15:39:39 +00:00
Scott Frederick
29a21d4621
Remove support for Spring Data Couchbase and Couchbase caching
...
Fixes gh-28613
2021-11-30 15:39:28 +00:00
Andy Wilkinson
63492507b4
Remove support for Apache ActiveMQ
...
Closes gh-28591
2021-11-30 15:38:46 +00:00
Andy Wilkinson
64bf33038d
Remove support for EhCache 2
...
Closes gh-28588
2021-11-30 15:38:23 +00:00
Andy Wilkinson
ef02cc9bff
Remove support for Atomikos
...
Closes gh-28589
2021-11-30 15:38:01 +00:00
Andy Wilkinson
900085628a
Raise the minimum supported version of Java to 17
...
Closes gh-28101
2021-11-30 15:37:40 +00:00
Andy Wilkinson
814c86c5e8
Raise the minimum supported version of Gradle to 7.3
...
Closes gh-28100
2021-11-30 15:36:54 +00:00
Phillip Webb
beb68671bb
Update copyright year of changed files
2021-11-24 10:23:32 -08:00
Scott Frederick
4eed637481
Merge branch '2.5.x'
...
Closes gh-28789
2021-11-23 12:45:46 -06:00
Scott Frederick
12244a8edd
Remove use of Thymeleaf from smoke tests
...
Closes gh-28788
2021-11-23 12:13:05 -06:00
Andy Wilkinson
015cf920da
Name custom task inputs
...
Closes gh-28753
2021-11-19 15:35:39 +00:00
Phillip Webb
b6d0b44703
Fix @SuppressWarnings
2021-11-18 17:26:18 -08:00
Madhura Bhave
dd1d1482dc
Deny unauthorized access to the error page
...
Fixes gh-26356
Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-11-18 15:41:38 -08:00
Andy Wilkinson
7ed19a3b59
Merge branch '2.5.x'
...
Closes gh-28735
2021-11-18 12:21:11 +00:00
Andy Wilkinson
88457d9cfa
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28734
2021-11-18 12:20:50 +00:00
Andy Wilkinson
7d19ea4ca1
Limit log output produced by spring-boot-deployment-tests:intTest
...
Closes gh-28730
2021-11-18 12:18:34 +00:00
Madhura Bhave
6b79d2860f
Merge branch '2.5.x' into main
...
Closes gh-28724
2021-11-17 16:41:23 -08:00
Madhura Bhave
64270eca51
Convert environment used by SpringBootTestContextLoader
...
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.
The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.
Fixes gh-28530
2021-11-17 16:40:53 -08:00
Andy Wilkinson
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson
c80283b85f
Merge branch '2.5.x'
...
Closes gh-28653
2021-11-12 13:05:42 +00:00
Andy Wilkinson
92fd3b79a5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28652
2021-11-12 13:05:14 +00:00
Andy Wilkinson
08aac25c00
Limit logging produced by spring-boot-loader-tests's intTest task
...
Closes gh-28651
2021-11-12 13:04:10 +00:00
Andy Wilkinson
c7a2d61aee
Merge branch '2.4.x'
...
Closes gh-28485
2021-10-29 13:48:36 +01:00
Andy Wilkinson
7fe6f4887c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28484
2021-10-29 13:48:23 +01:00
Andy Wilkinson
22d85e6d7b
Allow tests to be run in parallel across multiple workers
...
Closes gh-19876
2021-10-29 12:48:45 +01:00
Andy Wilkinson
2541c0cbdc
Disable on Windows tests that use embedded Kafka
...
Closes gh-28406
2021-10-21 10:46:50 +01:00
Madhura Bhave
42d21a8336
Remove parameterization of session smoke tests
...
There are dedicated smoke tests for Hazelcast, MongoDB and Redis
that run on CI.
This commit also polishes some of the other smoke tests related to
Spring Session
2021-10-19 16:47:53 -07:00
Madhura Bhave
2caa6cb227
Polish "Add smoke tests for Spring Session Redis/Mongo"
...
See gh-28362
2021-10-19 15:54:19 -07:00
Angel L. Villalain Garcia
9a16c246ec
Add smoke tests for Spring Session Redis/Mongo
...
Add smoke tests that verify the correct behavior of the sessions
endpoint when using Spring Session with MongoDB and Redis.
See gh-28362
2021-10-19 15:53:59 -07:00
Stephane Nicoll
4ebac4cc66
Merge branch '2.5.x'
...
Closes gh-28279
2021-10-11 09:09:15 +02:00
Stephane Nicoll
0103eb123b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28278
2021-10-11 09:09:08 +02:00
dreis2211
ae1167e026
Remove unused settings.xml in integration tests
...
See gh-28269
2021-10-11 09:08:29 +02:00
Madhura Bhave
b350eaee8a
Fix checkstyle
2021-10-06 21:36:52 -07:00
Madhura Bhave
1ff900cce8
Merge pull request #28173 from kandulsh
...
* pr/28173:
Polish "Add smoke test with Spring Session and Hazelcast"
Add smoke test with Spring Session and Hazelcast
Closes gh-28173
2021-10-06 16:02:24 -07:00
Madhura Bhave
8dcf3e2c70
Polish "Add smoke test with Spring Session and Hazelcast"
...
See gh-28173
2021-10-06 16:02:14 -07:00
Susmitha
70dd655b60
Add smoke test with Spring Session and Hazelcast
...
See gh-28173
2021-10-06 16:00:27 -07:00
Andy Wilkinson
0b58d4858d
Merge branch '2.5.x'
...
Closes gh-28200
2021-10-05 11:13:20 +01:00
Andy Wilkinson
322615d9c5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28199
2021-10-05 11:12:48 +01:00
Andy Wilkinson
8c3820f87e
Fix up-to-date checking of syncAppSource tasks
...
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.
This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.
Closes gh-28197
2021-10-05 11:08:22 +01:00
Andy Wilkinson
29637706a9
Merge branch '2.5.x'
...
Closes gh-28166
2021-10-01 14:16:33 +01:00
Andy Wilkinson
14a57adb53
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28165
2021-10-01 14:16:20 +01:00
Andy Wilkinson
35b16ea04e
Minimize dependencies of launch script test app
...
Closes gh-28164
2021-10-01 14:15:52 +01:00
Phillip Webb
55a1ec72cc
Update copyright year of changed files
2021-09-21 11:25:50 -07:00
Phillip Webb
4c2c4ec16c
Merge branch '2.5.x'
2021-09-21 11:25:36 -07:00
Phillip Webb
5ba69634c9
Merge branch '2.4.x' into 2.5.x
2021-09-21 11:17:55 -07:00
Phillip Webb
dfd36673f7
Update copyright year of changed files
2021-09-21 11:17:19 -07:00
dreis2211
cf0fcafd13
Polish
...
See gh-27940
2021-09-21 08:08:29 +02:00
Madhura Bhave
8fd9eb72d4
Allow part of a composite contributor in a health group
...
Closes gh-23027
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-08-18 15:44:10 -07:00
Andy Wilkinson
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
2021-08-18 18:28:34 +01:00
Andy Wilkinson
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
2021-08-18 17:52:42 +01:00
izeye
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
2021-08-18 17:38:40 +01:00
Andy Wilkinson
2dfdcf5e88
Merge branch '2.5.x'
...
Closes gh-27754
2021-08-18 13:52:23 +01:00
Andy Wilkinson
0d904b8868
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson
0b7994a679
Polish "Use 2012 for copyright beginning year"
...
See gh-27734
2021-08-18 13:48:29 +01:00
Andy Wilkinson
e737388f5c
Merge branch '2.5.x'
...
Closes gh-27654
2021-08-12 18:09:04 +01:00
Andy Wilkinson
d6cf46acc5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27653
2021-08-12 18:08:37 +01:00
Andy Wilkinson
403dda7f0d
Remove field inject and circular reference from Data Mongo smoke test
...
Closes gh-27651
2021-08-12 18:07:42 +01:00
Andy Wilkinson
e265825653
Merge branch '2.5.x'
...
Closes gh-27506
2021-07-27 11:03:00 +01:00
Andy Wilkinson
08e26c97aa
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27505
2021-07-27 11:02:20 +01:00
Andy Wilkinson
031a036c9f
Customize security filter registration in separate management context
...
Fixes gh-27372
2021-07-27 10:57:38 +01:00
Scott Frederick
32bb6f6989
Move deployment tests to system tests pipeline
...
Closes gh-27499
2021-07-26 15:29:56 -05:00
Andy Wilkinson
14db8aec95
Skip server tests on Java 16 as Gradle Plugin is not available
...
See gh-27476
2021-07-23 19:44:29 +01:00
Andy Wilkinson
f830ce5e17
Merge branch '2.5.x'
2021-07-23 17:40:29 +01:00
Andy Wilkinson
27ae302905
Merge branch '2.4.x' into 2.5.x
2021-07-23 17:40:20 +01:00
Andy Wilkinson
931409cdd4
Update copyright header in changed files
2021-07-23 17:39:55 +01:00
Andy Wilkinson
fc9f38351a
Merge branch '2.5.x'
...
Closes gh-27479
2021-07-23 17:34:55 +01:00
Andy Wilkinson
bd3aec4f80
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27478
2021-07-23 17:30:27 +01:00
Andy Wilkinson
d9a24f32b4
Rework spring-boot-server-tests to avoid using Maven
...
Closes gh-27476
2021-07-23 17:30:07 +01:00
Phillip Webb
7e9ac39f0d
Update copyright year of changed files
2021-07-22 09:50:37 -07:00
Andy Wilkinson
37f690323f
Polish
...
Closes gh-27432
2021-07-21 11:55:38 +01:00
Andy Wilkinson
bb26b7bdf5
Polish
...
Closes gh-27431
2021-07-21 11:53:10 +01:00
izeye
734293d491
Polish
...
See gh-27418
2021-07-21 11:17:43 +01:00
Scott Frederick
9f001efa29
Adjust fat jar central directory to account for launch script
...
An upgrade to Apache Commons Compress allows the build plugins to write
the launch script to the fat jar as a proper preamble, making the file
compatible with more jar and zip tooling.
Fixes gh-22336
2021-07-19 15:02:42 -05:00
Andy Wilkinson
51fedd6528
Reinstate support for Hibernate < 5.5
...
See gh-27352
2021-07-19 13:52:40 +01:00
Andy Wilkinson
8259f15451
Fix deprecation warnings
...
See gh-27383
2021-07-19 11:53:58 +01:00
Andy Wilkinson
0d1d637c73
Merge branch '2.5.x'
...
Closes gh-27383
2021-07-19 11:07:58 +01:00
Andy Wilkinson
c9ccfcc25f
Rework Jetty10Http2OverTlsTests so they compile with Java 8
...
Closes gh-27382
2021-07-19 11:06:58 +01:00
Andy Wilkinson
43f1b98864
Polish "Add @WebServiceServerTest slice test support"
...
See gh-27091
2021-07-16 11:28:39 +01:00
Andy Wilkinson
3e0baf1bfd
Merge branch '2.5.x'
...
Closes gh-27353
2021-07-15 19:45:32 +01:00
Andy Wilkinson
c8c784bd5c
Allow @SpyBean to be used to spy on a Spring Data repository
...
Fixes gh-7033
2021-07-15 19:44:52 +01:00
Andy Wilkinson
c00e885ac4
Work around compile warnings from Data Neo4j's use of API Guardian
...
See gh-27170
2021-07-14 18:28:24 +01:00
bono007
d16ecab24b
Remove default spring.mongodb.embedded.version
...
See gh-27108
2021-07-13 10:13:54 +01:00
Stephane Nicoll
72f5995208
Polish
2021-07-13 09:56:45 +02:00
Andy Wilkinson
a7334deb54
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27234
2021-07-10 12:05:40 +01:00
Andy Wilkinson
57d7ba0836
Switch s-b-server-tests from libs-snapshot to snapshot and milestone
...
Closes gh-27233
2021-07-10 12:04:55 +01:00
Andy Wilkinson
580b1b81ab
Fix HTTP/2 over TLS with Jetty 10
...
Fixes gh-26988
2021-06-21 12:06:10 +01:00
Andy Wilkinson
4bf329e266
Correct directory names in Jetty 10 smoke tests
...
See gh-26847
2021-06-16 19:59:50 +01:00
Andy Wilkinson
bc7004d9c6
Fix WebSocket support with Jetty 10.0.x
...
Fixes gh-26847
2021-06-16 12:38:33 +01:00
Phillip Webb
f798f26596
Merge branch '2.4.x'
2021-06-08 18:05:50 -07:00