Commit Graph

638 Commits

Author SHA1 Message Date
Stephane Nicoll 3389af2c2f Fix build failure (II) 2016-12-28 12:08:55 +01:00
Stephane Nicoll 6ecb525a57 Fix build failure 2016-12-28 11:52:53 +01:00
Stephane Nicoll ad3b767b03 Merge branch '1.5.x' 2016-12-28 10:14:53 +01:00
Stephane Nicoll d2900b8612 Merge branch '1.4.x' into 1.5.x 2016-12-28 10:14:38 +01:00
Stephane Nicoll a862b6dc79 Polish documentation
Closes gh-7771
2016-12-28 10:14:22 +01:00
Stephane Nicoll 7cf08be353 Merge branch '1.5.x' 2016-12-27 17:51:32 +01:00
Stephane Nicoll 435ca3db69 Polish actuator security changes
Closes gh-7569
2016-12-27 17:50:10 +01:00
Stephane Nicoll 3fdfc3f052 Merge branch '1.5.x' 2016-12-27 11:12:38 +01:00
Stephane Nicoll b24c8d04ba Allow to customize the auto-configured JestClient
This commit adds a `HttpClientConfigBuilderCustomizer` to further tune
the auto-configured `JestClient`.

Closes gh-7762
2016-12-27 11:12:23 +01:00
Phillip Webb 8b47561f7e Merge branch '1.5.x' 2016-12-20 21:56:04 -08:00
Phillip Webb 1f7b3cad45 Polish Kafka properties
Closes gh-7672
2016-12-20 18:15:11 -08:00
Gary Russell bdda470305 Support arbitrary Kafka properties
Add support for arbitrary Kafka properties via
`spring.kafka.properties.*` and also a `spring.kafka.max.poll.records`
property.

See gh-7672
2016-12-20 18:14:55 -08:00
Stephane Nicoll 998ff2feee Merge branch '1.5.x' 2016-12-20 11:59:32 +01:00
Stephane Nicoll 851ce2286f Allow to override Couchbase's CustomConversions
Closes gh-7700
2016-12-20 11:59:16 +01:00
Phillip Webb 1f417997f3 Merge branch '1.5.x' 2016-12-19 13:21:18 -08:00
Phillip Webb 4b9cba351b Merge branch '1.4.x' into 1.5.x 2016-12-19 12:36:57 -08:00
Phillip Webb e578ace7d7 Polish doc formatting 2016-12-19 10:29:42 -08:00
Stephane Nicoll f03da0b4f7 Merge branch '1.5.x' 2016-12-19 16:00:19 +01:00
Stephane Nicoll 9668006aea Merge branch '1.4.x' into 1.5.x 2016-12-19 16:00:04 +01:00
Stephane Nicoll 3237e4ab3e Add link between reference and how-to
See gh-7652
2016-12-19 15:59:49 +01:00
Andy Wilkinson 943262bb97 Raise the minimum supported version of Hibernate to 5.2.x
Closes gh-7586
2016-12-15 21:31:53 +00:00
Stephane Nicoll 0ea3277769 Merge branch '1.5.x' 2016-12-15 09:21:24 +01:00
Stephane Nicoll 0fbe56eabc Merge branch '1.4.x' into 1.5.x 2016-12-15 09:21:11 +01:00
Stephane Nicoll c8bdf74327 Expand ConfigurationProperties doc
Closes gh-7620
2016-12-15 09:20:24 +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 2dbebf67e8 Merge branch '1.5.x' 2016-11-30 10:56:14 +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 0568afc6cb Merge branch '1.5.x' 2016-11-30 08:31:41 +01:00
Johnny Lim 423f8037ce Polish
Closes gh-7530
2016-11-30 08:31:13 +01:00
Stephane Nicoll 2577d79ff1 Merge branch '1.5.x' 2016-11-29 14:54:38 +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 4c01e940ea Merge branch '1.5.x' 2016-11-28 11:33:13 +00: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
Andy Wilkinson 4a10cfe112 Merge branch '1.5.x' 2016-11-25 10:24:43 +00:00
Phillip Johnson f64d5303cf Document and test array support for spring.profiles.*
Closes gh-7175
Closes gh-6995
2016-11-25 10:24:14 +00:00
Stephane Nicoll 3bfbbeb9f4 Merge branch '1.5.x' 2016-11-24 17:44:17 +01:00
Stephane Nicoll 22208f6a9e Auto-configure validation constraints on bean methods
This commit auto-configures `MethodValidationPostProcessor` if necessary
when a JSR-303 validator implementation is detected on the classpath.

