Commit Graph

2295 Commits

Author SHA1 Message Date
Stephane Nicoll 5ea3ab4595 Polish "Allow to customize the JdbcTemplate"
Closes gh-7960
2017-06-01 10:50:52 +02:00
Stephane Nicoll ad85902880 Reuse JdbcTemplate in NamedParameterJdbcTemplate
This commit makes sure to reuse an existing or auto-configured
`JdbcTemplate` when auto-configuring a `NamedParameterJdbcTemplate`.

This ensures that whatever customizations have been applied on the
`JdbcTemplate` are properly shared.

Closes gh-4945
2017-06-01 10:08:13 +02:00
Stephane Nicoll d096dcad1d Polish "Add @JooqTest"
Closes gh-9343
2017-05-31 15:10:09 +02:00
Michael J. Simons 00a643f9d8 Add @JooqTest
This commit provides test slicing for jOOQ.

See gh-9343
2017-05-31 14:41:28 +02:00
Stephane Nicoll 026682d7e3 Polish jOOQ auto-configuration 2017-05-31 11:25:26 +02:00
Stephane Nicoll efdf451e6e Polish "Auto-detect jOOQ dialect"
Closes gh-9355
2017-05-31 11:16:12 +02:00
Michael J. Simons 1b4c5dffaf Auto-detect jOOQ dialect
See gh-9355
2017-05-31 10:43:40 +02:00
Stephane Nicoll 59a15b259c Polish "Add Quartz Scheduler support"
Closes gh-4299
2017-05-30 18:48:12 +02:00
Vedran Pavic 9e23206c31 Add Quartz Scheduler support
See gh-4299
2017-05-30 18:48:12 +02:00
Vedran Pavic e9ac41f83f Add Spring Data Web configuration properties
This commit adds support for configuring Spring Data Web
`PageableHandlerMethodArgumentResolver` and
`SortHandlerMethodArgumentResolver` using configuration properties.

See gh-9339
2017-05-30 10:07:14 +02:00
Johnny Lim 1ac385c4f6 Add a missing 'io.spring.dependency-management' in doc
Closes gh-9352
2017-05-30 09:33:41 +02:00
Stephane Nicoll 6664ce19d6 Merge branch '1.5.x' 2017-05-29 10:40:14 +02:00
Stephane Nicoll 544d516563 Merge branch '1.4.x' into 1.5.x 2017-05-29 10:26:52 +02:00
Stephane Nicoll 250d5f9a52 Deprecate Atomikos console logs properties
Those properties are no longer honoured with Atomikos 3.8 and we're
using 3.9 by default.

Closes gh-9292
2017-05-29 10:18:35 +02:00
Stephane Nicoll 337e645263 Upgrade to Atomikos 4.0.4
Closes gh-5591
2017-05-29 09:44:10 +02:00
Stephane Nicoll 9332a3a4ae Merge branch '1.5.x' 2017-05-28 17:46:00 +02:00
Stephane Nicoll b5709fd618 Polish
See gh-9330
2017-05-28 17:44:58 +02:00
Andy Wilkinson d4140d6a69 Configure Undertow to eagerly initialize Filters by default
Closes gh-9232
2017-05-22 16:58:16 +01:00
Stephane Nicoll 390be7a59d Merge branch '1.5.x' 2017-05-22 15:44:26 +02:00
Stephane Nicoll b61b1f0e08 Make sure Atomikos default are applied consistently
This commit makes sure to apply Atomikos defaults also adds a test that
validates Atomikos defaults are consistent.

