Commit Graph

27490 Commits

Author SHA1 Message Date
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
Stephane Nicoll
f41801ee8c Narrow down ConditionalOnWebApplication
Use the new `type` attribute of `@ConditionalOnWebApplication` for the
configurations that have a hard dependency on the Servlet/MVC API.

See gh-8118
2017-02-07 15:53:18 +01:00
Stephane Nicoll
8e6f1218e1 Detect Reactive web applications
This commit improves `@ConditionalOnWebApplication` to specify the
requested web application type. By default, any web application will
match but it can also match only if a recactive (or servlet) web
application is present.

Closes gh-8118
2017-02-07 15:52:44 +01:00
Stephane Nicoll
b2ec03cd4e Restore couchbase support
This commit effectively reverts the changes that were applied to
workaround the breakage in spring-data-couchbase.

Closes gh-8200
2017-02-07 12:03:27 +01:00
Stephane Nicoll
5f2bd1667b Merge branch '1.5.x' 2017-02-07 12:00:09 +01:00
Stephane Nicoll
e88bda4682 Avoid extra space if condition is empty
Previously, if a builder was created with an empty condition, an extra
space was added before the message. This commit checks for this
particular case and adds a space only when necessary.

Closes gh-8218
2017-02-07 11:59:49 +01:00
Andy Wilkinson
aa09dbbd79 Build against Social snapshots for better compatibility
The latest snapshots for Spring Social, Spring Social Facebook, and
Spring Social Twitter improve the compatibility with each other,
Spring Framework 5 and Thymeleaf 3.

See gh-6258
2017-02-07 09:50:00 +00:00
Andy Wilkinson
84be46a55f Merge branch '1.5.x' 2017-02-07 09:11:43 +00:00
Andy Wilkinson
a1895336fb Merge pull request #8206 from Jack Stevenson
* gh-8206:
  Provide dependency management for HikariCP-java7
2017-02-07 09:11:27 +00:00
Jack Stevenson
549f90e996 Provide dependency management for HikariCP-java7
Closes gh-8206
2017-02-07 09:09:55 +00:00
Andy Wilkinson
218d05232e Merge branch '1.5.x' 2017-02-07 09:01:39 +00:00
Andy Wilkinson
4b0abc7afc Merge pull request #8199 from John Blum
* gh-8199:
  Upgrade to GemFire 8.2.2
2017-02-07 08:59:45 +00:00
John Blum
d83ed7f3b3 Upgrade to GemFire 8.2.2
Closes gh-8201
2017-02-07 08:59:10 +00: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
Andy Wilkinson
457d0414ea Make ConditionalOnBean a logical AND rather than an OR
Previously ConditionalOnBean was the inverse of
ConditionalOnMissingBean. This meant that the former was a logical OR
while the latter was a logical AND of the requiremnts declared via the
annotation's attributes.

This commit changes the logic for ConditionalOnBean so that it is now
a logical AND. A side-effect of this change is that more information
about what has and has not matched must be tracked during the
evaluation. This extra information is now used to provide more
informative messages in the condition evaluation report that indicate
exactly why @ConditionalOnBean or @ConditionalOnMissingBean did not
match.

Closes gh-5279
2017-02-06 16:30:15 +00:00
Brian Clozel
250a1601d7 Add WebApplicationType.REACTIVE type
This commit introduces a new variant of web applications: there are now
Servlet based and Reactive web applications.
The mere presence of `Servlet` and `ConfigurableWebApplicationContext`
classes is not enough to make a difference between those variants.
This is why the decision process is now the following:

* if `DispatcherHandler` is present but not `DispatcherServlet`, the
WebApplicationType is detected as REACTIVE
* if `DispatcherHandler` is present and `DispatcherServlet`, this is a
case where we consider that developers are using Spring MVC in
combination with the reactive web client. So WebApplicationType is
detected as SERVLET
* if `Servlet` and `ConfigurableWebApplicationContext` are present,
WebApplicationType is detected as SERVLET
* if none of the above match, WebApplicationType is NONE

Fixes gh-8017
2017-02-06 14:43:16 +01:00
Brian Clozel
0aaea05a4b Add Reactor Netty and WebFlux Starters
These starters bring the Spring WebFlux experience to Boot.
By default, the Reactor Netty web server is chosen.
2017-02-06 14:43:15 +01:00
Stephane Nicoll
3c6d630a62 Merge branch '1.5.x' 2017-02-06 14:08:24 +01:00
Stephane Nicoll
519a03ccda Polish 2017-02-06 14:08:10 +01:00
Stephane Nicoll
8c31000efa Merge pull request #8204 from izeye:fix-test-20170206
* pr/8204:
  Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame()
2017-02-06 14:06:08 +01:00
Johnny Lim
09998d1155 Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame()
Closes gh-8204
2017-02-06 14:05:26 +01:00
Stephane Nicoll
6af6e8e31b Remove auto-configuration for ServerProperties
This commit removes `ServerProperties` and `ManagementServerProperties`
auto-configurations. Those properties objects are now created using
`@EnableConfigurationProperties` only.

Closes gh-8108
2017-02-06 14:00:50 +01:00
Stephane Nicoll
e0c8e1f514 Ignore test until couchbase support is restored
The changes required to restore our Couchbase support are too involved
and we should hear from the data couchbase team first.

