Phillip Webb
c8676a81de
Merge branch '2.6.x' into 2.7.x
2022-10-25 15:48:04 -07:00
Phillip Webb
55ad2b9371
Remove accidentally committed debug code
2022-09-08 19:52:01 -07:00
Phillip Webb
e88a682220
Merge branch '2.6.x' into 2.7.x
2022-09-08 19:37:52 -07:00
Stephane Nicoll
50c099334b
Adapt deprecated getIpAddress call with getHost in Redis Tests
...
Closes gh-32147
2022-08-23 08:25:52 +02:00
thegeekyasian
5b1c6381db
Adapt deprecated getIpAddress call with getHost in Redis Tests
...
See gh-32131
2022-08-22 16:06:21 +02: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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