root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
18,965 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

18965 Commits

Author SHA1 Message Date
Andy Wilkinson ddb8694ae2 Merge branch '1.5.x' into 2.0.x 2018-10-10 13:00:17 +01:00
Andy Wilkinson 8124ac2b79 Upgrade to Undertow 1.4.26.Final 
Closes gh-13880
 2018-10-10 12:58:09 +01:00
Andy Wilkinson f638dd40fa Upgrade to Rabbit Amqp Client 4.8.3 
Closes gh-14750
 2018-10-10 12:54:01 +01:00
Andy Wilkinson 4c3912a70c Upgrade to Appengine Sdk 1.9.66 
Closes gh-14749
 2018-10-10 12:54:00 +01:00
Stephane Nicoll eacea1af46 Merge pull request #10771 from hengyunabc 
* pr/10771:
  Polish "Add encoding support for git and build properties"
  Add encoding support for git and build properties
 2018-10-10 13:44:13 +02:00
Stephane Nicoll c91d9bfda8 Polish "Add encoding support for git and build properties" 
Closes gh-10771
 2018-10-10 13:43:44 +02:00
hengyunabc f7a4a56fba Add encoding support for git and build properties 
See gh-10771
 2018-10-10 13:43:44 +02:00
Andy Wilkinson 73c6cc1b5d Merge branch '2.0.x' 2018-10-10 12:43:22 +01:00
Andy Wilkinson 839e686c9e Fix Checkstyle violation 2018-10-10 12:43:06 +01:00
Andy Wilkinson 646c20ed6a Merge branch '2.0.x' 2018-10-10 12:22:00 +01:00
Andy Wilkinson f9b6c1ab4d Include more information in NoSuchBeanDefinition failure analysis 
Closes gh-13594
 2018-10-10 12:21:46 +01:00
Andy Wilkinson 467169aaaf Merge branch '2.0.x' 2018-10-10 12:20:58 +01:00
Andy Wilkinson 9e14fc6b8b Cope with hanging call to connection.start() in JmsHealthIndicator 
Previously, if the call to connection.start() hung, JmsHealthIndicator
would also hang and then never respond.

This commit introduces the use of an additional thread that waits for
up to 5 seconds for the connection to start. If the call to start
does not complete within that time, the connection is closed. The
call to close causes the call to start to throw an exception, thereby
stopping the hang and allowing the indicator to report that the
broker is down.

Closes gh-10809
 2018-10-10 12:20:34 +01:00
Stephane Nicoll 5a2a2e1ebe Complete documentation of logger-name with out-of-box logging groups 
Closes gh-14456
 2018-10-10 11:31:12 +02:00
Madhura Bhave b18751ebd9 Provide loggingCodecCustomizer only if property is set 
Fixes gh-14723
 2018-10-09 14:41:17 -07:00
Andy Wilkinson 37c60b6603 Merge branch '2.0.x' 2018-10-09 17:47:18 +01:00
Andy Wilkinson 51a1309ab7 Document need to use spring.data.rest rather than spring.data.web 
Closes gh-14413
 2018-10-09 17:46:55 +01:00
Andy Wilkinson 3f7a01fd27 Use ApplicationContextRunner in SpringDataWebAutoConfigurationTests 
See gh-14413
 2018-10-09 17:46:55 +01:00
Stephane Nicoll 0fba98ca73 Fix logging.group target type 
Closes gh-14743
 2018-10-09 18:18:05 +02:00
Stephane Nicoll caf7f09296 Document standard "sql" and "web" log groups in the metadata 
Closes gh-14740
 2018-10-09 18:13:23 +02:00
Stephane Nicoll 716b04721c Merge branch '2.0.x' 2018-10-09 17:08:56 +02:00
Stephane Nicoll cc8464027c Merge pull request #14460 from ruslanys 
* pr/14460:
  Polish "Remove duplicate -l option for init command"
  Remove duplicate -l option for init command
 2018-10-09 17:08:37 +02:00
Stephane Nicoll 6e6c22c0ae Polish "Remove duplicate -l option for init command" 
Closes gh-1446
 2018-10-09 17:08:10 +02:00
Ruslan Molchanov 71cf472116 Remove duplicate -l option for init command 
See gh-14460
 2018-10-09 17:08:10 +02:00