As a side effect of that, `threadedTwoPhaseCommit` is now `false` (which
is effectively what users got with no customization anyway since that
default was changed in Atomikos 3.7

Closes gh-9141
2017-05-22 15:43:12 +02:00
Stephane Nicoll c1c0b0f3b3 Add missing properties 2017-05-21 19:05:48 +02:00
Madhura Bhave bd37089fbf Merge branch '1.5.x' 2017-05-19 16:31:00 -07:00
Madhura Bhave 57dfbd50a7 Fix documentation for health endpoint security
Fixes gh-9273
2017-05-19 16:22:25 -07:00
Stephane Nicoll f0d34250b0 Merge branch '1.5.x' 2017-05-18 13:28:12 +02:00
Stephane Nicoll f8de022f0a Fix typo
Closes gh-9257
2017-05-18 13:27:43 +02:00
Stephane Nicoll f707582570 Add missing custom status in example
Closes gh-9256
2017-05-18 13:26:39 +02:00
Phillip Webb 889d43ddc4 Refine SpringApplication source types
Update `SpringApplication` so that the `run` methods and constructors
now require `Class<?>` arguments, rather than `Objects`. String based
sources can still be loaded, but must now be set on the `getSources()`
collections. `Package` and `Resource` types are no longer directly
supported.

This change should help IDEs offer better content assist, and will
help integrations with alternative languages such as Ceylon.

Users currently passing in Class references or using the
`spring.main.sources` property should not be affected by this change. If
an XML resource is being used, some refactoring may be required (see the
changes to `SampleSpringXmlApplication` in this commit).

Fixes gh-9170
2017-05-15 20:35:29 -07:00
Andy Wilkinson 2c96bce5cd Address some warnings that are output during javadoc generation 2017-05-15 13:16:33 +01:00
Andy Wilkinson 634e70fb25 Update docs on using Spock following release of Spock 1.1 2017-05-15 13:03:49 +01:00
Stephane Nicoll 2e94fd4434 Remove support for Spring Loaded
Closes gh-7978
2017-05-15 14:18:06 +03:00
Stephane Nicoll cdf5f6e0ee Add support for deprecation level in manual metadata
This commit allows to specify a deprecation level to a manual metadata
entry. The purpose of that new attribute is to distinguish cases where
the property is still bound (default) from cases where the property no
longer exists and won't be bound.

This gives the opportunity to IDEs to still show the property as an
error and offer documentation and an action to rename it if a
replacement exists.

Closes gh-9074
2017-05-15 12:39:15 +03:00
Stephane Nicoll 800ec29f70 Fix datasource example 2017-05-15 00:35:08 +03:00
Stephane Nicoll 1480f0717f Polish "Add Kafka Kerberos Configuration Properties"
Closes gh-9151
2017-05-14 18:13:00 +02:00
Gary Russell c4cfc4dd0c Add Kafka Kerberos Configuration Properties
See gh-9151
2017-05-14 17:56:53 +02:00
Brian Clozel 4a47c1eff8 Keep default Thymeleaf media types in reactive support
This commit removes the default configuration value previously set
for `spring.thymeleaf.reactive.media-types` since this value overrides
the defaults provided by Thymeleaf.

This value does not drive the default media type used by views, but
rather all media types that the templating engine should support.

Fixes gh-9134
2017-05-12 17:17:49 +02:00
Andy Wilkinson 47807b8925 Upgrade to SendGrid 3.2.0
Closes gh-9211
2017-05-12 14:22:45 +01:00
Andy Wilkinson b71daac58a Remove redundant logic for uninstalling Tomcat's URL stream handler factory
Closes gh-8622
2017-05-11 17:22:15 +01:00
Stephane Nicoll 527c2e7b75 Add support for deprecation level in manual metadata
This commit allows to specify a deprecation level to a manual metadata
entry. The purpose of that new attribute is to distinguish cases where
the property is still bound (default) from cases where the property no
longer exists and won't be bound.

This gives the opportunity to IDEs to still show the property as an
error and offer documentation and an action to rename it if a
replacement exists.

Closes gh-9074
2017-05-11 11:46:06 +02:00
Stephane Nicoll bb2a81cb6e Document `spring.main.web-application-type`
Closes gh-9159
2017-05-11 11:03:57 +02:00
Johnny Lim 53e5d67cde Polish
Closes gh-9103
2017-05-07 10:32:12 +02:00
Stephane Nicoll 2894e57146 Polish "Support direct AMQP container"
Closes gh-9055
2017-05-05 11:32:25 +02:00
Gary Russell 6eddf1b372 Support direct AMQP container
Add support for auto configuration - select container type and separate
discrete properties.

See gh-9055
2017-05-05 10:08:13 +02:00
Stephane Nicoll 0f38031f93 Merge branch '1.5.x' 2017-05-05 10:04:27 +02:00
Stephane Nicoll e236b71615 Move RabbitMQ Simple listener support to dedicated namespace
Move `spring.rabbitmq.listener.*` to `spring.rabbitmq.listener.simple.*`
in preparation for Spring AMQP 2.0 that supports different container
types.

Closes gh-9108
See gh-9055
2017-05-05 10:03:47 +02:00
Andy Wilkinson 3abd8d3adf Drop support for configuring PropertiesLauncher with application.properties
Closes gh-8464
2017-05-04 17:01:07 +01:00
Andy Wilkinson 525f421441 Update MultipartProperties' prefix to reflect that it's Servlet-specific
Closes gh-8628
2017-05-04 16:47:46 +01:00
Stephane Nicoll 0aded58884 Polish "Add auto-configuration support for Hazelcast client"
Closes gh-7469
2017-05-04 15:52:02 +02:00
Stephane Nicoll ae3225e76e Mention that Lettuce requires commons-pool2
We intend to remove this limitation in a future milestone but as the
Lettuce auto-configuration requires `commons-pool2`, this commit updates
the How-To to mention that.

See gh-9091
2017-05-04 14:03:50 +02:00
Andy Wilkinson 11c3c4c20b Drop support for org.json:json-based JSON parsing
Closes gh-8710
2017-05-04 10:27:51 +01:00
Stephane Nicoll 05cf41bd9e Merge branch '1.5.x' 2017-05-04 10:42:25 +02:00
Stephane Nicoll 81e3b392c3 Merge branch '1.4.x' into 1.5.x 2017-05-04 10:42:03 +02:00
Stephane Nicoll e8f99dc01c Fix typo
Closes gh-9082
2017-05-04 10:41:21 +02:00
Andy Wilkinson 329a950bd8 Remove testing support from the CLI
The testing support in the CLI has proven to be more trouble than
it's worth. Our recommendation is that, once an app gets to the stage
of requiring a test suite, it should be converted to a Maven or
Gradle project. This makes it easy to version, publish, deploy etc
using the vast ecosystems of the two build systems.

As part of this change, the dependency management for Spock has been
moved into spring-boot-parent, thereby making it "private". This
allows it to continue to manage the test-only Spock dependency in
spring-boot-test without also managing the version of Spring that is
used by a user's application.

Closes gh-9087
Fixes gh-9043
2017-05-04 09:35:29 +01:00
Stephane Nicoll de268d97e2 Add auto-configuration for reactive Redis
This commit provides an auto-configuration for reactive Redis and a
starter that provides Lettuce as Jedis doesn't support reactive
operations.

There are no support for reactive redis repositories at the moment so
only a `ReactiveRedisTemplate` is auto-configured if necessary.

Closes gh-8053
2017-05-04 09:25:36 +02:00
Stephane Nicoll 6a386c34d5 Merge branch '1.5.x' 2017-05-03 09:11:55 +02:00
Stephane Nicoll 54a8dc5b33 Merge branch '1.4.x' into 1.5.x 2017-05-03 09:11:37 +02:00
Stephane Nicoll e2b209e409 Polish "Clarify and re-organize docs on caching"
Closes gh-9065
2017-05-03 09:10:47 +02:00
Dave Syer 11feb75752 Clarify and re-organize docs on caching
See gh-9065
2017-05-03 09:01:45 +02:00
Stephane Nicoll e7efa8f133 Polish "Add Lettuce Redis driver autoconfiguration"
Closes gh-5311
2017-05-02 15:40:40 +02:00
Mark Paluch 4563da9ac7 Add Lettuce Redis driver autoconfiguration
Introduce an alternative autoconfiguration if the lettuce Redis driver is
available. Add Lettuce-specific configuration property options
"spring.redis.lettuce.shutdown-timeout" to control the shutdown timeout
of the lettuce driver. Add documentation for the properties, the
supported drivers, and how to switch between drivers.

Split client-specific properties from spring.redis.pool to
spring.redis.jedis.pool and introduce spring.redis.lettuce namespace.
Deprecate spring.redis.pool property.

See gh-5311
2017-05-02 13:33:34 +02:00
Stephane Nicoll 43fb99aafa Merge branch '1.5.x' 2017-05-02 12:14:00 +02:00
Stephane Nicoll 652a5e7baa Merge branch '1.4.x' into 1.5.x 2017-05-02 12:13:44 +02:00
Stephane Nicoll f060922350 Fix cache example in the doc
Closes gh-8983
2017-05-02 11:58:50 +02:00
Michael J. Simons 18230d7f23 Fix several broken links to sources
Closes gh-9042
2017-04-29 21:22:16 +02:00
Phillip Webb 72813a47e7 Polish 2017-04-28 10:59:14 -07:00
Brian Clozel 3cc0f7b70d Document embedded web server refactoring
Closes gh-8532
2017-04-28 18:25:36 +02:00
Michael J. Simons 4a58e87201 Remove references to *EmbeddedServletContainerFactory
See gh-8532
2017-04-28 18:25:36 +02:00
Michael J. Simons 0436070b98 Fix docs howto customize the embedded webserver
This reflects the changes from 67556ba8.
See gh-8532.
2017-04-28 18:25:36 +02:00
Brian Clozel f2c63706da Change default file extension for Mustache templates
This commit changes the default file extension for Mustache templates,
from `.html` to `.mustache`, which is the file extension used in the
official reference documentation and by most IDE plugins.

Fixes gh-8997
2017-04-28 14:12:26 +02:00
Brian Clozel 4d5dcca553 Add Thymeleaf auto-configuration for WebFlux
Thymeleaf 3.0 implements the Spring 5.0 view infrastructure for WebMVC
and the new WebFlux framework. This commit adds auto-configuration for
the WebFlux support.

In that process, the configuration property for `spring.thymeleaf` has
been changed to add `spring.thymeleaf.servlet` and
`spring.thymeleaf.reactive` for MVC/WebFlux specific properties.

Now that the `spring-boot-starter-thymeleaf` does not only support
Spring MVC, the transitive dependency on `spring-boot-starter-web` is
removed from it.

Fixes gh-8124
2017-04-28 14:11:45 +02:00
Phillip Webb 45dd9f7144 Polish 2017-04-27 12:04:02 -07:00
Vedran Pavic 33dd9d6d84 Remove Spring Session Mongo support
Remove auto-configuration support for Spring Session Mongo since it is
no longer supported in Spring Session 2.0.

See gh-9011
2017-04-27 10:59:22 -07:00
Stephane Nicoll 800eb010b1 Change the default JDBC connection pool to Hikari
Closes gh-6013
2017-04-27 16:11:45 +02:00
Stephane Nicoll df388aaaf9 Polish doc 2017-04-27 14:19:16 +02:00
Stephane Nicoll e9abe3fcca Polish "Do not expose `exception` error attribute by default"
Closes gh-8971
2017-04-27 11:15:44 +02:00
Vedran Pavic afe0c6f432 Do not expose `exception` error attribute by default
See gh-8971
2017-04-27 10:57:04 +02:00
Stephane Nicoll f5db75792e Add support for configuring Jetty's request log via the environment
Closes gh-8819
2017-04-27 10:46:38 +02:00
olivier lamy ce892a06e4 Add support for configuring Jetty's request log via the environment
See gh-8819
2017-04-26 19:35:43 +02:00
Stephane Nicoll 47037d5227 Polish "Add reactive support for Spring Data Cassandra"
Closes gh-8568
2017-04-26 15:31:01 +02:00
Eddú Meléndez abd35f041b Add reactive support for Spring Data Cassandra
See gh-8568
2017-04-26 15:31:01 +02:00
Stephane Nicoll 3e60ec6cb4 Polish "Add database initializer for Spring Integration"
Closes gh-8881
2017-04-24 15:16:07 +02:00
Vedran Pavic 48bc29c77a Add database initializer for Spring Integration
See gh-8881
2017-04-24 14:46:40 +02:00
Stephane Nicoll 144868a3ce Polish "Support of Neo4j auto-index configuration"
Closes gh-8843
2017-04-24 11:18:05 +02:00
Aurélien Leboulanger 779733c379 Support of Neo4j auto-index configuration
See gh-8843
2017-04-24 11:01:38 +02:00
Spring Buildmaster 9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Spring Buildmaster d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Phillip Webb 81fef71fcb Merge branch '1.5.x' 2017-04-19 22:48:46 -07:00
Dave Syer 14638e67bc Extended PropertiesLauncher class location logic
Update `PropertiesLauncher` so that classes can be loaded outside of
`BOOT-INF/classes`. You can use a subdirectory, or the root directory
of an external jar (but not the parent archive to avoid issues
with agents and awkward delegation models).

Fixes gh-8480
Closes gh-8486
2017-04-19 22:18:12 -07:00
Madhura Bhave 359854eb85 Merge branch '1.5.x' 2017-04-19 15:44:28 -07:00
Madhura Bhave 2a7fd5011d Clarify docs on actuator security
Closes gh-8646
2017-04-19 15:32:02 -07:00
Madhura Bhave 115b369633 Update documentation with new default prefix for actuators
Closes gh-6886
2017-04-19 15:01:12 -07:00
Stephane Nicoll 42c1eb894e Merge branch '1.5.x' 2017-04-14 13:58:03 +02:00
Stephane Nicoll 8c21e16cf1 Add reference to Infinispan starter
Closes gh-8592
2017-04-14 13:57:47 +02:00
Stephane Nicoll 04ee374e7f Polish "Add slice test annotation for LDAP"
Closes gh-8536
2017-04-14 10:51:43 +02:00
Eddú Meléndez 2830bef95c Add slice test annotation for LDAP
This commit adds new annotation `@DataLdapTest` which provides test
infrastructure for LDAP. By default, embedded ldap server is initialized
if available.

See gh-8536
2017-04-14 10:39:03 +02:00
Stephane Nicoll 50331102b7 Review configuration properties appendix 2017-04-13 10:36:41 +02:00
Stephane Nicoll 8cd4f13464 Merge branch '1.5.x' 2017-04-13 10:25:14 +02:00
Stephane Nicoll b3c8511fb6 Merge branch '1.4.x' into 1.5.x 2017-04-13 10:24:07 +02:00
Stephane Nicoll 4fd9a8c468 Add missing spring.datasource.xa properties in the appendix
Closes gh-8895
2017-04-13 10:23:44 +02:00
Stephane Nicoll e9b7c7afd2 Merge branch '1.5.x' 2017-04-12 16:17:58 +02:00
Stephane Nicoll 584b61ecc1 Remove deprecated property 2017-04-12 16:16:19 +02:00
Stephane Nicoll eeed3a841c Review configuration properties appendix 2017-04-12 16:03:35 +02:00
Stephane Nicoll abe3dba4b9 Merge branch '1.5.x' 2017-04-12 11:46:59 +02:00
Stephane Nicoll f4ab574ea1 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:46:43 +02:00
Stephane Nicoll 072160863a Add a note about transactional tests and `webEnvironment`
Closes gh-8232
2017-04-12 11:46:06 +02:00
Stephane Nicoll 01089c5f7a Merge branch '1.5.x' 2017-04-12 11:16:10 +02:00
Stephane Nicoll 68c90b24c2 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:15:51 +02:00
Stephane Nicoll 40f4c89602 Document list merge restrictions with YAML
Closes gh-6911
2017-04-12 11:15:24 +02:00
Phillip Webb c4cba6b0ea Merge branch '1.5.x' 2017-04-11 21:07:51 -07:00
Phillip Webb d301d0f4c3 Merge branch '1.4.x' into 1.5.x 2017-04-11 20:42:48 -07:00
Phillip Webb 758ddcd420 Polish 2017-04-11 20:17:23 -07:00
Stephane Nicoll 158b3dae16 Merge branch '1.5.x' 2017-04-11 14:57:19 +02:00
Stephane Nicoll 2ef318c00d Polish "Add the ability to disable the trace filter"
Closes gh-8650
2017-04-11 14:46:57 +02:00
Johnny Lim 0cd1285aa4 Polish
Closes gh-8879
2017-04-11 09:41:33 +02:00
Stephane Nicoll 5b92a0278b Merge branch '1.5.x' 2017-04-11 09:41:08 +02:00
Stephane Nicoll 3f883f1898 Merge branch '1.4.x' into 1.5.x 2017-04-11 09:38:11 +02:00
Stephane Nicoll 404bb2d171 Polish
See gh-8879
2017-04-11 09:37:22 +02:00
Stephane Nicoll 2bdbe343df Merge branch '1.5.x' 2017-04-10 16:14:13 +02:00
Stephane Nicoll a132bd141f Merge branch '1.4.x' into 1.5.x 2017-04-10 16:13:53 +02:00
Stephane Nicoll 0a55e3e736 Polish "Clarify edge case docs on ConditionalOnClass"
Closes gh-8185
2017-04-10 16:12:11 +02:00
Phillip Verheyden 08f8219248 Clarify edge case docs on ConditionalOnClass
When used as a meta-annotation the value() attribute of
@ConditionalOnClass will fail silently resulting in the @Conditional
nature of the annotation being ignored.

See gh-8185
2017-04-10 15:58:17 +02:00
Stephane Nicoll b099471df3 Merge branch '1.5.x' 2017-04-10 15:54:53 +02:00
Stephane Nicoll 2d930fd653 Merge branch '1.4.x' into 1.5.x 2017-04-10 15:54:34 +02:00
Stephane Nicoll a8860ba7e9 Clarify use of `@TestConfiguration`
As `@TestComponent` is an implementation detail at this point really, this
commit removes any reference to it from the doc.

Closes gh-8421
2017-04-10 15:54:08 +02:00
Stephane Nicoll b3bcecc988 Merge branch '1.5.x' 2017-04-10 14:04:11 +02:00
Stephane Nicoll d8d36255af Merge branch '1.4.x' into 1.5.x 2017-04-10 14:02:51 +02:00
Stephane Nicoll fd53945fe0 Polish "Document HTTP response format of health endpoint"
Closes gh-8703
2017-04-10 14:01:50 +02:00
Luis Fernando Pollo 1fa1ed2b28 Document HTTP response format of health endpoint
Add HTTP response format details for health endpoint, including default
status codes and sample responses.

See gh-8703
2017-04-10 13:51:07 +02:00
Stephane Nicoll 2d169d526a Merge branch '1.5.x' 2017-04-07 10:05:40 +02:00
Stephane Nicoll fffb53ccf5 Fix neo4j embedded documentation
The neo4j embedded driver no longer embeds the neo4j kernel and users are
expected to add that dependency manually. We don't provide dependency
management for any of them so this commit updates the documentation to
refers to the official documentation.

Closes gh-8567
2017-04-07 10:04:41 +02:00
Johnny Lim 8d921d49aa Fix typos in new Gradle plugin
Closes gh-8818
2017-04-05 12:29:52 +01:00
Phillip Webb 2de7e9c310 Merge branch '1.5.x' 2017-04-04 10:07:38 -07:00
Phillip Webb ad38776de3 Polish 2017-04-04 09:48:10 -07:00
Phillip Webb ddcb5ee328 Polish 2017-04-04 09:36:27 -07:00
Andy Wilkinson 395db8711c Merge branch '1.5.x' 2017-04-04 17:03:13 +01:00
Andy Wilkinson df6167dd71 Merge branch '1.4.x' into 1.5.x 2017-04-04 17:02:58 +01:00
Andy Wilkinson 9374020b0e Stop -> from being replaced with → as the latter renders as # in PDF
Closes gh-8575
2017-04-04 17:00:16 +01:00
Andy Wilkinson 01166381a0 Provide separate documentation (API and reference) for Gradle plugin 2017-04-04 15:33:27 +01:00
Stephane Nicoll 78845fe63a Switch default value of spring.aop.proxy-target-class
This commit ensures that the default proxying value matches the opinion we
have applied for `@EnableTransactionManagement`

Closes gh-8786
2017-04-04 17:27:00 +03:00
Stephane Nicoll b08016f15a Polish "Add @DataNeo4jTest" contribution
Closes gh-8618
2017-04-02 12:38:24 +02:00
Johnny Lim 1ed5108639 Update doc for add-application-context-header
Closes gh-8791
2017-04-01 11:27:42 +02:00
Stephane Nicoll ff50331168 Merge branch '1.5.x' 2017-03-28 10:27:31 +02:00
Stephane Nicoll d8e90af3bf Merge branch '1.4.x' into 1.5.x 2017-03-28 10:27:14 +02:00
Dániel Zelei cc30adf0df Fix propdeps-plugin url in doc
Closes gh-8678
2017-03-28 10:15:43 +02:00
Stephane Nicoll ee0a151671 Merge branch '1.5.x' 2017-03-28 10:05:47 +02:00
Stephane Nicoll 49b8d8c482 Polish
See gh-8698
2017-03-28 10:05:33 +02:00
Andy Wilkinson d322d8613b Upgrade to Flyway 4.1.2
Closes gh-8752
2017-03-25 20:41:43 +00:00
Kazuki Shimizu bbde6de95b Fix syntax in doc
Closes gh-8688
2017-03-25 14:29:50 +00:00
Andy Wilkinson 2fd51dd8a1 Upgrade to Spring REST Docs 1.2.0.RC1
Closes gh-8716
2017-03-24 21:12:21 +00:00
Madhura Bhave 30eae8a47d Merge branch '1.5.x' 2017-03-23 16:14:32 -07:00
Madhura Bhave aa25bfb0e0 Clarify the effect that management.context-path has on endpoint paths
Fixes gh-8586
2017-03-23 16:12:48 -07:00
Madhura Bhave 6ad46db944 Merge branch '1.5.x' 2017-03-23 16:10:35 -07:00
Madhura Bhave cb38546d8a Document default trace includes
Closes gh-8654
2017-03-23 15:36:27 -07:00
Andy Wilkinson 25bf4a14cd Start building against Neo4j OGM 3.0.0 snapshots
This commit our Neo4j OGM dependency with the Spring Data Neo4j
snapshots that are currently included in snapshots of Spring Data Kay.

It switches to using Neo4j's Bolt driver by default, aligning it with
the default of the latest Spring Data Neo4j 5 snapshots.

It also contains a workaround for a Neo4j OGM issue [1] and a change
to Neo4jDataAutoConfigurationTests that prevents the entire classpath
from being scanned.

See gh-8687

[1] https://github.com/neo4j/neo4j-ogm/issues/340
2017-03-22 15:24:49 +00:00
Stephane Nicoll b8527d7060 Merge branch '1.5.x' 2017-03-18 07:40:11 +01:00
Sola ddd8d03a2a Fix typo in doc
Closes gh-8658
2017-03-18 07:39:16 +01:00
Stephane Nicoll 2f8f400a63 Merge branch '1.5.x' 2017-03-17 09:58:09 +01:00
Stephane Nicoll 84dea5264f Merge branch '1.4.x' into 1.5.x 2017-03-17 09:57:52 +01:00
Stephane Nicoll 0ca07fbdc3 Polish contribution
Closes gh-8594
2017-03-17 09:56:45 +01:00
lexandro 36b28540ee Fix invalid security example in doc
Closes gh-8580
2017-03-17 09:51:08 +01:00
Stephane Nicoll 883dd5802b Merge branch '1.5.x' 2017-03-15 14:52:37 +01:00
Stephane Nicoll cc79f6d83d Merge branch '1.4.x' into 1.5.x 2017-03-15 14:52:19 +01:00
Stephane Nicoll f72e0c08df Add a note to ActiveMQ pooling in the doc
Closes gh-8598
2017-03-15 14:51:55 +01:00
Stephane Nicoll 1b395ddd9d Merge branch '1.5.x' 2017-03-15 08:57:42 +01:00
Stephane Nicoll cd8684499d Polish
See gh-8621
2017-03-15 08:57:24 +01:00
Stephane Nicoll 6be2cc30d3 Merge branch '1.4.x' into 1.5.x 2017-03-15 08:54:21 +01:00
Stephane Nicoll bc157d5b4f Polish
See gh-8621
2017-03-15 08:50:50 +01:00
Phillip Webb b76ca0bf8f Restructure web auto-configuration
Restructure `org.springframework.boot.autoconfigure.web` to better align
with the new package structure in `spring-boot`.

Auto-configuration is now split into client, servlet and reactive
sub-packages. In addition a new `http` package now handles common
HTTP concerns.

Fixes gh-8616
2017-03-14 22:06:28 -07:00
Phillip Webb 099e188f9f Unify WebServerFactoryCustomizers
Replace `ReactiveWebServerCustomizer` and `WebServerFactoryCustomizer`
with a unified `WebServerFactoryCustomizer`.

Fixes gh-8558
2017-03-14 21:43:23 -07:00
Phillip Webb 67556ba8ea Restructure embedded web server packages
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:

Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server

Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter

Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server

Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded

In addition:

- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
  to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
  `ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
  `ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.

Fixes gh-8532
2017-03-12 21:08:25 -07:00
Stephane Nicoll 7b388e5865 Merge branch '1.5.x' 2017-03-12 08:44:38 +01:00
Stephane Nicoll 6a137260c1 Merge branch '1.4.x' into 1.5.x 2017-03-12 08:44:18 +01:00
Stephane Nicoll 4158a6d50f Fix typo
Closes gh-8574
2017-03-12 08:43:51 +01:00
Andy Wilkinson b35c162593 Raise the minimum supported version of Gradle to 3.4
Closes gh-7922
2017-03-11 09:03:06 +00:00
Stephane Nicoll 5ca197b5b6 Merge branch '1.5.x' 2017-03-10 10:39:00 +01:00
Stephane Nicoll f8bf05b91f Polish contribution
Closes gh-8474
2017-03-10 10:20:48 +01:00
srichard 0ddaca57fb Add Tomcat Access Log's fileDateFormat property
Closes gh-8396
2017-03-10 09:57:00 +01:00
Stephane Nicoll abef1ee4db Merge branch '1.5.x' 2017-03-10 09:37:21 +01:00
Stephane Nicoll feb1ab375f Merge branch '1.4.x' into 1.5.x 2017-03-10 09:36:55 +01:00
Eddú Meléndez 251090b1e5 Add missing spring-data-cassandra metadata
This commit adds the missing
`spring.data.cassandra.repositories.enabled` in the metadata and the
documentation.

Closes gh-8562
2017-03-10 09:34:19 +01:00
Stephane Nicoll dc3b2a70b9 Merge branch '1.5.x' 2017-03-10 09:22:46 +01:00
Stephane Nicoll 544c73841d Merge branch '1.4.x' into 1.5.x 2017-03-10 09:22:32 +01:00
Stephane Nicoll 633e75dce2 Fix typo
Closes gh-8563
2017-03-10 09:22:00 +01:00
Stephane Nicoll 68ef19b69b Merge branch '1.5.x' 2017-03-09 18:31:08 +01:00
Stephane Nicoll 207ab3ecb4 Merge branch '1.4.x' into 1.5.x 2017-03-09 18:21:40 +01:00
Stephane Nicoll 07c56c60ba Make sure Hazelcast bootstraps before any JCache setup
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.

Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).

