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
9,788 Commits 24 Branches 372 Tags 284 MiB
Commit Graph

9788 Commits

Author SHA1 Message Date
Phillip Webb 263d444d4e Merge branch '1.5.x' 2016-12-05 11:20:24 -08:00
Phillip Webb f6b0652369 Merge branch '1.4.x' into 1.5.x 2016-12-05 11:17:13 -08:00
Madhura Bhave 64da63aa96 Use empty message for Non-Spring Boot Condition 
Update `AbstractNestedCondition` to use an empty message for non
Spring Boot nested conditions.

Fixes gh-7519
Closes gh-7529
 2016-12-05 11:16:25 -08:00
Phillip Webb e430583eaf Polish 2016-12-05 11:08:38 -08:00
Andy Wilkinson d47d733019 Merge branch '1.5.x' 2016-12-05 13:17:48 +00:00
Andy Wilkinson 887a206b0c Remove redundant @ConfigurationProperties annotation 
See gh-7397
 2016-12-05 13:17:12 +00:00
Andy Wilkinson 4c7a8825b1 Merge branch '1.5.x' 2016-12-05 12:12:49 +00:00
Andy Wilkinson 3e9a4de869 Allow spring.profiles to be configured as a YAML list/array 
Closes gh-7397
 2016-12-05 12:11:24 +00:00
Andy Wilkinson d0b1cad00f Merge branch '1.5.x' 2016-12-05 10:48:49 +00:00
Andy Wilkinson 967625db1e Replace field injection with constructor injection in config classes 
Closes gh-7563
 2016-12-05 10:48:01 +00:00
Andy Wilkinson e5103a96f8 Correct the version of Spring Social Facebook 
See gh-7521
 2016-12-05 09:25:26 +00:00
Andy Wilkinson 73ba04f878 Merge branch '1.5.x' 2016-12-05 09:21:04 +00:00
Andy Wilkinson 5ac75c949c Increate timeout in Kafka tests as Windows CI agents are very slow 2016-12-05 09:20:43 +00:00
Andy Wilkinson 598eca7e0f Merge branch '1.5.x' 2016-12-02 17:58:36 +00:00
Andy Wilkinson 1464425d64 Remove use of @Component from classes that are not scanned 
Closes gh-7549
 2016-12-02 17:57:21 +00:00
Andy Wilkinson 665d82ab9b Merge branch '1.5.x' 2016-12-02 14:06:33 +00:00
Andy Wilkinson b60150b05e Make Tomcat Access Log's buffering configurable via the environment 
Closes gh-7456
 2016-12-02 13:58:26 +00:00
Andy Wilkinson 3c873b08fc Merge branch '1.5.x' 2016-12-02 13:41:22 +00:00
Andy Wilkinson b546fd1046 Merge branch '1.4.x' into 1.5.x 2016-12-02 13:41:15 +00:00
Andy Wilkinson 6061dd492e Increase timeout in DevTools integration tests and improve diagnostics 2016-12-02 13:40:22 +00:00
Andy Wilkinson 39c0f229c2 Merge branch '1.5.x' 2016-12-02 11:34:00 +00:00
Andy Wilkinson 0df03a95f0 Merge branch '1.4.x' into 1.5.x 2016-12-02 11:33:52 +00:00
Andy Wilkinson c5af34bee4 Merge pull request #7535 from Pei-Tang Huang 
* gh-7535:
  Quote $jarfile when creating arguments in launch script
 2016-12-02 11:33:34 +00:00
Pei-Tang Huang 5a5e2db134 Quote $jarfile when creating arguments in launch script 
Previously, if the pathname of fully executable contained any space
characters, the launch script would fail to locate the jar file

This commit fixes this issue by quoting the jarfile.

Closes gh-7535
 2016-12-02 11:31:51 +00:00
