Commit Graph

2098 Commits

Author SHA1 Message Date
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
Stephane Nicoll 09205a8fc8 Fix indentation
Closes gh-8143
2017-03-02 09:54:34 +01:00
Michael J. Simons f50a0f9707 Clarify usage of @ImportResource in doc
See gh-8143
2017-03-02 09:54:26 +01:00
Stephane Nicoll 20bd0f94d6 Merge branch '1.5.x' 2017-02-28 15:58:23 +01:00
Kazuki Shimizu fa4ecff9e0 Update doc about constructor injection
Closes gh-8392
2017-02-28 15:57:57 +01:00
Phillip Webb a4bcd20b64 Merge branch '1.5.x' 2017-02-27 20:43:18 -08:00
Phillip Webb ca1540cefe Update header copyright for changed files 2017-02-27 20:41:18 -08:00
Phillip Webb 47fd5f4fac Merge branch '1.4.x' into 1.5.x 2017-02-27 14:00:46 -08:00
Phillip Webb 47b00c086c Polish 2017-02-27 13:56:17 -08:00
Stephane Nicoll 30564eb619 Merge branch '1.5.x' 2017-02-26 23:19:14 +01:00
Stephane Nicoll f032d2fe03 Polish
Closes gh-8412
2017-02-26 23:18:48 +01:00
Brian Clozel f12a634843 Fix typo in spring-webflux dependency 2017-02-24 14:03:16 +01:00
Brian Clozel d1eafa29da Add missing dependency in docs generation
Reactor Netty and Spring WebFlux were missing.
2017-02-24 13:57:09 +01:00
Stephane Nicoll 91009cfc01 Merge branch '1.5.x' 2017-02-20 14:04:55 +01:00
Stephane Nicoll 43a534f4ca Polish contribution
Closes gh-8195
2017-02-20 14:03:07 +01:00
Stephane Nicoll ef8846770b Merge branch '1.5.x' 2017-02-19 16:42:48 +01:00
Raja Kolli a5a2c04d23 Fix version of `gradle-git-properties` in doc
Closes gh-8273
2017-02-19 16:41:28 +01:00
Stephane Nicoll 3c956441b5 Merge branch '1.5.x' 2017-02-17 10:33:08 +01:00
Stephane Nicoll 121ab0a71e Merge branch '1.4.x' into 1.5.x 2017-02-17 10:32:49 +01:00
Vedran Pavic 1c8f1c709c Fix audit events related documentation
Closes gh-8319
2017-02-17 10:30:07 +01:00
Stephane Nicoll 4301265dba Merge branch '1.5.x' 2017-02-15 17:24:20 +01:00
Stephane Nicoll d4d45a1009 Merge branch '1.4.x' into 1.5.x 2017-02-15 17:24:04 +01:00
Johnny Lim 0f5fefd561 Fix a broken AsciiDoc attribute declaration
Closes gh-8300
2017-02-15 17:23:33 +01:00
Stephane Nicoll 7cb451b934 Merge branch '1.5.x' 2017-02-14 15:16:42 +01:00
Stephane Nicoll 7920543480 Add note regarding the detection of `spring.jpa.database`
Closes gh-8253
2017-02-14 15:16:17 +01:00
Stephane Nicoll 6993854c55 Explain how to downgrade to Jackson 2.6
Closes gh-8192
2017-02-14 13:31:57 +01:00
Stephane Nicoll fe552fc920 Merge branch '1.5.x' 2017-02-13 10:09:04 +01:00
Stephane Nicoll bd6d1b74c0 Merge branch '1.4.x' into 1.5.x 2017-02-13 10:08:51 +01:00
Stephane Nicoll bcbcb9c00b Clarify use of `DataSource` for batch apps
Closes gh-8271
2017-02-13 10:08:40 +01:00
Stephane Nicoll ca2f8778f4 Merge branch '1.5.x' 2017-02-12 13:59:37 +01:00
Stephane Nicoll 6c4013249b Merge branch '1.4.x' into 1.5.x 2017-02-12 13:59:19 +01:00
Stephane Nicoll 58a4f04962 Fix typo in documentation
Closes gh-8259
2017-02-12 13:59:04 +01:00
Stephane Nicoll 25a025cf36 Fix doc generation 2017-02-09 16:54:05 +01:00
Stephane Nicoll b30d4303d5 Polish contribution
Closes gh-8230
2017-02-09 15:54:59 +01:00
Stephane Nicoll 064faf9560 Merge branch '1.5.x' 2017-02-09 10:43:20 +01:00
Stephane Nicoll aa49468171 Allow to define a custom MessageRecoverer
This commit improves `SimpleRabbitListenerContainerFactoryConfigurer` to
use a custom `MessageConverter`. If such a bean is present, it is used
for the default factory that is auto-configured.