Closes gh-8484
2017-03-09 17:59:20 +01:00
Phillip Webb d8f827d224 Cleanup and format code 2017-03-06 17:08:09 -08:00
Phillip Webb 425dbc3e52 Update copyright header for edited files 2017-03-06 15:04:07 -08:00
Spring Buildmaster d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Spring Buildmaster 2a83e80a9b Next Development Version 2017-03-03 14:39:21 +00:00
Stephane Nicoll d811b5fb1d Merge branch '1.5.x' 2017-03-03 10:31:26 +01:00
Stephane Nicoll bb8800a625 Deprecate spring.cache.hazelcast.config
The additional configuration for an `HazelcastInstance` will be removed
in 2.0. This commit makes sure that the property is deprecated in 1.5

See gh-8470
2017-03-03 10:30:06 +01:00
Vedran Pavic 1c789f1a8d Remove dependency management for `hibernate-entitymanager`
Closes gh-8433
2017-03-02 18:31:53 +01:00
Andy Wilkinson 9c88ba3b90 Merge branch '1.5.x' 2017-03-02 17:30:44 +00:00
Andy Wilkinson 6673d8eebc Polish "Allow loader.path to refer to nested jars"
Closes gh-8334
Closes gh-8465
2017-03-02 17:29:45 +00:00
Andy Wilkinson b6e8a280fd Merge branch '1.5.x' 2017-03-02 11:22:17 +00:00
Andy Wilkinson b36c8a7c24 Polish "Tighten up PropertiesLauncher's contract"
See gh-8346
Closes gh-7221
2017-03-02 11:19:48 +00:00
Dave Syer e4c807b884 Tighten up PropertiesLauncher's contract
The main changes are:

- Switch to `loader.properties` instead of `application.properties`
- Search for `loader.properties` in `loader.home` as well as in
  the classpath
- Placeholder replacements in MANIFEST.MF (using `loader.properties`
  or system/env vars)

See gh-7221
Closes gh-8346
2017-03-02 11:19:48 +00:00
Stephane Nicoll ed7c6e2063 Merge branch '1.5.x' 2017-03-02 09:55:44 +01:00
Stephane Nicoll b5b69cca03 Merge branch '1.4.x' into 1.5.x 2017-03-02 09:55:29 +01:00