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

547 Commits

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