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
12,686 Commits 28 Branches 365 Tags 289 MiB
Commit Graph

12686 Commits

Author SHA1 Message Date
Stephane Nicoll 43e1df7752 Merge branch '1.5.x' 2017-07-19 15:45:14 +02:00
Stephane Nicoll 87b554d062 Merge pull request #9497 from sun-jian:bugfix/dropwizard 
* pr/9497:
  Fix metric check in case of duplicate metric
 2017-07-19 15:44:18 +02:00
孙健 1745a5ee6f Fix metric check in case of duplicate metric 
Closes gh-9497
 2017-07-19 15:43:28 +02:00
Andy Wilkinson bc5e4418ea Merge branch '1.5.x' 2017-07-19 14:41:39 +01:00
Andy Wilkinson 144d987cb8 Polish 2017-07-19 14:41:32 +01:00
Andy Wilkinson 3ba53a4c6f Merge branch '1.5.x' 2017-07-19 14:40:25 +01:00
Andy Wilkinson 29f1bd9953 Make it clearer that default config locations are always used 
Closes gh-4062
 2017-07-19 14:39:27 +01:00
Stephane Nicoll e8566c8764 Merge branch '1.5.x' 2017-07-19 15:24:25 +02:00
Stephane Nicoll 85862e66e9 Merge pull request #9672 from rajadilipkolli:patch-1 
* pr/9672:
  Fix JOOQ sample's compiler configuration
 2017-07-19 15:24:13 +02:00
Raja Kolli 931eca188e Fix JOOQ sample's compiler configuration 
Closes gh-9672
 2017-07-19 14:44:07 +02:00
Stephane Nicoll d9f2770006 Merge branch '1.5.x' 2017-07-19 14:38:55 +02:00
Stephane Nicoll 7e97d38de7 Polish Javadoc 
Closes gh-9726
 2017-07-19 14:38:38 +02:00
Phillip Webb a57e6495dd Migrate from FileSystemUtils.deleteRecursively 
Update test to migrate away from the now deprecated FileSystemUtils.
 2017-07-18 20:22:24 -07:00
Phillip Webb 75aebfaf27 Fix WebClientAutoConfigurationTests 
Update tests to return a mock response rather than Mono.empty().
 2017-07-18 15:00:57 -07:00
Andy Wilkinson ece246dbc2 Upgrade to Javax Mail 1.6.0 
Closes gh-9783
 2017-07-18 18:27:01 +01:00
Andy Wilkinson d578de4bc2 Upgrade to Reactor Bismuth-M3 
Closes gh-9639
 2017-07-18 18:25:32 +01:00
Brian Clozel 330aa704bb Clean HTTP Resources when NettyWebServer stops 
This commit is a temporary workaround for gh-9146; it cleans the HTTP
resources associated with the Netty server.
 2017-07-18 17:07:21 +02:00
Brian Clozel 20943238c2 Clean NettyWebServer tests 
Remove ununsed tests after gh-9698
 2017-07-18 17:06:50 +02:00
Stephane Nicoll e56798f347 Align to API change of Spring Data Cassandra 2017-07-18 15:09:09 +02:00
Madhura Bhave ecaa6340e2 Update path in actuator sample tests 2017-07-17 19:22:33 -07:00
Madhura Bhave c8951ae938 Fix javadoc 2017-07-17 17:38:06 -07:00
Madhura Bhave 39ec335d41 Merge branch '1.5.x' 2017-07-17 17:03:26 -07:00
Madhura Bhave 6381b88736 Create Jwk and Jwt token store beans conditionally 
Closes gh-9777
 2017-07-17 16:51:16 -07:00
Madhura Bhave eb4fc16ee5 Add customizers for Reactive Web Servers 
Closes gh-9572
 2017-07-17 15:55:52 -07:00
Madhura Bhave 1a0f21983f Fix tests 
Fixes gh-3832
 2017-07-17 15:25:31 -07:00
Madhura Bhave 00430ac216 Ignore unbound env variables and system props 
Closes gh-3832
 2017-07-17 15:09:47 -07:00
