Andy Wilkinson
cee2f818d6
Fix m2e error caused by spring-boot-sample-custom-layout
2016-12-02 11:20:39 +00: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
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
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
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
c127c1fdf9
Polish doc
...
Closes gh-7381
2016-12-01 14:54:54 +01:00
Stephane Nicoll
b4e7a96868
Harmonize LoggingApplicationListener constants
...
Closes gh-4970
2016-12-01 14:49:46 +01: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
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
fdccd8aaa7
Remove use of field injection from ErrorMvcAutoConfiguration
2016-12-01 11:51:29 +00: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
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
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
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
cd73780385
Merge pull request #7523 from mp911de:sd-cassandra-udt-integration
...
* pr/7523:
Add User-defined type support for Cassandra
2016-11-30 15:40:58 +01:00
Mark Paluch
6698cb71c4
Add User-defined type support for Cassandra
...
Configure `SimpleUserTypeResolver` if a keyspace is set to resolve
User-defined types.
Closes gh-7523
2016-11-30 15:37:55 +01:00
Stephane Nicoll
2a059e732e
Merge pull request #7526 from
...
* pr/7526:
Remove redundant array creation for calling varargs method
2016-11-30 15:19:22 +01:00
Oscar Utbult
2ae4515f3c
Remove redundant array creation for calling varargs method
...
Closes gh-7526
2016-11-30 15:19:05 +01:00
Stephane Nicoll
e63174b93f
Merge branch '1.4.x' into 1.5.x
2016-11-30 15:17:41 +01:00
Stephane Nicoll
c51d836a15
Use standard file name for Maven dependencies
...
This commit uses standard files for libraries managed by the repackage
goal of the Maven plugin. Previously, only the name of the file was used
which could lead to duplicate libraries if the name of the target file
deviates from the default. This typically happens when the
`build.finalName` property is specified on a dependent module.
Note that the `maven-war-plugin` has an additional mechanism to customize
the file name structure of dependencies. This feature isn't supported by
the repackage goal so an explicit mention has been added in the
documentation.
Closes gh-7389
2016-11-30 15:13:25 +01:00
Stephane Nicoll
2f48c50e84
Merge branch '1.4.x' into 1.5.x
2016-11-30 13:50:09 +01:00
Stephane Nicoll
e5ca4990d0
Fix bootstrap-hosts property detection with list
...
Previously, if `spring.couchbase.bootstrap-hosts` was specified in YAML
or with the `[Idx]` notation, the auto-configuration would not kick in.
This is due to a limitation of `@ConditionalOnProperty` on a property of
type Collection. This commit workarounds this limitation for now with a
dedicated condition.
Closes gh-7508
2016-11-30 13:49:44 +01:00
Stephane Nicoll
740d28578b
Promote plugin dependency management
...
This commit promotes the plugin dependency management for the
`maven-enforcer-plugin` and `maven-invoker-plugin` to the root. That way
these can be used in samples as well rather than having a separate copy.
Closes gh-7517
2016-11-30 11:37:48 +01:00
Stephane Nicoll
619addcbde
Merge pull request #7533 from izeye:update-doc
...
* pr/7533:
Polish contribution
Update doc for spring.data.neo4j.open-in-view
2016-11-30 10:56:01 +01:00
Stephane Nicoll
7c02daabc3
Polish contribution
...
Closes gh-7533
2016-11-30 10:55:32 +01:00
Johnny Lim
c654eff41b
Update doc for spring.data.neo4j.open-in-view
...
See gh-7533
2016-11-30 10:42:18 +01:00
Stephane Nicoll
f718e9e5d5
Merge pull request #7530 from izeye:polish-20161130
...
* pr/7530:
Polish
2016-11-30 10:41:57 +01:00
Stephane Nicoll
ce66abdeac
Merge pull request #7530 from izeye:polish-20161130
...
* pr/7530:
Polish
2016-11-30 08:31:32 +01:00
Johnny Lim
423f8037ce
Polish
...
Closes gh-7530
2016-11-30 08:31:13 +01:00
Stephane Nicoll
b35b7664b8
Merge pull request #7527 from oscr:fix-redundant-tostring
...
* pr/7527:
Remove redundant toString() invocation
2016-11-30 08:27:18 +01:00
Oscar Utbult
fabe35fdc4
Remove redundant toString() invocation
...
Closes gh-7527
2016-11-30 08:23:03 +01:00
Stephane Nicoll
80da80f930
Make sure that test data sources are unique
2016-11-29 18:07:36 +01:00
Stephane Nicoll
941c53dceb
Merge pull request #7522 from izeye:fix-doc
...
* pr/7522:
Fix broken doc formatting
2016-11-29 17:00:15 +01:00
Johnny Lim
d373de903b
Fix broken doc formatting
...
Closes gh-7522
2016-11-29 17:00:02 +01:00
Andy Wilkinson
1595286e04
Prefer @SpringBootApplication-annotated class when finding main class
...
Closes gh-6496
2016-11-29 15:44:10 +00:00
Stephane Nicoll
ba61faee5e
Remove trailing char
2016-11-29 15:37:05 +01:00
Stephane Nicoll
06b2f12509
Merge pull request #7491 from hrishi2323:gh-5434
...
* pr/7491:
Polish contribution
Detect default values defined in the parent
2016-11-29 15:22:05 +01:00