See gh-8200
2017-02-06 13:27:22 +01:00
Stephane Nicoll
1061afbe00 Reuse ConfigurationProperties bean defined in parent
This commit makes sure that if a `ConfigurationProperties` annotated bean
already exists in the parent context, a new one is not created in the
child anymore.

This makes sure that a single bean exists in a parent/child hierarchy if
`@EnableConfigurationProperties` is processed in both context on the same
class.

Closes gh-8187
2017-02-06 11:40:04 +01:00
Stephane Nicoll
98d2ed85e4 Fix broken build
Fix couchbase support until a solution is determined for
https://jira.spring.io/browse/DATACOUCH-279

See gh-8200
2017-02-06 11:11:36 +01:00
Stephane Nicoll
e9029d223a Upgrade to Couchbase client 2.4.1
Closes gh-8203
2017-02-06 11:09:40 +01:00
Stephane Nicoll
cfdc75d384 Merge branch '1.5.x' 2017-02-06 10:38:16 +01:00
Stephane Nicoll
e9057354c2 Merge pull request #8198 from izeye:logical-and
* pr/8198:
  Use logical 'and' instead of bitwise 'and'
2017-02-06 10:35:34 +01:00
Johnny Lim
0adab8a2be Use logical 'and' instead of bitwise 'and'
Closes gh-8198
2017-02-06 10:35:13 +01:00
Stephane Nicoll
b4858882f3 Merge pull request #8202 from jxblum:spring-boot-sample-cache-ux-improvements
* pr/8202:
  Polish contribution
  Improve spring-boot-sample-cache UX by using Maven profiles
2017-02-06 10:34:43 +01:00
Stephane Nicoll
4d7b03b002 Polish contribution
Closes gh-8202
2017-02-06 10:34:22 +01:00
John Blum
31ed70e1b8 Improve spring-boot-sample-cache UX by using Maven profiles
See gh-8202
2017-02-06 09:50:40 +01:00
Phillip Webb
d8e1297eed Merge branch '1.5.x' 2017-02-05 18:13:44 -08:00
Phillip Webb
87b8ce61de Fix Invalid target for Validator error
Update `PropertiesConfigurationFactory` so that the validator is only
set when it supports the target object.

Fixes gh-8149
2017-02-05 18:11:33 -08:00
Stephane Nicoll
fb19b36595 Merge branch '1.5.x' 2017-02-05 09:26:52 +01:00
Stephane Nicoll
dc75f13754 Remove deprecated metadata for spring.pidfile 2017-02-05 09:26:32 +01:00
Stephane Nicoll
3d1f8aa8d7 Merge branch '1.4.x' into 1.5.x 2017-02-05 09:25:48 +01:00
Stephane Nicoll
21e866535c Merge pull request #8196 from zhanhb:patch-1
* pr/8196:
  Polish pid metadata
  Fix pid properties link in documentation
2017-02-05 09:25:25 +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
513db481a6 Merge pull request #8147 from shakuzen:patch-13
* pr/8147:
  Remove HikariCP-java6 dependency management
2017-02-03 09:01:21 +01:00
Tommy Ludwig
653366d664 Remove HikariCP-java6 dependency management
Dependency management for the `HikariCP-java6` dependency is no longer
needed since Java 6 is no longer supported by Spring Boot.

The HikariDriverConfigurationFailureAnalyzer has been updated with the
current message thrown by HikariCP in this failure scenario.

Closes gh-8147
2017-02-03 08:52:36 +01:00
Andy Wilkinson
aa19cad770 Merge branch '1.5.x' 2017-02-02 13:48:30 +00:00
Andy Wilkinson
b9b0cdb342 Merge branch '1.4.x' into 1.5.x 2017-02-02 13:48:19 +00:00
Andy Wilkinson
2f50d515a1 Apply root to URIs directly rather than relying on expansion
Previously, TestRestTemplate applied the root URI to URIs by
converting them to a String and then passing the String to the
RestTemplate delegate. Being a String, meant that the URI passed
through RestTemplate's standard URI template expansion processing
using the configured UriTemplateHandler. While this caused the root
URI to be applied, it also had the unwanted side-effect of
encoding the URI for a second time.

This commit updates TestRestTemplate so that, when configured with a
RootUriTemplateHandler, it applies the root URI directly and then
passes a modified URI to the RestTemplate delegate. Being a URI means
that no template expansion is performed and the possible double
encoding is avoided.

Closes gh-8163
2017-02-02 13:28:52 +00:00
Andy Wilkinson
07c39f1c62 Upgrade to AssertJ 3.6.2
Closes gh-8182
2017-02-02 13:03:30 +00:00
Andy Wilkinson
77b5c63ec0 Build against SI 5.0.0 snapshots in preparation for M3
See gh-8180
2017-02-02 12:01:08 +00:00
Andy Wilkinson
071668a2e6 Start building against Spring Kafka 2.0 snapshots
See gh-8179
2017-02-02 11:55:19 +00:00
Stephane Nicoll
10ca22082b Polish
See gh-8148
2017-02-01 09:11:09 +01:00