Commit Graph

7 Commits

Author SHA1 Message Date
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 e737388f5c Merge branch '2.5.x'
Closes gh-27654
2021-08-12 18:09:04 +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
Phillip Webb 7e9ac39f0d Update copyright year of changed files 2021-07-22 09:50:37 -07:00
bono007 d16ecab24b Remove default spring.mongodb.embedded.version
See gh-27108
2021-07-13 10:13:54 +01:00
Madhura Bhave d9466f5659 Move smoke tests under spring-boot-test
See gh-17393
2019-07-02 15:55:58 -07:00