Closes gh-8194
2017-02-09 10:43:03 +01:00
Stephane Nicoll ba05f4012c Merge branch '1.5.x' 2017-02-08 14:32:58 +01:00
Stephane Nicoll aff50f6787 Merge branch '1.4.x' into 1.5.x 2017-02-08 14:32:45 +01:00
Kamil Wozniak f46e3dc9f3 Fix link in doc to Spring Test
Closes gh-8226
2017-02-08 14:31:42 +01:00
Andy Wilkinson beecbe30b9 Merge branch '1.5.x' 2017-02-08 09:44:22 +00:00
Andy Wilkinson 64b65e1fe5 Merge branch '1.4.x' into 1.5.x 2017-02-08 09:44:04 +00:00
Andy Wilkinson 30074431a7 Improve documentation of static resource reloading with devtools
Closes gh-5133
Closes gh-7886
2017-02-08 09:43:31 +00:00
Brian Clozel 12d883f6b9 Introduce "server.servlet" configuration prefix
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.

Closes gh-8066
2017-02-07 16:48:22 +01:00
Stephane Nicoll a31a792192 Merge branch '1.5.x' 2017-02-07 16:35:59 +01:00
Stephane Nicoll d42a54e880 Add explicit note about Mockito 2 in the documentation
Closes gh-8217
2017-02-07 16:35:16 +01:00
Stephane Nicoll 130e0808d0 Merge branch '1.4.x' into 1.5.x 2017-02-07 16:31:02 +01:00
Stephane Nicoll 570b0593a6 Document SMTP timeout settings
Closes gh-8213
2017-02-07 16:22:03 +01:00
Stephane Nicoll 008aef6142 Document @LiquibaseDataSource feature
Closes gh-8214
2017-02-07 16:16:19 +01:00
Brian Clozel 8619d6a229 Rename EmbeddedServletContainer -> EmbeddedWebServer
This contract is not specific to servlet containers and should be
reused by all web server implementations (including reactive variants).

Fixes gh-8208
2017-02-06 17:44:26 +01:00
Stephane Nicoll fb19b36595 Merge branch '1.5.x' 2017-02-05 09:26:52 +01:00
Stephane Nicoll 3d1f8aa8d7 Merge branch '1.4.x' into 1.5.x 2017-02-05 09:25:48 +01:00
Stephane Nicoll a30461c5c7 Polish pid metadata
This commit moves the `spring.pid.*` metadata to the relevant project. It
also updates the doc to refer to the new `ApplicationPidFileWriter`
rather than the one in its deprecatred form.

Closes gh-8196
2017-02-05 09:23:56 +01:00
zhanhb 22ba7b93b2 Fix pid properties link in documentation
See gh-8196
2017-02-05 09:14:01 +01:00
Stephane Nicoll 5c663a9ece Merge branch '1.5.x' 2017-02-01 09:08:33 +01:00
Johnny Lim 846994e498 Polish
Closes gh-8148
2017-02-01 09:07:47 +01:00
Stephane Nicoll 715f8d7436 Merge branch '1.5.x' 2017-02-01 08:57:22 +01:00
Stephane Nicoll 8a0f8cf953 Merge branch '1.4.x' into 1.5.x 2017-02-01 08:57:07 +01:00
Stephane Nicoll b9ede6b281 Polish contribution
Closes gh-8157
2017-02-01 08:56:22 +01:00
Raja Kolli a1c601ca28 Update copyright header
See gh-8157
2017-02-01 08:55:36 +01:00
Spring Buildmaster 5c12500366 Next Development Version 2017-01-30 20:10:13 +00:00
Spring Buildmaster a2696bf873 Next Development Version 2017-01-30 11:40:24 +00:00
Andy Wilkinson 4ea7dc6f31 Polish "Upgrade to Flyway 4.0"
See gh-5344
2017-01-30 10:48:36 +00:00
Phillip Webb 8747e039ee Merge branch '1.5.x' 2017-01-27 17:50:01 -08:00
Peter Szanto 14bd404b71 Document AWS Elastic Beanstalk deployment
Update the reference documentation to include details of Amazon
Elastic Beanstalk.

Closes gh-7948
2017-01-27 17:47:59 -08:00
Spring Buildmaster ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +00:00
Brian Clozel de98c4b3ff Provide Reactor 3 auto-configuration
This commit provides auto-configuration for the Reactor Core 3 library.
A new configuration namespace, "spring.reactor" allows to configure
hooks on operators, like "spring.reactor.stacktrace-mode.enabled".

This property is enabled automatically by devtools, since it improves
the developer experience and provides full stacktrace information when
exceptions occur (but at a performance cost).

