Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,483 Commits 23 Branches 0 Tags
4efd8ba587a281ffd99b1c52afadcbcd3406145c
Commit Graph

24483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
4efd8ba587 Merge branch '2.2.x' 
Closes gh-19574
 2020-01-08 14:02:50 +00:00
Andy Wilkinson
02965e9744 Fix javadoc warnings 
Fixes gh-19572
 2020-01-08 14:02:24 +00:00
Stephane Nicoll
e5c1f3133a Harmonize cassandra tests 2020-01-08 14:57:52 +01:00
Stephane Nicoll
6ced89490c Polish 2020-01-08 14:34:33 +01:00
Stephane Nicoll
bc066d279b Polish cassandra tests 
See gh-18019
 2020-01-08 14:22:48 +01:00
Stephane Nicoll
91151e0aac Merge pull request #19528 from grafjo 
* pr/19528:
  Polish "Add Stackdriver metrics export support"
  Add Stackdriver metrics export support

Closes gh-19528
 2020-01-08 13:38:07 +01:00
Stephane Nicoll
462442e7d2 Polish "Add Stackdriver metrics export support" 
See gh-19528
 2020-01-08 13:35:44 +01:00
Johannes Graf
d42256d856 Add Stackdriver metrics export support 
See gh-19528
 2020-01-08 13:32:27 +01:00
Andy Wilkinson
10ba17c390 Merge branch '2.2.x' 
Closes gh-19571
 2020-01-08 11:44:40 +00:00
Andy Wilkinson
6d8f07d899 Merge branch '2.1.x' into 2.2.x 
Closes gh-19570
 2020-01-08 11:42:56 +00:00
Andy Wilkinson
bdffa860d9 Increase startup timeout for Docker containers 
Closes gh-19569
 2020-01-08 11:39:36 +00:00
Andy Wilkinson
cbacb6116b Merge branch '2.2.x' 
Closes gh-19568
 2020-01-08 11:15:59 +00:00
Andy Wilkinson
e04055650c Merge branch '2.1.x' into 2.2.x 
Closes gh-19567
 2020-01-08 11:15:29 +00:00
Andy Wilkinson
3fb1bb74ba Configure WebTestClient to be able to consume large responses 
Closes gh-19566
 2020-01-08 11:14:42 +00:00
Madhura Bhave
c9ad3564d9 Merge branch '2.2.x' 
Closes gh-19562
 2020-01-07 14:29:45 -08:00
Madhura Bhave
82dc7bcc90 HypermediaAutoConfiguration should back off when Spring MVC absent 
Fixes gh-19392
 2020-01-07 14:28:58 -08:00
Madhura Bhave
87dd11502a Refactor HypermediaAutoConfigurationTests 2020-01-07 14:28:09 -08:00
Madhura Bhave
6944e52052 Merge branch '2.2.x' 2020-01-07 13:49:43 -08:00
Madhura Bhave
ac10ebba33 Fix checkstyle 2020-01-07 13:49:02 -08:00
Madhura Bhave
c82d728c93 Merge branch '2.2.x' 
Closes gh-19561
 2020-01-07 13:34:43 -08:00
Madhura Bhave
67fab60fbd Merge branch '2.1.x' into 2.2.x 
Closes gh-19560
 2020-01-07 13:33:32 -08:00
Madhura Bhave
6d6bbfb731 Merge pull request #19556 from scottfrederick 
* pr/19556:
  Add profiles directly to the application environment for tests

Closes gh-19556
 2020-01-07 13:23:41 -08:00
Scott Frederick
487b9cbf96 Add profiles directly to the application environment for tests 
Prior to this commit, active profiles were being added to the Spring Boot
application environment by setting the `spring.profiles.active` property.
This could result in profiles getting parsed differently than other uses of `@ActiveProfiles`.
Setting the profiles directly in the `Environment` prevents this parsing.

See gh-19556
 2020-01-07 13:23:09 -08:00
Andy Wilkinson
30c124f549 Merge branch '2.2.x' 
Closes gh-19554
 2020-01-07 12:06:07 +00:00
Andy Wilkinson
c57359ea3b Merge branch '2.1.x' into 2.2.x 
Closes gh-19553
 2020-01-07 12:05:21 +00:00
Andy Wilkinson
d46406fcb9 Remove loading of non-existent properties file from antlib 
Fixes gh-19552
 2020-01-07 12:04:59 +00:00
Brian Clozel
4910b51877 Merge branch '2.2.x' 2020-01-06 18:09:14 +01:00
Brian Clozel
2f78c72f92 Avoid 406 Not Acceptable for error pages 
Prior to this commit, the `ErrorController` would override the original
error response status if the error map cannot be written due to content
negotiation with the HTTP client. In that case, the error handling
infrastructure returns a `406 Not Acceptable` response.