Closes gh-6228
2016-11-24 17:40:33 +01:00
Phillip Webb ab3a001286 Merge branch '1.5.x' 2016-11-22 15:49:27 -08:00
Phillip Webb dc237043b8 Merge branch '1.4.x' into 1.5.x 2016-11-22 15:48:52 -08:00
Phillip Webb 74670cb20f Allow WebDriver beans to define their own scope
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.

Fixes gh-7454
2016-11-22 15:48:28 -08:00
Phillip Webb e0dfff2b23 Merge branch '1.5.x' 2016-11-22 14:54:17 -08:00
Phillip Webb b6b8bef009 Polish 2016-11-22 14:51:56 -08:00
Stephane Nicoll e3688455fa Merge branch '1.5.x' 2016-11-22 10:30:31 +01:00
Stephane Nicoll 642af52d01 Polish "Apache Kafka support" contribution
Closes gh-6961
2016-11-22 10:22:00 +01:00
Gary Russell c4188c8e4a Add Apache Kafka support
See gh-6961
2016-11-22 09:34:01 +01:00
Phillip Webb cb7c0b5031 Merge branch '1.5.x' 2016-11-16 16:06:53 -08:00
Johnny Lim 8038882d46 Polish
Closes gh-7403
2016-11-16 13:36:51 -08:00
Stephane Nicoll e4be5c6102 Merge branch '1.5.x' 2016-11-05 07:44:48 +01:00
Stephane Nicoll 389acb094b Merge branch '1.4.x' into 1.5.x 2016-11-05 07:43:09 +01:00
Johnny Lim ec9f0ab6b4 Polish
Closes gh-7322
2016-11-05 07:42:37 +01:00
Andy Wilkinson 14d58b49dd Merge branch '1.5.x' 2016-11-01 13:36:05 +00:00
Andy Wilkinson 8b631390ba Merge branch '1.4.x' into 1.5.x 2016-11-01 13:36:00 +00:00
Andy Wilkinson 307fd94b4f Correct typo in the documentation for RestTemplateBuilder customization
See gh-7054
2016-11-01 13:35:27 +00:00
Andy Wilkinson 5bc8101725 Merge branch '1.5.x' 2016-11-01 11:07:01 +00:00
Andy Wilkinson ffbbd2a5f8 Merge branch '1.4.x' into 1.5.x 2016-11-01 11:06:56 +00:00
Andy Wilkinson be78dc4b99 Flesh out the documentation on RestTemplateBuilder customization
Closes gh-7054
2016-11-01 11:06:38 +00:00
Andy Wilkinson 7be16c7b54 Merge branch '1.5.x' 2016-10-24 14:37:25 +01:00
Andy Wilkinson a56bf44b39 Merge branch '1.4.x' into 1.5.x 2016-10-24 14:37:20 +01:00
Andy Wilkinson 8150cbd0d1 Remove commentary on Neo4j's licence
Closes gh-7214
2016-10-24 14:36:35 +01:00
Stephane Nicoll 363798e9ad Fix unresolved merge commit
Closes gh-7206
2016-10-23 07:51:08 +02:00
Stephane Nicoll 7fc2566650 Merge branch '1.5.x' 2016-10-22 13:57:00 +02:00
Stephane Nicoll b0474b7c9d Merge branch '1.4.x' into 1.5.x 2016-10-22 13:56:42 +02:00
Ken Dombeck 4621f82b0e Correct typo in docs
Closes gh-7203
2016-10-22 13:56:07 +02:00
Andy Wilkinson 8a547facd1 Merge branch '1.5.x' 2016-10-19 10:52:07 +01:00
Andy Wilkinson c9e6aff374 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:51:53 +01:00
Andy Wilkinson 639b0f554d Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK
Closes gh-7112
2016-10-19 10:51:42 +01:00
Stephane Nicoll d5c3a8ac76 Merge branch '1.5.x' 2016-10-12 10:30:37 +02:00
Stephane Nicoll c6f23000be Merge branch '1.4.x' into 1.5.x 2016-10-12 10:30:19 +02:00
Stephane Nicoll 11cad9e0cb Fix sample in ref doc
Closes gh-7142
2016-10-12 10:27:51 +02:00
Stephane Nicoll b54566c0cd Merge branch '1.5.x' 2016-10-06 13:30:14 +02:00
Stephane Nicoll f82e91df39 Merge branch '1.4.x' into 1.5.x 2016-10-06 13:29:53 +02:00
Stephane Nicoll 03961e6692 Polish contribution
Closes gh-7004
2016-10-06 13:28:23 +02:00
Stephane Nicoll 8b61d15120 Remove deprecated support for commons-dbcp 1
See gh-6787
2016-10-05 15:51:14 +02:00
Stephane Nicoll 543498f040 Merge branch '1.5.x' 2016-10-05 15:21:23 +02:00
Stephane Nicoll cf28663cd7 Deprecate commons-dbcp 1
Closes gh-6787
2016-10-05 15:21:09 +02:00
Stephane Nicoll fc1a700d4c Merge branch '1.5.x'
# Conflicts:
#	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
2016-10-04 13:39:33 +02:00
Stephane Nicoll 4b2970606e Merge branch '1.4.x' into 1.5.x 2016-10-04 13:37:57 +02:00
Stephane Nicoll 7019894f0e Clarify the role of spring-boot-starter-cache
The cache abstraction is a core feature of the Spring Framework. Basic
features such as `@EnableCaching` are therefore available by default with
no extra dependencies necessary.