Fixes gh-7302
2017-01-26 10:35:12 +01:00
Phillip Webb 17451c5e7a Merge branch '1.5.x' 2017-01-25 22:24:07 -08:00
Phillip Webb 71601c3b96 Merge branch '1.4.x' into 1.5.x 2017-01-25 16:48:33 -08:00
Phillip Webb 2cf93f89f5 Polish 2017-01-25 16:45:59 -08:00
Andy Wilkinson 9bba73a1a9 Upgrade to Thymeleaf 3 and drop support for Thymleaf 2
This commit raises the minimum supported version of Thymeleaf to
3.0.x. It also upgrades Spring Social to a version that is compatible
with Thymeleaf 3.

Closes gh-7450
Closes gh-6258
See gh-7885
2017-01-25 13:59:09 +00:00
Stephane Nicoll 661fd848eb Merge branch '1.5.x' 2017-01-25 11:02:32 +01:00
Stephane Nicoll 79233b019e Fix keys format for embedded mongodb support
Closes gh-8102
2017-01-25 11:01:52 +01:00
Stephane Nicoll 265a712294 Fix keys format for embedded mongodb support
Closes gh-8102
2017-01-25 10:41:47 +01:00
Andy Wilkinson ef4f83e7b1 Update reference guide to reflect Java 8 requirement
Closes gh-8090
2017-01-24 20:25:54 +00:00
Andy Wilkinson dbd10a8daa Remove support for Jetty 9.3 and earlier
Closes gh-7985
2017-01-24 20:00:50 +00:00
Andy Wilkinson 0807c27c26 Complete removing support for Tomcat 7
Closes gh-6416
2017-01-24 17:26:30 +00:00
Stephane Nicoll d67ce78e8b Merge branch '1.5.x' 2017-01-24 13:23:06 +01:00
Johnny Lim e0de28a1f7 Polish
Closes gh-8076
2017-01-24 13:22:22 +01:00
Stephane Nicoll 1f164906dc Merge branch '1.5.x' 2017-01-24 09:56:47 +01:00
Stephane Nicoll 4a60de78ff Merge branch '1.4.x' into 1.5.x 2017-01-24 09:56:26 +01:00
Stephane Nicoll 4efa4590f8 Review doc on advanced datasource customization
Closes gh-7652
2017-01-24 09:55:13 +01:00
Phillip Webb 8ffaa54e74 Merge branch '1.5.x' 2017-01-23 23:45:44 -08:00
Phillip Webb 2c89d9918f Relocate AutoConfigurations from root package
Move PropertyPlaceholder and MessageSource auto-configuration from the
root package to the `context` subpackage.

Fixes gh-8071
2017-01-23 17:32:45 -08:00
Andy Wilkinson a7ee2b8e0e Merge branch '1.5.x' 2017-01-23 10:23:13 +00:00
Andy Wilkinson 0067082eac Document a warning about embedded Tomcat and tmpwatch on CentOS
Closes gh-5009
2017-01-23 10:22:51 +00:00
Andy Wilkinson 1f183bd320 Merge branch '1.5.x' 2017-01-23 10:00:50 +00:00
Andy Wilkinson 68fdd49a0b Document payload types of messages sent to metricsChannel
Closes gh-7790
2017-01-23 10:00:42 +00:00
Andy Wilkinson d5a4058862 Merge branch '1.5.x' 2017-01-20 15:45:34 +00:00
Andy Wilkinson bfd319755c Merge branch '1.4.x' into 1.5.x 2017-01-20 15:45:23 +00:00
Andy Wilkinson 0ce7c9516a Document how to configure test- and profile-specific Flyway migrations
Closes gh-2753
2017-01-20 15:44:42 +00:00
Stephane Nicoll 4fe04178b7 Merge branch '1.5.x' 2017-01-20 16:43:21 +01:00
Stephane Nicoll 915c959a28 Polish contribution
Closes gh-7600
2017-01-20 16:40:48 +01:00
Michael J. Simons 8648520876 Add slide test annotation for MongoDB
This commits adds a slice test infrastructure for MongoDB, similar to
what `@DataJpaTest` does with JPA.

By default, an embedded Mongod process is used if available.

See gh-7600
2017-01-20 16:40:47 +01:00
Stephane Nicoll b19d31e067 Use a random port with embedded Mongo by default
This commit improves the logic of the embedded Mongo support to use a
random port if no custom port has been specified. This doesn't change
the default if the embedded support isn't active.

Closes gh-8044
2017-01-20 16:40:06 +01:00
Stephane Nicoll 2b71c22e0b Merge branch '1.5.x' 2017-01-20 10:54:54 +01:00
Stephane Nicoll bed545df64 Merge branch '1.4.x' into 1.5.x 2017-01-20 10:54:32 +01:00
Stephane Nicoll 2c5c539bf1 Document automatic scheduling of metrics export
Closes gh-8040
2017-01-20 10:52:55 +01:00
Stephane Nicoll 7253bb334c Merge branch '1.5.x' 2017-01-19 16:47:21 +01:00