This commit improves the `ErrorController` so that
`HttpMediaTypeNotAcceptableException` instances thrown by that
controller are not returned as is but instead we write the error
response with an empty body and the original HTTP error status.

Fixes gh-19545
See gh-19522
 2020-01-06 18:08:35 +01:00
Stephane Nicoll
ee7555750e Add ComponentScan#nameGenerator alias on @SpringBootApplication 
This commit allows to customize the default BeanNameGenerator for
scanned components using @SpringBootApplication.

Closes gh-19346
 2020-01-06 16:33:38 +01:00
Stephane Nicoll
a0a4cbce3a Merge branch '2.2.x' 
Closes gh-19542
 2020-01-06 13:02:10 +01:00
Stephane Nicoll
6a7e3c55b8 Merge pull request #19536 from dreis2211 
* pr/19536:
  Remove deprecated usage of WebTestClientBuilderCustomizer

Closes gh-19536
 2020-01-06 13:01:56 +01:00
dreis2211
6ffe47cd06 Remove deprecated usage of WebTestClientBuilderCustomizer 
See gh-19536
 2020-01-06 12:59:12 +01:00
Stephane Nicoll
e250cce274 Merge pull request #19511 from nosan 
* pr/19511:
  Polish "Add Java 14 to JavaVersion enumeration"
  Add Java 14 to JavaVersion enumeration

Closes gh-19511
 2020-01-04 11:47:18 +01:00
Stephane Nicoll
fc60301fc7 Polish "Add Java 14 to JavaVersion enumeration" 
See gh-19511
 2020-01-04 11:45:43 +01:00
Dmytro Nosan
a5a3a020b6 Add Java 14 to JavaVersion enumeration 
See gh-19511
 2020-01-04 11:44:03 +01:00
Stephane Nicoll
47481464ff Merge branch '2.2.x' 
Closes gh-19535
 2020-01-04 11:42:43 +01:00
Stephane Nicoll
620f5801a2 Merge pull request #19521 from rstoyanchev 
* pr/19521:
  Improve Spring MVC auto-configuration section

Closes gh-19521
 2020-01-04 11:40:40 +01:00
Rossen Stoyanchev
f6947648c9 Improve Spring MVC auto-configuration section 
See gh-19521
 2020-01-04 11:37:01 +01:00
Stephane Nicoll
84dfb3eae9 Merge branch '2.2.x' 
Closes gh-19533
 2020-01-04 11:35:17 +01:00
Stephane Nicoll
58a805e607 Merge branch '2.1.x' into 2.2.x 
Closes gh-19532
 2020-01-04 11:34:25 +01:00
Stephane Nicoll
cb40454977 Merge pull request #19523 from dreis2211 
* pr/19523:
  Upgrade CI to Artifactory Resource 0.0.10

Closes gh-19523
 2020-01-04 11:32:42 +01:00
dreis2211
48032acd04 Upgrade CI to Artifactory Resource 0.0.10 
See gh-19523
 2020-01-04 11:31:36 +01:00
Madhura Bhave
bb55bad170 Merge branch '2.2.x' 
Closes gh-19529
 2020-01-03 14:27:31 -08:00
Madhura Bhave
c12a3f4172 Support explicitly setting forward headers strategy to NONE 
Prior to this commit, there was no distinction between explicitly setting
forward headers strategy to a value of NONE and not setting it at all.
This meant that in a cloud environment, a cloud provider was always checked
to see if it was active and using forward headers and there was no way to
prevent that.

This commit changes the default value of the property to null so that there
is a way to determine if the property was explicitly set to NONE.

Fixes gh-19333
 2020-01-03 14:19:48 -08:00
Madhura Bhave
f94c6d7458 Merge branch '2.2.x' 2020-01-03 11:42:42 -08:00
Madhura Bhave
8e285a4387 Fix checkstyle 2020-01-03 11:42:14 -08:00
Madhura Bhave
743cf3b2a7 Merge branch '2.2.x' 
Closes gh-19527
 2020-01-03 11:21:50 -08:00
Madhura Bhave
ac46f5971f Merge branch '2.1.x' into 2.2.x 
Closes gh-19526
 2020-01-03 11:19:21 -08:00
Madhura Bhave
24dd416f4b Add a test case for binding to map with wildcard types 
This commit also changes the spring framework version
to use snapshots.

Closes gh-18767
 2020-01-03 11:13:41 -08:00
Brian Clozel
cc154bbefb Avoid 406 Not Acceptable for error pages 
Prior to this commit, the `ErrorController` would override the original
error response status if the error map cannot be written due to content
negotiation with the HTTP client. In that case, the error handling
infrastructure returns a `406 Not Acceptable` response.

This commit improves the `ErrorController` so that
`HttpMediaTypeNotAcceptableException` instances thrown by that
controller are not returned as is but instead we write the error
response with an empty body and the original HTTP error status.

Fixes gh-19522
 2020-01-03 14:51:53 +01:00