Commit Graph

9436 Commits

Author SHA1 Message Date
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
Stephane Nicoll
f84fd19eaa Polish contribution
Closes gh-7491
2016-11-29 15:20:53 +01:00
Hrishikesh Joshi
b3220985bb Detect default values defined in the parent
Closes gh-5434
2016-11-29 15:20:10 +01:00
Stephane Nicoll
b618c70e52 Add test slice for pure jdbc tests
This commit adds `@JdbcTest`, a new test slice for pure jdbc tests. It
provides the same basic features than `@DataJpaTest`.

Closes gh-6563
2016-11-29 14:54:15 +01:00
Andy Wilkinson
0265a05dc9 Rename appengine.version to avoid clash with Appe Engine's Maven plugin
Closes gh-7433
2016-11-29 11:10:28 +00:00
Stephane Nicoll
140379fc5a Fix Maven warnings 2016-11-29 10:03:49 +01:00
Stephane Nicoll
cb6a7b79fe Fix build failure 2016-11-29 10:03:30 +01:00
Stephane Nicoll
06e44c71ec Merge branch '1.4.x' into 1.5.x 2016-11-29 08:02:50 +01:00
Stephane Nicoll
d89cf94397 Merge pull request #7510 from oscr:fix-redundant-tostring
* pr/7510:
  Remove redundant toString() invocation
2016-11-29 08:02:01 +01:00
Oscar Utbult
88b83a909c Remove redundant toString() invocation
Closes gh-7510
2016-11-29 08:01:27 +01:00
Phillip Webb
d0c3ece0ea Merge pull request #7263 from dsyer/feature/custom-layout
* gh-7263-2:
  Add custom LayoutFactory sample
  Support custom fat jar layouts
  Rework Repacakger timeout code
2016-11-28 17:25:47 -08:00
Phillip Webb
8432c52369 Add custom LayoutFactory sample
Add a sample that shows how a custom LayoutFactory can be used with
both Maven and Gradle.

Closes gh-7263
2016-11-28 16:31:53 -08:00
Dave Syer
c6c6524b40 Support custom fat jar layouts
Allow support for custom Lyout implementations with both the Maven
and Gradle plugin. Implementations of `LayoutFactory` can now be
specified to allow customization of the layout. In addition a
layout may now implement `CustomLoaderLayout` if it wishes to
write custom loader classes.

See gh-7263
2016-11-28 16:31:53 -08:00
Phillip Webb
f5b03c81f3 Rework Repacakger timeout code
Pull up common timeout code into Repackager and remove the need for
custom subclasses.

See gh-7263
2016-11-28 16:15:39 -08:00
Phillip Webb
dada7423b0 Polish 2016-11-28 15:40:08 -08:00
Phillip Webb
ec73144240 Fix warnings 2016-11-28 15:31:49 -08:00
Phillip Webb
5ed00b3501 Merge branch '1.4.x' into 1.5.x 2016-11-28 15:27:07 -08:00
Phillip Webb
9fdb563d5a Polish 2016-11-28 15:27:01 -08:00
Phillip Webb
357d072a60 Polish 2016-11-28 15:14:46 -08:00
Andy Wilkinson
2be554456e Introduce SearchStrategy.ANCESTORS as a replacement for .PARENTS
Closes gh-6763
2016-11-28 15:41:53 +00:00
Stephane Nicoll
5d876125de Refine validation auto-configuration
Checking for the presence of a `ValidationProvider` resource is
unfortunately not enough to trigger the validation auto-configuration.

If `hibernate-validator` is added on the classpath without a `javax.el`
implementation, the former will blow up on startup. So far this was a
pilot error so we didn't have to care about it. Now that we have an
auto-configuration that may lead to this error, we need to be extra
careful and check that scenario ourselves.

This commit adds an extra condition that runs as late as possible and
attempt to actually initialize a `Validator`. If that fails for whatever
reason, the auto-configuration will now back off.

Several additional tests have been added to exercise this scenario.

Closes gh-6228
2016-11-28 14:29:05 +01:00
Andy Wilkinson
50c39661ad Merge branch '1.4.x' into 1.5.x 2016-11-28 11:33:00 +00:00
Andy Wilkinson
491bd745de Document Jersey's package scanning limitations
Closes gh-7496
2016-11-28 11:32:48 +00:00
Stephane Nicoll
1e711d8f09 Merge branch '1.4.x' into 1.5.x 2016-11-28 10:41:48 +01:00
Stephane Nicoll
5e604437d7 Restore proper scope for spring-hateoas
Closes gh-7489
2016-11-28 10:41:34 +01:00
Stephane Nicoll
0119c3a543 Fix metadata for spring.profiles.[include|active]
See gh-6995
2016-11-28 09:32:04 +01:00