GitHub-Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-05-03 03:43:54 +01:00
Code Issues Projects Releases Wiki Activity
50,613 Commits 23 Branches 387 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

484 Commits

Author SHA1 Message Date
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
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
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
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
Andy Wilkinson 84b553a8ca Upgrade to Jackson Bom 2.13.0 
Closes gh-28298
 2021-10-13 10:32:17 +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 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
Andy Wilkinson 3e0baf1bfd Merge branch '2.5.x' 
Closes gh-27353
 2021-07-15 19:45:32 +01:00
Andy Wilkinson c8c784bd5c Allow @SpyBean to be used to spy on a Spring Data repository 
Fixes gh-7033
 2021-07-15 19:44:52 +01:00
Stephane Nicoll dc5acb0019 Remove deprecated code flagged for removal 
Closes gh-27303
 2021-07-14 11:50:01 +02:00
Stephane Nicoll 9e46061aa6 Allow to chain ContextConsumer implementations 
Closes gh-26723
 2021-06-11 16:04:34 +02:00
Phillip Webb 4d62e47c5d Merge branch '2.3.x' into 2.4.x 2021-06-08 18:05:12 -07:00
Phillip Webb 9e1c78da99 Update copyright year of changed files 2021-06-08 18:03:46 -07:00
Andy Wilkinson e317079446 Merge branch '2.4.x' 
Closes gh-26524
 2021-05-17 11:27:57 +01:00
Andy Wilkinson 49d362fd7f Merge branch '2.3.x' into 2.4.x 
Closes gh-26523
 2021-05-17 11:27:46 +01:00
weixsun 7f445630e4 Remove unnecessary semicolon 
See gh-26446
 2021-05-17 11:26:57 +01:00
Stephane Nicoll d3c817b7ba Polish "Remove unnecessary throws declaration in tests" 
See gh-26441
 2021-05-17 09:36:53 +02:00
weixsun 8a2be288a3 Remove unnecessary throws declaration in tests 
See gh-26441
 2021-05-17 09:31:51 +02:00
Stephane Nicoll 691bbcfdfd Update copyright year of changed files 
See gh-26448
 2021-05-16 15:29:48 +02:00
weixsun d115361980 Remove redundant suppression 
See gh-26448
 2021-05-16 15:10:48 +02:00
dreis2211 1ccd8dae8a Allow the project to be built with Java 16 
See gh-25171
 2021-03-04 18:54:56 +00:00
Andy Wilkinson 297e3079d0 Fix handling of UriTemplateRequestEntity in TestRestTemplate 
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.

This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.

Fixes gh-25097

[1] https://github.com/spring-projects/spring-framework/commit/a0f4d81db76cb100b8f0da3a3cc8a945a012a2c0
 2021-02-04 10:59:00 +00:00
Madhura Bhave 920136d908 Merge branch '2.3.x' into 2.4.x 
Closes gh-24678
 2021-01-06 16:44:32 -08:00
Madhura Bhave 73a2a4b383 Consider context-path for WebTestClient baseUrl 
Fixes gh-24168
 2021-01-06 16:42:09 -08:00
Phillip Webb d6890e39a7 Merge branch '2.3.x' into 2.4.x 
Closes gh-24536
 2020-12-16 13:10:35 -08:00
dreis2211 0ec603cdad Avoid duplicates in MergedContextConfiguration 
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.

See gh-24532
 2020-12-16 12:50:54 -08:00
Phillip Webb 72d36e0c07 Update copyright year of changed files 2020-12-10 10:46:04 -08:00