However, the actual cache adapters for JCache, Ehcache 2.x, Caffeine and
Guava are located in a separated module, `spring-context-support`. Spring
Boot provides that artifact via the `spring-boot-starter-cache` starter.

It is quite easy to "only" add the cache library dependencies and forget
about this extra dependencies since `@EnableCaching` is available by
default. This commit clarifies the role of the starer in each section so
that it is more obvious. We're already explaining this at the beginning
of the section but it seems that's not enough.

Closes gh-7071
2016-10-04 13:37:29 +02:00
Stephane Nicoll b95b57dbf5 Merge branch '1.5.x' 2016-10-02 11:08:53 +02:00
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 2016-10-02 11:08:33 +02:00
Johnny Lim 503d735fdd Polish
Closes gh-7081
2016-10-02 11:07:04 +02:00
Andy Wilkinson 241ab10160 Merge branch '1.5.x' 2016-09-29 15:49:04 +01:00
Andy Wilkinson 2a035d0748 Remove support for Velocity following its deprecation in 1.4
Closes gh-6971
2016-09-29 15:44:36 +01:00
Andy Wilkinson 464915d2cc Remove support for HornetQ following its deprecation in 1.4
See gh-6971
2016-09-29 15:44:36 +01:00
Stephane Nicoll ea9faa5f6a Merge branch '1.5.x' 2016-09-27 10:14:57 +02:00
Stephane Nicoll 9210bf0822 Merge branch '1.4.x' into 1.5.x 2016-09-27 10:14:37 +02:00
Stephane Nicoll a2794d75c3 Clarify couchbase cache requirements
Closes gh-6998
2016-09-27 10:12:59 +02:00
Stephane Nicoll 542e935bb6 Fix typo
Closes gh-7026
2016-09-27 10:03:00 +02:00
Stephane Nicoll 9bc77254a7 Start building against Spring Framework 5 snapshot
This commit enables compatibility build against Spring Framework 5.

The Velocity and Guava support that are deprecated in the 1.x line have
been removed and few other classes contain minor change to comply to non
backward compatible changes in Spring Framework 5.

This commit also switches the required java version to 8.

Closes gh-6977
2016-09-21 17:37:02 +02:00
Stephane Nicoll bd7c20eb1c Deprecate Guava support 2016-09-21 14:59:02 +02:00
Andy Wilkinson be33827f49 Simplify property validation sample and document need for static bean method
Closes gh-6627
2016-09-20 21:33:31 +01:00
Johnny Lim a994b11a73 Polish 2016-09-18 23:38:21 -07:00
Mike Gehard 3d8b51d2e4 Link to Spring Security OAuth2 reference docs
Update documentation to include a link to Spring Security OAuth2's
reference documentation.

Closes gh-6909
2016-09-17 19:46:19 -07:00
Stephane Nicoll 6ec1ac0aa0 Fix doc syntax
See gh-6593
2016-09-17 08:04:00 +02:00
Phillip Webb 0eab3e0c5a Drop printed link to reference documentation
Tweak the fix from 50c68a49 to no longer print a link the reference
documentation.

See gh-6593
2016-09-16 17:52:25 -07:00
Stephane Nicoll b77eddb8bb Merge branch '1.3.x' 2016-09-16 16:58:53 +02:00
Stephane Nicoll c2cdc1424b Polish documentation
Add an explicit note that states that "spring.datasource.url" (or more
specifically "spring.datasource.class-name" that is inferred from the
former) is necessary to connect to a database. If the class-name isn't
specified, Spring Boot will attempt to auto-configure an embedded
database.

Closes gh-6907
2016-09-16 16:58:39 +02:00