Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,771 Commits 23 Branches 0 Tags
3c873b08fc9d8b4fff0dca22cb451ec6805148fd
Commit Graph

9771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephane Nicoll
bd2415463c Merge branch '1.5.x' 2016-12-01 12:13:02 +01:00
Stephane Nicoll
5560af735c Merge pull request #7539 from oscr:use-allAll 
* pr/7539:
  Use addAll instead of manual array to collection copy
 2016-12-01 12:12:40 +01:00
Oscar Utbult
0a1009bc42 Use addAll instead of manual array to collection copy 
Closes gh-7539
 2016-12-01 12:12:19 +01:00
Stephane Nicoll
ef6130e25a Merge pull request #7538 from oscr:simplify-capitalize 
* pr/7538:
  Remove redundant StringBuilder
 2016-12-01 12:11:31 +01:00
Oscar Utbult
3a7969b8bb Remove redundant StringBuilder 
Closes gh-7538
 2016-12-01 12:11:04 +01:00
Stephane Nicoll
61e4d07c49 Merge pull request #7541 from nicklasholm:typo-fix 
* pr/7541:
  Fix typo
 2016-12-01 12:10:37 +01:00
Nicklas Holm
ac10f65851 Fix typo 
Closes gh-7541
 2016-12-01 12:10:13 +01:00
Stephane Nicoll
cb9e021fa9 Polish 2016-12-01 12:09:41 +01:00
Stephane Nicoll
a4770f90dc Merge branch '1.5.x' 2016-12-01 11:53:52 +01:00
Stephane Nicoll
2c630b5c61 Validate schema and data resources 
Previously, if a user specifies a path to a schema or data DDL that does
not exist, the application will start up fine and the missing DDL would
not be reported.

This commit validates that user-defined resources actually exist and
throw a new `ResourceNotFoundException` if they don't.

Closes gh-7088
 2016-12-01 11:52:52 +01:00
Andy Wilkinson
304fff1bee Merge branch '1.5.x' 2016-12-01 09:38:49 +00:00
Andy Wilkinson
3ac22e7cdf Merge branch '1.4.x' into 1.5.x 2016-12-01 09:38:41 +00:00
Andy Wilkinson
d9b8fc960c Correct the scope of the spock-core dependency in spring-boot-test 
See gh-7524
 2016-12-01 09:38:07 +00:00
Andy Wilkinson
881eaab601 Merge branch '1.5.x' 2016-11-30 21:00:48 +00:00
Andy Wilkinson
1d476b375f Merge branch '1.4.x' into 1.5.x 2016-11-30 21:00:36 +00:00
Andy Wilkinson
45d672f5b3 Ignore Spock annotations when creating test context cache key 
Closes gh-7524
 2016-11-30 20:59:09 +00:00
Stephane Nicoll
056819b2aa Merge branch '1.5.x' 2016-11-30 15:41:09 +01:00