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

797 Commits

Author SHA1 Message Date
Stephane Nicoll
2b140950e3 Merge branch '2.6.x' into 2.7.x 
Closes gh-29176
 2021-12-27 12:02:57 +01:00
izeye
7fbb5749d1 Polish 
See gh-29157
 2021-12-27 12:01:50 +01:00
Brian Clozel
f61c87c3a7 Revert "Merge branch '2.7.x'" 
This reverts commit f0677a119c54113f87f2d3bca7d5a4e34356234c, reversing
changes made to 938d58f32ce22e0256d63e7df5931ee3d8082050.
 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
c0707e4f5b Auto-configure GraphQlTester 
This commit adds the required infrastructure to auto-configure a
`GraphQlTester` or `WebGraphQlTester` in Spring Boot tests.
Specific annotations like `AutoConfigureGraphQlTester` and
`AutoConfigureWebGraphQlTester` will contribute pre-configured beans for
testing a GraphQL with the tester.

This also ships a `ContextCustomize` for contributing a `GraphQlTester`
in the case of a full `@SpringBootTest` integration test against a live
server.

See gh-29140
 2021-12-21 08:34:06 +01:00
Phillip Webb
f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08: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
8bf2ffd93c Drop support for Jersey until jersey-spring6 is available 
Closes gh-28808
 2021-11-30 15:39:39 +00:00
Andy Wilkinson
5944041f2a Switch to Yasson for JSON-B testing 
Closes gh-28615
 2021-11-30 15:39:08 +00:00
Madhura Bhave
27eb992252 Fix property source ordering in SpringBootTest 
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Closes gh-28804
 2021-11-24 10:29:35 -08:00
Phillip Webb
beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Madhura Bhave
49e408828c Fix property source ordering in SpringBootTest 
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Fixes gh-28776
 2021-11-24 10:17:02 -08: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
Phillip Webb
d8629fc63d Merge branch '2.5.x' 2021-11-08 13:14:52 -08:00
Phillip Webb
ddd38a7ac3 Merge branch '2.4.x' into 2.5.x 2021-11-08 13:14:35 -08:00
Phillip Webb
75bf430eb1 Polish ImportsContextCustomizerTests 
Update the test classes to include an `@Import` annotation. Without this
the tests would not fail even if the filter is missing.
 2021-11-08 13:13:04 -08:00
Phillip Webb
0a6991e744 Merge branch '2.5.x' 
Closes gh-28566
 2021-11-08 13:11:03 -08:00
Phillip Webb
6406ee5609 Merge branch '2.4.x' into 2.5.x 
Closes gh-28565
 2021-11-08 13:08:52 -08:00
Phillip Webb
8a14e1e2e9 Polish 'Ignore JUnit annotations when caching test contexts' 
See gh-28563
 2021-11-08 13:07:26 -08:00
Loïc Ledoyen
23876d8a32 Ignore JUnit annotations when caching test contexts 
Update `ImportsContextCustomizer` to ignore JUnit annotations.

See gh-28563
 2021-11-08 13:06:23 -08:00
Stephane Nicoll
c05223d9c8 Merge branch '2.5.x' 
Closes gh-28545
 2021-11-06 12:06:14 +01:00
Stephane Nicoll
4304eea319 Polish contribution 
See gh-28531
 2021-11-06 12:03:22 +01:00
dreis2211
7d594aa301 Avoid duplicate AOP proxy class definition with FilteredClassLoader 
See gh-28531
 2021-11-06 11:58:28 +01:00
Stephane Nicoll
bf88405121 Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure 
Closes gh-28540
 2021-11-05 14:20:37 +01:00
Stephane Nicoll
fbe614a61b Fix bean type visibility 
See gh-28437
 2021-11-02 14:41:32 +01:00
Stephane Nicoll
2be0161f9a Fix bean type visibility 
See gh-28437
 2021-11-02 12:35:19 +01:00
Andy Wilkinson
84b553a8ca Upgrade to Jackson Bom 2.13.0 
Closes gh-28298
 2021-10-13 10:32:17 +01:00
Leo Li
1770f065a5 Polish 
See gh-28239
 2021-10-13 09:07:33 +02:00
Andy Wilkinson
1a505964ee Merge branch '2.5.x' 
Closes gh-28207
 2021-10-06 10:03:24 +01:00
Andy Wilkinson
1931104d13 Merge branch '2.4.x' into 2.5.x 
Closes gh-28206
 2021-10-06 09:57:19 +01:00
Andy Wilkinson
9c9fbf400e Upgrade to Spring Java Format 0.0.29 
Closes gh-28205
 2021-10-06 09:52:45 +01:00
Andy Wilkinson
575d83737a Merge branch '2.5.x' 
Closes gh-27799
 2021-08-23 13:27:22 +01:00
Andy Wilkinson
e409489859 Merge branch '2.4.x' into 2.5.x 
Closes gh-27798
 2021-08-23 13:26:37 +01:00
Andy Wilkinson
f8ef90813f Allow @MockBean to be used with Framework's @Repeat 
Fixes gh-27693
 2021-08-23 12:38:15 +01: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
01e741d703 Prohibit circular references by default 
Closes gh-27652
 2021-08-17 14:51:39 +01:00
Andy Wilkinson
228e4e3bc8 Make it easier to add new config options to ApplicationContextRunners 
Closes gh-27690
 2021-08-17 14:51:08 +01:00
Andy Wilkinson
e30bf0e3e5 Merge branch '2.5.x' 
Closes gh-27528
 2021-07-29 18:47:40 +01:00
Andy Wilkinson
43d623e696 Merge branch '2.4.x' into 2.5.x 
Closes gh-27527
 2021-07-29 18:47:31 +01:00
Andy Wilkinson
7eb5f35f2f Make WebTestClient creation back off when no HTTP client available 
Fixes gh-27520
 2021-07-29 18:45:53 +01:00
Andy Wilkinson
355226c21e Merge branch '2.5.x' 
Closes gh-27474
 2021-07-23 13:09:37 +01:00
Andy Wilkinson
eaca9c7a83 Merge branch '2.4.x' into 2.5.x 
Closes gh-27473
 2021-07-23 13:09:27 +01:00
Andy Wilkinson
ee07d6c3ca Increase response timeout for server-bound WebTestClients 
Closes gh-27472
 2021-07-23 13:06:25 +01:00