Commit Graph

12076 Commits

Author SHA1 Message Date
Phillip Webb
302f038e84 Polish 2017-05-15 20:35:29 -07:00
Madhura Bhave
226db4697f Make SpringApplicationJsonEnvironmentPostProcessor origin aware
Closes gh-8932
2017-05-15 16:09:40 -07:00
Phillip Webb
f4444a36b3 Merge branch '1.5.x' 2017-05-15 16:00:28 -07:00
Phillip Webb
440d03bf9e Merge branch '1.4.x' into 1.5.x 2017-05-15 15:59:08 -07:00
Phillip Webb
74f411faed Formatting 2017-05-15 15:58:30 -07:00
Brian Clozel
2ab1191f8d Do not expose servlet locations in WebFlux
The `spring.resources.static-locations` key (see `ResourceProperties`)
lists many locations by default, including `"classpath:/static"` and
`"/"`. The latter is about exposing resources located in the root
servlet location.

Reactive web applications don't depend on a Servlet-related
`ApplicationContext`/`ResourceLoader`, so `"/"` is then resolved as
`"classpath:/"`, which exposes the whole classpath.

To avoid such situations, the `GenericReactiveWebApplicationContext`
overrides the `getResourceByPath(String path)` method and always returns
non existent resources if the path starts with `"/"`.

Fixes gh-8485
2017-05-15 22:46:27 +02:00
Andy Wilkinson
00021dcd75 Upgrade to Spring Batch 4.0.0.M2
Closes gh-7645
2017-05-15 20:35:07 +01:00
Andy Wilkinson
ee499b029a Merge branch '1.5.x' 2017-05-15 19:58:34 +01:00
Andy Wilkinson
5e35cdccce Merge pull request #9110 from Gytis Trikleris
* gh-9110:
  Log a warning if a health indicator throws an exception
2017-05-15 19:58:23 +01:00
Gytis Trikleris
00823d41a9 Log a warning if a health indicator throws an exception
Closes gh-9110
2017-05-15 19:53:55 +01:00
Andy Wilkinson
7f18b3d879 Merge branch '1.5.x' 2017-05-15 19:50:41 +01:00
Andy Wilkinson
232e05c0c4 Merge pull request #9239 from Artem Bilan
* gh-9239:
  Upgrade to Spring Integration Java DSL 1.2.2
2017-05-15 19:49:59 +01:00
Artem Bilan
d82a23a201 Upgrade to Spring Integration Java DSL 1.2.2
Closes gh-9239
2017-05-15 19:49:34 +01:00
Phillip Webb
9a4a20537c Polish 2017-05-15 11:19:19 -07:00
Andy Wilkinson
2c315d3d6f Merge branch '1.5.x' 2017-05-15 17:44:50 +01:00
Andy Wilkinson
fd2ab2fee0 Merge branch '1.4.x' into 1.5.x 2017-05-15 17:44:42 +01:00
Andy Wilkinson
198093c6a8 Fix violation reported by Checkstyle 2017-05-15 17:44:17 +01:00
Andy Wilkinson
c9c014cde7 Drop IgnoreNestedPropertiesBindHandler and its tests
This should have been done as part of abdc239.

Closes gh-8657
2017-05-15 17:19:17 +01:00
Andy Wilkinson
8afaba0b9f Merge branch '1.5.x' 2017-05-15 17:11:56 +01:00
Andy Wilkinson
5693acf558 Merge branch '1.4.x' into 1.5.x 2017-05-15 17:08:53 +01:00
Andy Wilkinson
a6f8351dd6 Close Liquibase-specific DataSource once database has been migrated
Previously, when the liquibase.url, .username, and .password
properties were used to configure a DataSource specifically for
Liquibase that DataSource would never be explicitly closed. As it is
created by DataSourceBuilder with no explicitly configured type it
will use whichever connection pool is available and, therefore, will
create and keep open the pool's minimum number of connections. This
is an unnecessary use of resources both in the application and in the
database.

This commit updates LiquibaseAutoConfiguration so that if it uses
DataSourceBuilder to create a DataSource then it will also close that
DataSource once the database has been migrated.

Closes gh-9218
2017-05-15 17:08:45 +01: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
1a84d41f80 Merge branch '1.5.x' 2017-05-15 12:39:39 +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
0e7b037750 Fix build failure 2017-05-14 18:47:54 +02:00
Stephane Nicoll
d20b00a0c4 Merge pull request #9151 from garyrussell:kafkaKerberos
* pr/9151:
  Polish "Add Kafka Kerberos Configuration Properties"
  Add Kafka Kerberos Configuration Properties
