root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
17,161 Commits 28 Branches 365 Tags 289 MiB
Commit Graph

17161 Commits

Author SHA1 Message Date
Stephane Nicoll eb20cd2e35 Merge branch '1.5.x' into 2.0.x 2018-09-09 10:17:02 +02:00
Stephane Nicoll d5a2792ed0 Start building against Spring Data Ingalls snapshots 
See gh-14329
 2018-09-09 10:16:17 +02:00
Madhura Bhave e41394233b Harmonize ReactiveSecurityAutoConfiguration 
Fixes gh-14263
 2018-09-07 11:38:09 -07:00
Stephane Nicoll feff65e73e Merge branch '1.5.x' into 2.0.x 2018-09-07 17:20:30 +02:00
Stephane Nicoll 5a0594805f Upgrade to Spring Framework 4.3.19 
Closes gh-14326
 2018-09-07 16:59:30 +02:00
Stephane Nicoll ce63db2e42 Upgrade to Spring Framework 5.0.9 
Closes gh-14325
 2018-09-07 16:42:28 +02:00
Andy Wilkinson c1c5354fcf Merge branch '1.5.x' into 2.0.x 2018-09-07 14:20:04 +01:00
Andy Wilkinson 124705080b Tolerate context root redirect not being configurable on Tomcat 7 
Closes gh-13821
 2018-09-07 14:04:23 +01:00
Stephane Nicoll b7e1a2ea6c Add reference to Rollbar starter 
Closes gh-14343
 2018-09-07 14:49:25 +02:00
Andy Wilkinson 4b23d847d8 Merge branch '1.5.x' into 2.0.x 2018-09-07 11:31:00 +01:00
Andy Wilkinson 7a000e68cd Work around null return from getMetaAnnotationTypes during doc generation 2018-09-07 11:30:19 +01:00
Andy Wilkinson aa45f3c702 Merge branch '1.5.x' into 2.0.x 2018-09-07 10:53:15 +01:00
Andy Wilkinson db903c2176 Align defaults in ServerProperties with defaults at runtime 
Closes gh-13821
 2018-09-07 10:51:39 +01:00
Stephane Nicoll 8771f2d0a0 Merge branch '1.5.x' into 2.0.x 2018-09-07 10:49:06 +02:00
Stephane Nicoll 7d54eda6f1 Fix tests 2018-09-07 10:47:20 +02:00
Stephane Nicoll 88edf22216 Merge branch '1.5.x' into 2.0.x 2018-09-07 10:15:14 +02:00
Stephane Nicoll 0b07c026af Fix version of amqp-client 
Closes gh-14259
 2018-09-07 10:13:49 +02:00
Stephane Nicoll 61344f7d9c Upgrade to Reactor Bom Bismuth-SR11 
Closes gh-14322
 2018-09-07 09:44:05 +02:00
Stephane Nicoll 128ed77a69 Start building against Spring Framework 5.0 snapshots 
See gh-14325
 2018-09-07 09:43:05 +02:00
Stephane Nicoll 320e337ecf Merge branch '1.5.x' into 2.0.x 2018-09-07 09:42:35 +02:00
Stephane Nicoll cb2873df77 Start building against Spring Framework 4.3 snapshots 
See gh-14326
 2018-09-07 09:41:06 +02:00
Madhura Bhave bc19d4fc3b Merge pull request #14206 from kuldeepsidhu88 
* gh-14206:
  Polish "Remove redundancy from actuator documentation"
  Remove redundancy from actuator documentation
 2018-09-06 15:41:34 -07:00
Madhura Bhave ccdbc0aa06 Polish "Remove redundancy from actuator documentation" 
Closes gh-14206
 2018-09-06 15:41:08 -07:00
kuldeepsidhu88 abf5e63b54 Remove redundancy from actuator documentation 
See gh-14206
 2018-09-06 15:40:46 -07:00
Andy Wilkinson 6c865f9b43 Polish 
See gh-1176
 2018-09-06 16:38:27 +01:00
