fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,323 Commits 22 Branches 339 Tags
Commit Graph

943 Commits

Author SHA1 Message Date
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