Andy Wilkinson 0f8e338263 Merge branch '2.0.x' 2018-10-09 15:51:41 +01:00
Andy Wilkinson 24eefcc1c6 Merge branch '1.5.x' into 2.0.x 2018-10-09 15:51:34 +01:00
Andy Wilkinson 335afdb9d9 Upgrade to GemFire 8.2.12 
Closes gh-14739
 2018-10-09 15:51:07 +01:00
Andy Wilkinson fa47073d11 Merge branch '2.0.x' 2018-10-09 15:09:15 +01:00
Andy Wilkinson c6fdb4f0f2 Improve documentation of Quartz DataSource customization 
Closes gh-12780
 2018-10-09 15:05:25 +01:00
Andy Wilkinson 602f23c3eb Merge branch '2.0.x' 2018-10-09 14:37:25 +01:00
Andy Wilkinson 33e0b12d46 Merge pull request #14735 from Heemang Han 
* gh-14735:
  Correct TIP typo in the documentation
 2018-10-09 14:37:11 +01:00
Hanope 8b08f04e39 Correct TIP typo in the documentation 
Closes gh-14735
 2018-10-09 14:36:16 +01:00
Andy Wilkinson 83e1a61510 Merge branch '2.0.x' 2018-10-09 14:06:18 +01:00
Andy Wilkinson 73122fa8f3 Improve documentation of supported JSON mapping libraries 
Closes gh-14703
 2018-10-09 14:04:48 +01:00
Stephane Nicoll 3b0f00dc20 Document how to enable Hibernate 2nd level cache with JCache 
Closes gh-14734
 2018-10-09 14:54:38 +02:00
Andy Wilkinson acba77ab6d Merge branch '2.0.x' 2018-10-09 12:40:16 +01:00
Andy Wilkinson f2446f78df Align Session Redis tests with changes in latest Apple snapshots 
See gh-14732
 2018-10-09 12:39:08 +01:00
Stephane Nicoll a22d089cdc Use a dedicated hook point to customize InfluxDB's HTTP client 
This commit introduces a dedicated hook point for InfluxDB's http client
builder and retains backward compatibility, in a deprecated fashion, for
looking up a OkHttpClient.Builder bean.

Closes gh-14709
 2018-10-09 13:33:14 +02:00
Andy Wilkinson 20e57de73f Start building against Spring Session snapshots for Bean-RELEASE 
See gh-14733
 2018-10-09 11:38:01 +01:00
Andy Wilkinson 5c67bbd2b4 Start building against Spring Integration snapshots for 5.1.0.RC2 
See gh-14731
 2018-10-09 11:37:13 +01:00
Andy Wilkinson 6c4d2e140b Start building against Spring Security 5.1.1 snapshots 
See gh-14730
 2018-10-09 11:36:37 +01:00
Andy Wilkinson f1ae192dcb Start building against Spring Data snapshots for Lovelace-SR1 
See gh-14729
 2018-10-09 11:35:50 +01:00
Andy Wilkinson 205a25c0d4 Merge branch '2.0.x' 2018-10-09 11:35:02 +01:00
Andy Wilkinson 1b4a60e65c Start building against Spring Session snapshots for Apple-SR6 
See gh-14732
 2018-10-09 11:33:34 +01:00
Andy Wilkinson e2b589547c Start building against Spring Data snapshots for Kay-SR11 
See gh-14728
 2018-10-09 11:32:21 +01:00
Andy Wilkinson a99b5ab96e Merge branch '1.5.x' into 2.0.x 2018-10-09 11:31:50 +01:00
Andy Wilkinson d6f01951f4 Start building against Spring Data snapshots for Ingalls-SR16 
See gh-14727
 2018-10-09 11:30:49 +01:00
Stephane Nicoll 50e089076e Merge pull request #14712 from dreis2211 
* pr/14712:
  Fix actuator endpoint tables in docs
 2018-10-09 08:29:06 +02:00
dreis2211 6a66a333ae Fix actuator endpoint tables in docs 
Closes gh-14712
 2018-10-09 08:27:35 +02:00
Andy Wilkinson 2ae58b66f0 Merge branch '2.0.x' 2018-10-08 20:08:57 +01:00