Andy Wilkinson 53372d5fd7 Document the use of --args to pass arguments to bootRun 
Closes gh-1176
 2018-09-06 13:08:40 +01:00
Stephane Nicoll ff8b8c55c6 Remove reference to "management.metrics.binders.integration.enabled" 
Closes gh-14319
 2018-09-06 12:17:57 +02:00
Phillip Webb a2cea6a45a Upgrade amqp-client to 5.4.1 
See gh-14259
 2018-09-05 13:41:50 -07:00
Phillip Webb ec27137632 Merge branch '1.5.x' into 2.0.x 2018-09-05 13:40:48 -07:00
Phillip Webb a9e8116a99 Only check for Mockito once 
Update `MockReset` so that checking for Mockito only happens once.

Closes gh-14260
 2018-09-05 13:25:18 -07:00
Phillip Webb 02f2f62a4d Upgrade amqp-client to 4.8 
Closes gh-14259
 2018-09-05 13:22:07 -07:00
Andy Wilkinson b580dd70f8 Polish 2018-09-05 14:28:48 +01:00
Stephane Nicoll 3469142fec Partially revert 59d911d 
This commit restores the public `UsesUnsafeJava` and flag it as
deprecated.

Closes gh-14072
 2018-09-05 09:42:18 +02:00
Stephane Nicoll c410f7d153 Merge branch '1.5.x' into 2.0.x 2018-09-05 09:29:29 +02:00
Stephane Nicoll b77e3e5533 Add missing properties 
See gh-14259
 2018-09-05 09:26:57 +02:00
Stephane Nicoll 3493341201 Polish 2018-09-05 09:25:48 +02:00
Madhura Bhave 9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe 
Fixes gh-14161
 2018-09-04 17:06:24 -07:00
Phillip Webb cafff43022 Update copyright header of changed files 2018-09-04 16:19:05 -07:00
Phillip Webb 9af6b3422f Polish 2018-09-04 16:18:47 -07:00
Phillip Webb 45613f8c3c Merge branch '1.5.x' into 2.0.x 2018-09-04 15:12:22 -07:00
Phillip Webb a50686b404 Surface additional rabbit SSL factory properties 
Add `validate-server-certificate` and `verify-hostname` properties to
`spring.rabbitmq.ssl` to allow additional SSL configuration.

Closes gh-14259
 2018-09-04 15:07:53 -07:00
Johnny Lim ca57e58ee5 Polish 
See gh-14293
 2018-09-04 08:52:13 +02:00
Stephane Nicoll 77a5259317 Merge pull request #14291 from izeye:metrics-endpoint-metric 
* pr/14291:
  Use InvalidEndpointRequestException for MetricsEndpoint
 2018-09-04 08:48:32 +02:00
Johnny Lim 3eef927499 Use InvalidEndpointRequestException for MetricsEndpoint 
Closes gh-14291
 2018-09-04 08:33:33 +02:00
Kedar Joshi 72ebfb0332 Update default compressible media types 
Closes gh-14278
 2018-09-03 19:13:09 +02:00
Stephane Nicoll 42bf594d96 Polish condition name 
See gh-14285
 2018-09-03 12:16:18 +02:00
Stephane Nicoll ba18fb529f Merge pull request #14285 from eneiascs:ws-auto-configuration-list 
* pr/14285:
  Polish "Fix WSDL locations condition to work with a list"
  Fix WSDL locations condition to work with a list
 2018-09-03 11:16:26 +02:00
Stephane Nicoll ddeae9b58e Polish "Fix WSDL locations condition to work with a list" 
Closes gh-14285
 2018-09-03 11:09:44 +02:00
Eneias Cordeiro da Silva 80358f7fbf Fix WSDL locations condition to work with a list 
See gh-14285
 2018-09-03 11:06:34 +02:00
Stephane Nicoll 6078865372 Merge branch '1.5.x' into 2.0.x 2018-09-03 10:00:31 +02:00