2017-05-14 18:13:50 +02: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
Stephane Nicoll
f79b4e0df4 Upgrade to Spring Kafka
Closes gh-9225
2017-05-14 17:55:42 +02:00
Stephane Nicoll
b2e3c5dd61 Fix order of connection pools in DataSourceBuilder
Closes gh-6013
2017-05-14 17:48:48 +02:00
Andy Wilkinson
bbc37d1e71 Upgrade to Spring REST Docs 1.2.1.RELEASE
Closes gh-9071
2017-05-12 20:34:06 +01:00
Madhura Bhave
dc7b3f6d6e Update samples to use new generator mappings
Closes gh-7612
2017-05-12 11:35:42 -07:00
Madhura Bhave
f15cf4b991 Remove redundant uses of @NestedConfigurationProperty
Closes gh-9216
2017-05-12 10:43:43 -07:00
Andy Wilkinson
fa126c5c82 Merge pull request #9217 from Gary Russell
* gh-9217:
  Upgrade to Spring Integration 5.0.0.M4
2017-05-12 18:30:00 +01:00
Gary Russell
f5d9f6f035 Upgrade to Spring Integration 5.0.0.M4
Closes gh-9217
2017-05-12 18:28:01 +01:00
Andy Wilkinson
a3f3740725 Remove Tomcat 8.0-based SSL sample
We now require Tomcat 8.5
2017-05-12 17:55:19 +01:00
Andy Wilkinson
61d89ef207 Remove misleading use of legacy from simple container's description
Closes gh-9173
2017-05-12 17:30:17 +01:00
Madhura Bhave
53493fdd86 Make detection of nested config more lenient
Closes gh-3454
2017-05-12 08:58:17 -07:00
Andy Wilkinson
2a4ba89f8e Remove logic accommodating Tomcat 8.0.x from TomcatServletWebServerFactory
We now require Tomcat 8.5.
2017-05-12 16:51:10 +01:00
Andy Wilkinson
445344211d Remove use of deprecated API in TomcatServletWebServerFactory 2017-05-12 16:44:38 +01:00
Stephane Nicoll
e007f20725 Merge branch '1.5.x' 2017-05-12 17:27:46 +02:00
Stephane Nicoll
a22b3d9515 Merge branch '1.4.x' into 1.5.x 2017-05-12 17:27:28 +02:00
Stephane Nicoll
4056542bd4 Merge pull request #9212 from sslavic:patch-1
* pr/9212:
  Fix typo in javadoc
2017-05-12 17:27:00 +02:00
Stevo Slavić
6e1d99aa10 Fix typo in javadoc
Closes gh-9212
2017-05-12 17:26:26 +02:00
Stephane Nicoll
cf88508e1d Avoid exposing spring.resources.favicon-locations as a property
Closes gh-9214
2017-05-12 17:25:35 +02:00
Brian Clozel
d7ba7ecc48 Allow RouterFunction parameterized with different types
This commit allows *any* type of `RouterFunction` to be injected in the
WebFlux.fn auto-configuration; previously the `RouterFunction<T>` would
restrict injected beans to a single parameterized type.

Doing requires using the `RouterFunction.andOther` method to collect
them.

Fixes gh-9181
2017-05-12 17:18:14 +02:00
Brian Clozel
c84204bc81 Remove Netty4 auto-configuration in RestTemplate
This commit removes the automatic configuration of the Netty  request
factory in RestTemplateBuilder, for the following reasons:

* as of Spring 5, `Netty4ClientHttpRequestFactory` is now deprecated
* there are quite a few issues logged in Spring Framework (duplicate
headers, such as SPR-15446 and SPR-15476)
* by default, the `Netty4ClientHttpRequestFactory` is adding a
"Connection: close" request header to all outgoing requests, which
means that the underlying HTTP connection won't be reused between
requests (which is a performance problem)

In that case, using any other request factory is a better choice for
Spring Boot 2.0+.

Note that the `RestTemplateBuilder` still allows to provide it manually
with the request factory to use. Developers can still choose this option
and will be aware of its deprecation status.

Fixes gh-9150
2017-05-12 17:18:01 +02:00