Commit Graph

10773 Commits

Author SHA1 Message Date
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
Stephane Nicoll
5c663a9ece Merge branch '1.5.x' 2017-02-01 09:08:33 +01:00
Stephane Nicoll
9b952dd3a8 Merge pull request #8148 from izeye:polish-20170131
* pr/8148:
  Polish
2017-02-01 09:08:16 +01:00
Johnny Lim
846994e498 Polish
Closes gh-8148
2017-02-01 09:07:47 +01:00
Stephane Nicoll
eca61af8b1 Merge pull request #8161 from izeye:clean-system-property
* pr/8161:
  Clear system property in SpringApplicationTests
2017-02-01 09:00:45 +01:00
Johnny Lim
cedc4cd9f4 Clear system property in SpringApplicationTests
See gh-8101
Closes gh-8161
2017-02-01 09:00:21 +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
7e44029224 Merge pull request #8157 from rajadilipkolli:patch-1
* pr/8157:
  Polish contribution
  Update copyright header
2017-02-01 08:56:43 +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
Phillip Webb
eb4803832b Merge branch '1.5.x' 2017-01-31 17:14:40 -08:00
Phillip Webb
4fa38aeba4 Consider hierarchy when searching for @Validated
Update `ConfigurationPropertiesBindingPostProcessor` to use a more
exhaustive hierarchy search when checking for `@Validated`.

Fixes gh-8150
2017-01-31 17:09:02 -08:00
Phillip Webb
36c1db0223 Merge branch '1.5.x' 2017-01-31 13:27:09 -08:00
Phillip Webb
21234b36de Ensure JmxEndpoint beans get context object IDs
Update `EndpointMBeanExporter` to ensure that `JmxEndpoint` as well
as regular `Endpoint` beans are considered when searching the parent
context.

Prior to this commit if the same `JmxEndpoint` was registered in the
both the child and parent context then the `context=` element of the
name wasn't added.

Fixes gh-8152
2017-01-31 13:25:59 -08:00
Brian Clozel
1709a3ad96 Adapt to Assert.instanceOf changes
Since SPR-15196, the behavior of `Assert` methods changed and some were
deprecated. This commit adapts to the new error mechanism implemented in
`Assert.instanceOf`.

Fixes gh-8140
2017-01-31 11:42:20 +01:00
Brian Clozel
7f39d5a865 Remove usage of Assert.notNull(Object)
This commit updates the Spring Boot codebase to adapt to the removal of
`Assert.notNull(Object)` in SPR-15196.

See gh-8140
2017-01-31 00:46:40 +01:00
Madhura Bhave
29dc6a973c Merge branch '1.5.x' 2017-01-30 15:30:06 -08:00