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

660 Commits

Author SHA1 Message Date
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
Stephane Nicoll
270554d3cd Merge branch '2.1.x' 2019-03-29 11:40:15 +01:00
Stephane Nicoll
090f5f5397 Polish "Add error rendering support with @WebFluxTest" 
Closes gh-16266
 2019-03-29 11:36:27 +01:00
Ali Dehghani
53e7484d87 Add error rendering support with @WebFluxTest 
See gh-16266
 2019-03-29 11:07:26 +01:00
Andy Wilkinson
878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00:00
Andy Wilkinson
864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Andy Wilkinson
ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Madhura Bhave
0d136f0573 Merge branch '2.1.x' 2019-03-20 18:00:48 -07:00
Madhura Bhave
0a54fb73fa Remove redundant include from WebFluxTypeExcludeFilter 
For webflux, security configuration is configured via a bean of type
`SecurityWebFilterChain` and not `ServerHttpSecurity`. We would have changed
the include to be `SecurityWebFilterChain` but the filter only applies to
beans registered via component scanning and not those registered in
`@Configuration` classes, making the includes redundant.

See gh-16088
 2019-03-20 17:54:04 -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
dreis2211
dda0b3e2a1 Remove explicit types 
Closes gh-16265
 2019-03-20 09:44:51 +01: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
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
Stephane Nicoll
a44a55e948 Merge branch '2.1.x' 2019-03-12 11:07:53 +01:00
Stephane Nicoll
161c0b9fad Polish contribution 
Closes gh-16170
 2019-03-12 11:06:19 +01:00
ayudovin
51013421f2 Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest 
See gh-16170
 2019-03-12 11:06:18 +01:00
Stephane Nicoll
078bd890a6 Merge branch '2.0.x' into 2.1.x 2019-03-12 11:05:23 +01:00
Stephane Nicoll
50d0b4df46 Polish 2019-03-12 11:04:00 +01:00
Phillip Webb
64a2e8d67f Update copyright year for changed files 2019-03-11 22:15:36 -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
89bb973745 Merge branch '2.1.x' 2019-03-09 20:02:05 +00:00
Andy Wilkinson
7153525ee2 Annotation @JsonTest with @ExtendWith(SpringExtension.class) 
Closes gh-16183
 2019-03-09 20:00:06 +00:00
Andy Wilkinson
b8dff5fe17 Merge branch '2.1.x' 2019-03-07 10:20:29 +00: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
Stephane Nicoll
1b55f0ccf9 Merge branch '2.1.x' 2019-03-04 15:19:35 +01:00
Johnny Lim
3242e89271 Polish 
See gh-16083
 2019-03-04 15:18:51 +01:00
Stephane Nicoll
f90bfff132 Merge branch '2.1.x' 2019-03-04 15:00:21 +01:00
Stephane Nicoll
2099093978 Merge branch '2.0.x' into 2.1.x 2019-03-04 15:00:00 +01:00
Stephane Nicoll
b8cbd0c17f Merge branch '1.5.x' into 2.0.x 2019-03-04 14:55:10 +01:00
Stephane Nicoll
7b8563a877 Merge branch '2.1.x' 2019-03-04 09:29:13 +01:00
dreis2211
be445f6346 Use AssertJ facilities for expected exceptions 
See gh-16066
 2019-03-04 08:45:42 +01:00
Madhura Bhave
64b7466d51 Remove secure flag from AutoConfigureMockMvc 
Closes gh-13822
 2019-02-28 13:15:00 -08:00
Stephane Nicoll
2ad234b605 Adapt to breaking change in Spring Hateoas 2019-02-28 13:42:27 +01:00
dreis2211
2ab4ce03db Fix deprecations 
Closes gh-16037
 2019-02-26 16:49:13 +01:00
Andy Wilkinson
de0c065625 Inject single-use configuration dependencies into bean methods 
Closes gh-15751
 2019-02-20 17:02:43 +00:00
Andy Wilkinson
747e419db1 Merge branch '2.1.x' 2019-02-13 17:45:45 +00:00
Andy Wilkinson
9fb0b97f96 Decorate test containers so tests are skipped without Docker 
Closes gh-15901
Closes gh-15638
 2019-02-13 17:44:45 +00:00
Andy Wilkinson
1c90a89acd Merge branch '2.1.x' 2019-02-12 09:47:42 +00:00
Andy Wilkinson
2884d99a5d Complete move to Testcontainers' Neo4j container 
Closes gh-15638
 2019-02-12 09:46:11 +00:00
Andy Wilkinson
7e51e1a076 Merge branch '2.1.x' 2019-02-12 09:26:59 +00:00
Andy Wilkinson
01b8e2c834 Polish “Replace custom Neo4j container with Testcontainers version” 
See gh-15638
 2019-02-12 09:25:07 +00:00
Michael Simons
316126e8f0 Replace custom Neo4j container with Testcontainers version 
See gh-15638
 2019-02-12 09:24:44 +00:00
Andy Wilkinson
d9ec48ef12 Merge branch '2.1.x' 2019-02-11 16:13:52 +00:00
Andy Wilkinson
3f32fbd0de Polish "Remove unwanted @Nullable annotations" 
See gh-15876
 2019-02-11 16:11:40 +00:00