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

518 Commits

Author SHA1 Message Date
Phillip Webb
f12ab1ff90 Update copyright header of changed files 2019-04-03 16:13:00 -07:00
Phillip Webb
2376f973f4 Merge branch '2.1.x' 2019-04-02 13:46:36 -07:00
Phillip Webb
47c6bf741d Merge branch '2.0.x' into 2.1.x 2019-04-02 13:40:21 -07:00
Phillip Webb
07c000c5b7 Merge branch '1.5.x' into 2.0.x 2019-04-02 13:34:28 -07:00
Madhura Bhave
8daa8c48fb Merge branch '2.1.x' 2019-04-01 15:51:25 -07:00
Madhura Bhave
c592e71449 Override missing methods in FilteredClassLoader 
Closes gh-16404
 2019-04-01 15:42:02 -07:00
Andy Wilkinson
878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00:00
Andy Wilkinson
5a3474c7a8 Polish "Use HTTPS for external links wherever possible" 
See gh-16320
 2019-03-28 10:53:01 +00:00
Andy Wilkinson
864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Spring Operator
1a4c6f2dac Use HTTPS for external links wherever possible 
See gh-16319
 2019-03-27 20:06:52 +00:00
Andy Wilkinson
ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Andy Wilkinson
4900505425 Merge branch '2.0.x' into 2.1.x 2019-03-26 13:53:57 +00:00
Andy Wilkinson
fedb40a2bf Merge branch '1.5.x' into 2.0.x 2019-03-26 13:48:32 +00:00
Madhura Bhave
95d10388dd Merge branch '2.1.x' 2019-03-25 11:03:10 -07:00
Madhura Bhave
0c2e71cd08 Prevent early initialization of factory beans in text context customizers 
Until Spring Framework 5.1.15, a FactoryBean with a non-default constructor
defined via component scanning would cause an error. This behavior has changed
as of https://github.com/spring-projects/spring-framework/issues/22409.
Regardless of this change we want to ensure that we avoid triggering eager
initialisation. `SimpleFactoryBean` has been written this way so that the tests
fail if early initialization is triggered regardless of the Spring Framework version.

Fixes gh-15898
 2019-03-25 10:55:41 -07:00
Andy Wilkinson
36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Spring Operator
00ab30362c Use HTTPS for external links in XML files 
See gh-16270
 2019-03-20 14:33:25 +00:00
Andy Wilkinson
b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Andy Wilkinson
a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed Update build and setup configuration to use HTTPS 
See gh-16246
 2019-03-19 16:58:31 +00:00
Madhura Bhave
0611eb49c8 Merge branch '2.1.x' 2019-03-18 18:03:32 -07:00
Madhura Bhave
7ea8770524 Polish "Fix request factory used with withBasicAuth" 
Fixes gh-15982
 2019-03-18 18:00:17 -07:00
Dmytro Nosan
756bd890eb Fix request factory used with TestRestTemplate withBasicAuth 
This commit updates the behavior of withBasicAuth on TestRestTemplate
by trying to use the same request factory type as the underlying restTemplate.
If creation of a new instance of the configured request factory class fails,
it falls back to the `ClientHttpRequestFactorySupplier`.

See gh-15982
 2019-03-18 18:00:08 -07:00
Madhura Bhave
1893eeef4f Merge branch '2.1.x' 2019-03-15 17:27:10 -07:00
Dmytro Nosan
2f3e5d65be Test server port shouldn't affect management port when random 
Closes gh-16108
 2019-03-15 17:21:29 -07:00
Madhura Bhave
2cdc93cf19 Make TestRestTemplate withBasicAuth fault tolerant 
It's part of TestRestTemplate's contract that it's fault tolerant. This
commit aligns the behavior of `withBasicAuth` with that expectation.

Closes gh-15780
 2019-03-13 11:49:42 -07:00
Andy Wilkinson
68bfb020aa Reduce need for bean method proxying and disable where not needed 
Closes gh-9068
 2019-03-12 13:18:42 +00:00
Phillip Webb
dd3e8154d9 Merge branch '2.1.x' 2019-03-11 22:15:19 -07:00
Phillip Webb
fc3aa43cc2 Update copyright year for changed files 2019-03-11 22:14:53 -07:00
Andy Wilkinson
aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Andy Wilkinson
8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson
361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Stephane Nicoll
b34b217d1e Upgrade to Kotlin 1.3.21 
Closes gh-16195
 2019-03-11 15:56:13 +01:00
Andy Wilkinson
d6a869fa98 Switch to Jakarta EE API dependencies where possible 
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
 2019-03-06 11:20:51 +00:00
Andy Wilkinson
f2e3e274a8 Merge branch '2.1.x' 2019-02-21 08:19:43 +00:00
Andy Wilkinson
53326695ea Polish 2019-02-21 08:13:54 +00:00
Stephane Nicoll
4992b7fb29 Polish "Migrate Kotlin tests to Mockk" 
Closes gh-15993
 2019-02-19 13:36:06 +01:00
Sebastien Deleuze
cca79b8d4d Migrate Kotlin tests to Mockk 
See gh-15993
 2019-02-19 13:35:43 +01:00
Stephane Nicoll
7413584b00 Polish "Support expressing application args in @SpringBootTest" 
Closes gh-14823
 2019-02-13 15:07:11 +01:00
Justin Griffin
422e6b7d41 Support expressing application args in @SpringBootTest 
Add `args` property to the `@SpringBootTest` annotation so tests
can easily supply application arguments to pass to their app under test.

See gh-14823
 2019-02-13 14:38:26 +01:00
Andy Wilkinson
c04eba7ebc Polish "Add TestNG support in TestTypeExcludeFilter" 
See gh-7630
 2019-02-12 15:28:19 +00:00
Eddú Meléndez
b005008cac Add TestNG support in TestTypeExcludeFilter 
See gh-7630
 2019-02-12 15:27:51 +00:00
Andy Wilkinson
89bf486d0c Merge branch '2.1.x' 2019-02-05 11:39:37 +00:00
Andy Wilkinson
1f67707509 Fix cast in TestRestTemplateContextCustomizer 
Closes gh-15843
 2019-02-05 11:39:25 +00:00
Andy Wilkinson
45cc649c7d Merge branch '2.1.x' 2019-02-04 12:36:33 +00:00
Andy Wilkinson
82bc87560c Use AssertJ’s exception assertions rather than fail 
Closes gh-15761
 2019-02-04 11:48:26 +00:00
Andy Wilkinson
2cb147af7c Merge branch '2.1.x' 2019-01-22 09:22:17 +00:00
Andy Wilkinson
e15e140f8c Polish "Fix typos in JsonContentAssert failure messages" 
See gh-15752
 2019-01-22 09:19:41 +00:00