Andy Wilkinson 2adb002275 Merge branch '1.5.x' 2016-12-02 11:21:10 +00:00
Andy Wilkinson cee2f818d6 Fix m2e error caused by spring-boot-sample-custom-layout 2016-12-02 11:20:39 +00:00
Andy Wilkinson d8d6ac8855 Upgrade all Spring Social modules to 2.0.0.M1 
Closes gh-7521
 2016-12-02 10:51:37 +00:00
Stephane Nicoll 816c236e5b Merge branch '1.5.x' 2016-12-01 16:28:29 +01:00
Stephane Nicoll ee72e788ed Rename `spring-boot-junit-runners` to `spring-boot-test-support` 
Closes gh-7421
 2016-12-01 16:25:47 +01:00
Andy Wilkinson 4445bb6c60 Merge branch '1.5.x' 2016-12-01 14:48:48 +00:00
Andy Wilkinson f454adca1a Merge branch '1.4.x' into 1.5.x 2016-12-01 14:47:44 +00:00
Andy Wilkinson d9bd211062 Link to correct branch on GitHub from snapshot documentation 
Closes gh-7548
 2016-12-01 14:46:39 +00:00
Andy Wilkinson 995b962807 Merge branch '1.5.x' 2016-12-01 14:37:19 +00:00
Andy Wilkinson 8494635a05 Merge branch '1.4.x' into 1.5.x 2016-12-01 14:37:10 +00:00
Andy Wilkinson b798b5a40b Update docs to reflect Gradle plugin being available in the Plugin Portal 
Closes gh-1567
 2016-12-01 14:37:01 +00:00
Stephane Nicoll 9c546a7efc Merge branch '1.5.x' 2016-12-01 15:26:22 +01:00
Stephane Nicoll 85de72c0d0 Merge branch '1.4.x' into 1.5.x 2016-12-01 15:26:06 +01:00
Stephane Nicoll 2a85a2557d Fix health indicator auto-configuration order 
Previously, the health auto-configuration `AutoconfigureOrder` entry for
couchbase was referring to the standard couchbase auto-configuration that
is not responsible to configure the `CouchbaseOperations` bean. Yet, the
health indicator implementation was relying on the presence of such a
bean.

This commit fixes the `AutoconfigureOrder` entry so that it refers to
`CouchbaseDataAutoConfiguration` now.

Closes gh-7543
 2016-12-01 15:25:51 +01:00
Stephane Nicoll ede0b0f940 Merge branch '1.5.x' 2016-12-01 14:55:15 +01:00
Stephane Nicoll c127c1fdf9 Polish doc 
Closes gh-7381
 2016-12-01 14:54:54 +01:00
Stephane Nicoll 4ed26825d7 Merge branch '1.5.x' 2016-12-01 14:50:01 +01:00
Stephane Nicoll b4e7a96868 Harmonize LoggingApplicationListener constants 
Closes gh-4970
 2016-12-01 14:49:46 +01:00
Andy Wilkinson ba15e72ddd Merge branch '1.5.x' 2016-12-01 13:32:46 +00:00
Andy Wilkinson 9f1e90d3c0 Merge branch '1.4.x' into 1.5.x 2016-12-01 13:30:25 +00:00
Andy Wilkinson 36981259a5 Document that CRaSH commands written in Java are not supported 
Closes gh-7471
 2016-12-01 13:29:49 +00:00
Andy Wilkinson 2608b331dd Merge branch '1.5.x' 2016-12-01 13:26:52 +00:00
Andy Wilkinson 9c20ada927 Merge branch '1.4.x' into 1.5.x 2016-12-01 13:26:45 +00:00
Andy Wilkinson 356edc725c Handle request mappings with regular expressions in MetricsFilter 
Closes gh-7503
 2016-12-01 13:22:55 +00:00
Andy Wilkinson b4695a2e80 Merge branch '1.5.x' 2016-12-01 11:52:02 +00:00
Andy Wilkinson fdccd8aaa7 Remove use of field injection from ErrorMvcAutoConfiguration 2016-12-01 11:51:29 +00:00