Madhura Bhave b58923a42d Merge branch '1.5.x' 2017-07-17 11:27:08 -07:00
Madhura Bhave 0f8a819af9 Enable cors in default management security config 
Fixes gh-9548
 2017-07-17 10:49:48 -07:00
Stephane Nicoll 033442094b Merge branch '1.5.x' 2017-07-17 18:00:26 +02:00
Stephane Nicoll 2aa4ed2dec Merge pull request #9772 from rajadilipkolli:patch-3 
* pr/9772:
  Remove duplicate entry in .gitignore
 2017-07-17 18:00:14 +02:00
Raja Kolli d2ed8d6344 Remove duplicate entry in .gitignore 
Closes gh-9772
 2017-07-17 17:59:42 +02:00
Madhura Bhave 93caad5556 Polish 2017-07-14 15:25:40 -07:00
Madhura Bhave 4e8592ffc5 Update documentation with new relaxed rules 
Closes gh-9025
 2017-07-14 12:07:55 -07:00
Stephane Nicoll e844c92465 Expose AssertionErrors as is 
Closes gh-9760
 2017-07-14 18:19:03 +02:00
Phillip Webb 51c2b049c2 Fix CodecsAutoConfiguration following API change 
Update CodecsAutoConfiguration to align with the latest Spring Framework
changes.
 2017-07-13 13:43:50 -07:00
Phillip Webb c1101e7eb2 Formatting 2017-07-13 13:41:18 -07:00
Andy Wilkinson 3fb1bdef85 Add support to ContextLoader for configuring context's parent 
Closes gh-9749
 2017-07-13 11:30:26 +01:00
Stephane Nicoll 192d9ee18f Merge pull request #9734 from mp911de:redis-cache 
* pr/9734:
  Polish "Align with breaking API changes in RedisCacheManager"
  Align with breaking API changes in RedisCacheManager
 2017-07-13 10:59:32 +02:00
Stephane Nicoll 9df0992bd9 Polish "Align with breaking API changes in RedisCacheManager" 
Closes gh-9734
 2017-07-13 10:59:16 +02:00
Mark Paluch d22cd0cc9e Align with breaking API changes in RedisCacheManager 
See gh-9734
 2017-07-13 10:54:47 +02:00
Stephane Nicoll 5416eac620 Merge pull request #9747 from ihrigb:dev/hcp-rename 
* pr/9747:
  Polish "Rename HCP to SAP"
  Rename HCP to SAP
 2017-07-13 10:51:32 +02:00
Stephane Nicoll 27aee689e7 Polish "Rename HCP to SAP" 
Closes gh-9747
 2017-07-13 10:51:17 +02:00
Benjamin Ihrig c02d5d52c6 Rename HCP to SAP 
See gh-9747
 2017-07-13 10:49:34 +02:00
Stephane Nicoll 884e3ecb4b Merge pull request #9738 from dreis2211:typo-bind-result 
* pr/9738:
  Remove duplicate 'the' in BindResult.isBound() javadoc
 2017-07-13 10:46:32 +02:00
dreis2211 d6cebf64d8 Remove duplicate 'the' in BindResult.isBound() javadoc 
Closes gh-9738
 2017-07-13 10:45:59 +02:00
Stephane Nicoll e0a1fe99a4 Merge branch '1.5.x' 2017-07-13 09:22:06 +02:00
Stephane Nicoll 54a13cb33a Merge pull request #9740 from thombergs:exit-docs-gh5038 
* pr/9740:
  Polish "Improve ExitCodeGenerator doc"
  Improve ExitCodeGenerator doc
 2017-07-13 09:21:53 +02:00
Stephane Nicoll e2880ee2c3 Polish "Improve ExitCodeGenerator doc" 
Closes gh-9740
 2017-07-13 09:21:36 +02:00
Tom Hombergs cf2ebbcb25 Improve ExitCodeGenerator doc 
See gh-9740
 2017-07-13 09:12:48 +02:00
Andy Wilkinson f4d3e49562 Upgrade to Dropwizard Metrics 3.2.3 
Closes gh-9745
 2017-07-13 06:19:30 +01:00