root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
16,963 Commits 23 Branches 348 Tags 286 MiB
Commit Graph

2301 Commits

Author SHA1 Message Date
Stephane Nicoll 8e9a873787 Polish "Improve LDAP auto-configuration conditions" 
Closes gh-13143
 2018-05-11 17:59:21 +02:00
Vedran Pavic dfceede0bc Improve LDAP auto-configuration conditions 
At present, auto-configuration of `LdapContextSource` is conditional on
presence of a `ContextSource` bean. However, there are valid use cases
which require multiple `ContextSource` bean, for instance
`PooledContextSource`. With the current arrangement, the
auto-configuration of `LdapContextSource` will back off if user provides
a `PooledContextSource` bean, while it would still be reasonable to
reuse the auto-configured `LdapContextSource`.

This commit improves `LdapContextSource` factory method return value and
condition to back off only if users actually provide a
`LdapContextSource` bean themselves.

See gh-13143
 2018-05-11 17:59:21 +02:00
Andy Wilkinson efda5ef3ac Merge branch '2.0.x' 2018-05-11 16:52:29 +01:00
Andy Wilkinson 3992dacdc8 Bind empty string to empty collection or array of rich types 
Previously, when an empty String was bound to a collection or
array of rich types it would fail as there was no converter capable
of creating a Collection<RichType> or RichType[] from the String.

This commit updates IndexedElementsBinder to apply special treatment
to empty String values. Now, when such a value is being processed,
an empty Collection or array is the result.

Closes gh-12965
 2018-05-11 16:41:37 +01:00
Stephane Nicoll 1afab3a886 Merge pull request #13136 from vpavic:improve-ldap-autoconfig 
* pr/13136:
  Polish "Improve LDAP auto-configuration"
  Improve LDAP auto-configuration
 2018-05-11 14:44:17 +02:00
Stephane Nicoll a0a0bea427 Polish "Improve LDAP auto-configuration" 
Closes gh-13136
 2018-05-11 14:37:32 +02:00
Vedran Pavic f81f50c119 Improve LDAP auto-configuration 
Auto-configuration of LDAP's `LdapTemplate` is currently a part of
`LdapDataAutoConfiguration` which is conditional of presence of
`LdapRepository` (i.e. Spring Data LDAP). This arrangement isn't ideal
since the `LdapTemplate` is a part of Spring LDAP project, and therefore
should not be tied to Spring Data LDAP.

This commit improves and simplifies LDAP auto-configuration by moving
`LdapTemplate` configuration to `LdapAutoConfiguration`. Consequently,
`LdapDataAutoConfiguration` is not needed anymore and is removed.

See gh-13136
 2018-05-11 14:37:13 +02:00
Andy Wilkinson 2df156bd52 Merge branch '2.0.x' 2018-05-11 13:32:22 +01:00
Andy Wilkinson 45f4e8795e Merge branch '1.5.x' into 2.0.x 2018-05-11 13:32:08 +01:00
Stephane Nicoll ae74ce9b39 Merge branch '2.0.x' 2018-05-11 14:28:38 +02:00
Vedran Pavic a08fa27c39 Add .gitignore for Gradle Plugin module 
Closes gh-13137
 2018-05-11 14:28:02 +02:00
Stephane Nicoll b0433d66c1 Merge branch '2.0.x' 2018-05-11 14:24:13 +02:00
dreis2211 e6a23fa3ff Remove unnecessary semicolons 
Closes gh-13144
 2018-05-11 14:23:47 +02:00
Andy Wilkinson b88a20fabb Polish 2018-05-11 13:05:17 +01:00
Andy Wilkinson a325b13d05 Polish "Auto-configure a ResourceConfig for Jersey endpoints if needed" 
Closes gh-11948
 2018-05-11 12:49:44 +01:00
Michael J. Simons bb2864ad02 Auto-configure a ResourceConfig for Jersey endpoints if needed 
See gh-11948
 2018-05-11 12:49:31 +01:00
Andy Wilkinson d5e4a19446 Upgrade to Liquibase 3.6.1 and adapt to logging changes 
Closes gh-13145
 2018-05-11 12:37:54 +01:00
Andy Wilkinson 39d7382129 Merge branch '2.0.x' 2018-05-11 11:54:19 +01:00
Andy Wilkinson 972d952716 Merge branch '1.5.x' into 2.0.x 2018-05-11 11:54:12 +01:00
Andy Wilkinson 079b67c53b Merge branch '2.0.x' 2018-05-11 11:16:11 +01:00
Andy Wilkinson 7913d9b599 Add methods to BootJar for adding content to BOOT-INF 
Closes gh-13000
 2018-05-11 11:14:14 +01:00
Andy Wilkinson 07251a09d1 Merge branch '2.0.x' 2018-05-11 10:32:05 +01:00
Andy Wilkinson d9d7499ae6 Merge branch '1.5.x' into 2.0.x 2018-05-11 10:31:52 +01:00
Stephane Nicoll 360f4e17c2 Add support for PageableHandlerMethodArgumentResolver in WebMvcTest 
Closes gh-13066
 2018-05-11 10:37:17 +02:00
Stephane Nicoll 5e87a3d2fa Polish 
See gh-13130
 2018-05-11 10:03:03 +02:00
Stephane Nicoll 00a43d8f4d Merge branch '2.0.x' 2018-05-11 10:01:30 +02:00
Johnny Lim 75e591e76e Polish 
Closes gh-13130
 2018-05-11 10:00:15 +02:00
Stephane Nicoll c35cb1b69f Merge branch '2.0.x' 2018-05-11 09:57:18 +02:00
Stephane Nicoll 4683940423 Merge branch '1.5.x' into 2.0.x 2018-05-11 09:56:54 +02:00
Stephane Nicoll a11acbc829 Merge branch '2.0.x' 2018-05-11 08:55:21 +02:00
Stephane Nicoll 4bec3b7cd9 Polish 
See gh-13123
 2018-05-11 08:55:03 +02:00
Madhura Bhave ea99d8cab0 Merge branch '2.0.x' 2018-05-10 11:53:25 -07:00
Madhura Bhave 05cf8229d9 Fix tests 2018-05-10 11:50:43 -07:00
Madhura Bhave 36c89e2383 Merge branch '2.0.x' 2018-05-10 10:01:42 -07:00
Madhura Bhave c937bb68a0 ServletEndpoints should take servletPath into account 
Fixes gh-13106
 2018-05-10 10:01:11 -07:00
Andy Wilkinson 0b76fc8f8e Merge branch '2.0.x' 2018-05-10 15:46:47 +01:00
Andy Wilkinson fbf974478a Merge branch '1.5.x' into 2.0.x 2018-05-10 15:46:28 +01:00
Madhura Bhave 36c7602f2a Merge branch '2.0.x' 2018-05-09 12:04:34 -07:00
Madhura Bhave 4ec87956f9 Fix EndpointRequest include/exclude for ServletEndpoints 
Fixes gh-13089
 2018-05-09 12:01:58 -07:00
Stephane Nicoll c72df104d8 Improve caches endpoint format 
This commit adds an intermediate "caches" element so that additional
cache manager attributes can be added in the future.

Closes gh-13079
 2018-05-09 11:08:23 +02:00
Andy Wilkinson d77c4c83a1 Polish 2018-05-09 09:19:03 +01:00
Andy Wilkinson a41c9eb736 Merge branch '2.0.x' 2018-05-09 09:14:48 +01:00
Andy Wilkinson e14a2e33ab Deprecate queue size property for StatsD metrics export 
Closes gh-13108
 2018-05-09 09:14:09 +01:00
Andy Wilkinson c826310fd1 Polish 2018-05-09 08:44:15 +01:00
Andy Wilkinson 56fa85f179 Merge branch '2.0.x' 2018-05-09 06:40:39 +01:00
Jon Schneider c6860cb431 Upgrade to Micrometer 1.0.4 
Closes gh-13108
 2018-05-09 06:38:55 +01:00
Andy Wilkinson 33861b3608 Upgrade to Spring Integration 5.0.5.RELEASE 
Closes gh-13016
 2018-05-09 06:37:22 +01:00
Andy Wilkinson ba407da259 Merge branch '2.0.x' 2018-05-08 21:21:29 +01:00
Andy Wilkinson e407ed5f92 Upgrade to Spring Session Apple-SR2 
Closes gh-13103
 2018-05-08 21:21:08 +01:00
Andy Wilkinson 3a3eeb0caf Merge branch '2.0.x' 2018-05-08 21:12:58 +01:00
Andy Wilkinson 8ce4110966 Allow Jersey-based Actuator to be used with separate management port 
Previously, when the Jersey-based Actuator was configure with a
separate management port, the resulting child context would fail to
start due to their being no ResourceConfigCustomizer beans available.

This commit updates the configuration so that the customizer's are
injected using an ObjectProvider and an empty list is used in the
event of their being no customizer beans. This aligns the child
context configuration class with JerseyAutoConfiguration which
already used this approach.

Closes gh-12975
 2018-05-08 21:00:05 +01:00
Andy Wilkinson e45384bdfa Upgrade to Spring Kafka 2.1.6.RELEASE 
Closes gh-13018
 2018-05-08 20:16:41 +01:00
Andy Wilkinson 5dbba99aed Merge branch '2.0.x' 2018-05-08 20:15:02 +01:00
Andy Wilkinson 7a53623e1c Polish "Clarify deployment of Spring Boot apps to App Engine Standard" 
See gh-13090
 2018-05-08 20:12:46 +01:00
ifigotin 676b013998 Clarify deployment of Spring Boot apps to App Engine Standard 
Closes gh-13090
 2018-05-08 20:12:33 +01:00
Andy Wilkinson 95c415fd93 Merge branch '2.0.x' 2018-05-08 17:08:04 +01:00
Andy Wilkinson 5168766ebb Upgrade to Spring Security 5.0.5.RELEASE 
Closes gh-13029
 2018-05-08 17:07:17 +01:00
Andy Wilkinson bca2756b46 Upgrade to Jaybird 3.0.4 
Closes gh-13100
 2018-05-08 17:06:55 +01:00
Andy Wilkinson 47c45539d9 Upgrade to Lettuce 5.0.4.RELEASE 
Closes gh-13099
 2018-05-08 17:06:40 +01:00
Stephane Nicoll 8fc997243a Merge branch '2.0.x' 2018-05-08 17:23:01 +02:00
Stephane Nicoll f9134c9325 Upgrade to Spring Data Kay SR7 
Closes gh-13017
 2018-05-08 17:22:01 +02:00
Andy Wilkinson e4bdf4e513 Polish 2018-05-08 12:14:39 +01:00
Andy Wilkinson a1bea69555 Make Elasticsearch dependency available to javadoc generation 
See gh-12600
 2018-05-08 12:12:21 +01:00
Stephane Nicoll 503faf3153 Merge branch '2.0.x' 2018-05-08 12:45:17 +02:00
Stephane Nicoll 6577513464 Upgrade to Spring Framework 5.0.6.RELEASE 
Closes gh-13021
 2018-05-08 12:44:55 +02:00
Andy Wilkinson 5b26974000 Merge branch '2.0.x' 2018-05-08 11:30:37 +01:00
Andy Wilkinson 874650cb33 Merge branch '1.5.x' into 2.0.x 2018-05-08 11:30:30 +01:00
Brian Clozel 84c9a65e9d Auto-configure Elasticsearch REST clients 
This commit adds auto-configuration support for both `RestClient` and
`RestHighLevelClient` which are provided by `elasticsearch-rest-client`
and `elasticsearch-rest-high-level-client` dependencies respectively.

`RestClient` is associated with configuration properties in the
`spring.elasticsearch.rest.*` namespace, since this is the component
taking care of HTTP communication with the actual Elasticsearch node.

`RestHighLevelClient` wraps the first one and naturally inherits that
configuration.

Closes gh-12600
 2018-05-07 17:57:09 +02:00
Johnny Lim 96ce71ddc4 Polish 
Closes gh-13078
 2018-05-07 14:55:13 +02:00
Stephane Nicoll 3ad8f3fcbf Merge branch '2.0.x' 2018-05-07 14:53:58 +02:00
Stephane Nicoll 9dccf5b895 Polish 
See gh-13078
 2018-05-07 14:48:56 +02:00
Stephane Nicoll 7f50d49251 Merge branch '2.0.x' 2018-05-07 14:42:39 +02:00
dreis2211 15d67d6b12 Remove MockServletWebServer.emptyEnumeration() 
Closes gh-13084
 2018-05-07 14:41:06 +02:00
Stephane Nicoll 9cf68a2de4 Merge branch '2.0.x' 2018-05-07 14:38:52 +02:00
dreis2211 e3862d9bdf Fix deprecation warning in OriginTrackedYamlLoader 
Closes gh-13085
 2018-05-07 14:38:22 +02:00
Brian Clozel 31c7102800 Upgrade to Reactor Californium 
This Reactor generation will get the Reactor Netty 0.8 upgrade, which
will include important changes such as maven coordinate, package and API
changes.
 2018-05-07 11:48:04 +02:00
Brian Clozel 2e9b6bec1b Merge branch '2.0.x' 2018-05-07 10:56:22 +02:00
Brian Clozel 925269eacc Upgrade to Reactor Bismuth SR9 
Closes gh-12848
 2018-05-07 10:54:24 +02:00
Phillip Webb c578a30e90 Polish 2018-05-04 23:12:42 -07:00
Stephane Nicoll ea2a98d009 Merge branch '2.0.x' 2018-05-05 07:22:20 +02:00
Stephane Nicoll c22e9a5514 Make sure that JpaProperties does not have Hibernate imports 
This commit removes Hibernate imports from JpaProperties so that it can
be used with another JPA provider.

This commit is a breaking change for an internal, yet public class used
to transmit customizations provided by the user. It does not change the
external functionality though: naming strategies defined as bean are
still taken into account and a customizer has a chance to override it
regardless.

Closes gh-13043
 2018-05-05 07:21:50 +02:00
Phillip Webb cff552fb05 Merge branch '2.0.x' 2018-05-04 20:14:33 -07:00
Phillip Webb 6556bb2e89 Fix checkstyle violations 2018-05-04 20:13:57 -07:00
Phillip Webb a323a85e3b Merge branch '2.0.x' 2018-05-04 20:06:55 -07:00
Phillip Webb 975e986fef Polish 2018-05-04 20:06:27 -07:00
Phillip Webb f9750248ef Migrate KafkaProperties to use PropertyMapper 2018-05-04 20:06:11 -07:00
Madhura Bhave cdb5d76c7d Merge branch '2.0.x' 2018-05-04 18:12:25 -07:00
Madhura Bhave 469372c5ef Account for servlet path "/" in EndpointRequest 
See gh-12934
 2018-05-04 18:09:15 -07:00
Madhura Bhave e02954a25b Merge branch '2.0.x' 2018-05-04 16:55:54 -07:00
Madhura Bhave f5f3af7f9c Point to gradle plugin's doc for custom dependency versions 
Fixes gh-12807
 2018-05-04 16:54:11 -07:00
Phillip Webb 7b120c1c97 Formatting 2018-05-04 16:36:35 -07:00
Phillip Webb 42c053cf1b Merge branch '2.0.x' 2018-05-04 16:31:46 -07:00
Phillip Webb 6de479fe6a Polish 2018-05-04 16:08:05 -07:00
Phillip Webb 93046d058d Polish 2018-05-04 16:05:12 -07:00
Madhura Bhave 6855c5556d EndpointRequest should consider server.servlet.path 
Fixes gh-12934
 2018-05-04 16:03:31 -07:00
Phillip Webb 5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb 57bfbfb3ad Fix checkstyle errors 2018-05-04 15:58:59 -07:00
Phillip Webb 6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Andy Wilkinson b18a456123 Merge branch '2.0.x' 2018-05-04 20:02:43 +01:00
Andy Wilkinson fefe9e4e49 Upgrade to Junit Jupiter 5.1.1 
Closes gh-13075
 2018-05-04 19:18:41 +01:00
Andy Wilkinson c74292c222 Upgrade to Jooq 3.10.7 
Closes gh-13074
 2018-05-04 19:18:40 +01:00
Andy Wilkinson ee587130b2 Upgrade to Narayana 5.8.1.Final 
Closes gh-13073
 2018-05-04 19:18:40 +01:00
Andy Wilkinson 36880ad25b Upgrade to Hibernate 5.2.17.Final 
Closes gh-13072
 2018-05-04 19:18:39 +01:00
Andy Wilkinson 578dd8611c Upgrade to Elasticsearch 5.6.9 
Closes gh-13071
 2018-05-04 19:18:39 +01:00
Andy Wilkinson 205449cca1 Upgrade to Javax Money 1.0.3 
Closes gh-13070
 2018-05-04 19:18:38 +01:00
Andy Wilkinson 9ec27d1f97 Upgrade to Rxjava2 2.1.13 
Closes gh-13069
 2018-05-04 19:18:37 +01:00
Andy Wilkinson ff915b3450 Upgrade to Hazelcast 3.9.4 
Closes gh-13068
 2018-05-04 19:18:36 +01:00
Andy Wilkinson 5c2d4980de Upgrade to Couchbase Client 2.5.8 
Closes gh-13067
 2018-05-04 19:18:36 +01:00
Andy Wilkinson 820115a125 Merge branch '2.0.x' 2018-05-04 16:01:54 +01:00
Andy Wilkinson c16f99f782 Revert "Upgrade to Ehcache 2.10.5" in 2.0 as well 
See gh-13056
 2018-05-04 16:01:39 +01:00
Stephane Nicoll 23c49116ff Merge branch '2.0.x' 2018-05-04 16:57:27 +02:00
Stephane Nicoll 18b1e8da60 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:57:12 +02:00
Stephane Nicoll 303b479b90 Merge branch '2.0.x' 2018-05-04 16:15:26 +02:00
Stephane Nicoll 959c569199 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:15:10 +02:00
Stephane Nicoll 15936a1fe8 Merge branch '2.0.x' 2018-05-04 14:27:39 +02:00
Stephane Nicoll 126f928f36 Polish "Improve Spring Session docs" 
Closes gh-13061
 2018-05-04 14:26:51 +02:00
Vedran Pavic 370160720d Improve Spring Session docs 
See gh-13061
 2018-05-04 14:26:39 +02:00
Andy Wilkinson 65e6011b7f Merge branch '2.0.x' 2018-05-04 11:45:35 +01:00
Andy Wilkinson 2bcf29913d Skip building the Gradle plugin on Java 9 as well as 10 
Upgrading the JDK 9-based build to use JDK 9.0.4 has revealed that
Gradle 4.0.x doesn't work with it as it fails to parse the 9.0.4
version number.

This commit disables building the Gradle plugin on Java 9 (as we
had already done for Java 10) until we decide what to do
(see gh-12333).
 2018-05-04 11:40:35 +01:00
Andy Wilkinson b4ccf5186b Merge branch '2.0.x' 2018-05-04 10:04:19 +01:00
Andy Wilkinson a1f3e7970c Merge branch '1.5.x' into 2.0.x 2018-05-04 10:03:54 +01:00
Phillip Webb b6a2a46f78 Merge branch '2.0.x' 2018-05-03 23:54:42 -07:00
Phillip Webb 2d70a7ae5e Polish caught exception names 
Prefer `ex` over `e`.
 2018-05-03 22:43:32 -07:00
Phillip Webb 41efea51a7 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 22:43:12 -07:00
Phillip Webb bbf94c22da Polish 2018-05-03 22:42:49 -07:00
Phillip Webb 8c0c0ee55a Merge branch '2.0.x' 2018-05-03 12:44:58 -07:00
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Stephane Nicoll 36a377764f Merge branch '2.0.x' 2018-05-03 15:53:32 +02:00
Stephane Nicoll 700ec6b840 Polish "Complete SSL configuration for Kafka" 
Closes gh-13031
 2018-05-03 15:50:33 +02:00
Toshiaki Maki d208641c59 Complete SSL configuration for Kafka 
See gh-13031
 2018-05-03 15:38:49 +02:00
Andy Wilkinson 4ea7d3a767 Merge branch '2.0.x' 2018-05-03 11:35:58 +01:00
Andy Wilkinson f5fabbc1b9 Remove the use of internal API from Gradle Plugin's BootJar 
Closes gh-13037
 2018-05-03 11:34:42 +01:00
Stephane Nicoll 921c037956 Merge branch '2.0.x' 2018-05-03 11:47:33 +02:00
Stephane Nicoll 69ab956e8b Stop assuming datasource creation failure originates from auto-config 
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.

This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.

Closes gh-12947
 2018-05-03 11:46:27 +02:00
Stephane Nicoll ca1b637728 Merge branch '2.0.x' 2018-05-03 11:14:59 +02:00
Stephane Nicoll b3ad902902 Merge branch '1.5.x' into 2.0.x 2018-05-03 11:14:42 +02:00
Gary Russell 8cf34238d3 Start building against Spring Kafka 2.2.0 snapshots 
Closes gh-13007
 2018-05-02 16:15:08 +02:00
Stephane Nicoll eab2d4a404 Merge branch '2.0.x' 2018-05-02 16:13:31 +02:00
Johnny Lim e7d2f22911 Polish IgnoreTopLevelConverterNotFoundBindHandlerTests 
Closes gh-13022
 2018-05-02 16:12:37 +02:00
Johnny Lim 12cdc8b0e0 Fix @since for IgnoreTopLevelConverterNotFoundBindHandler 
Closes gh-13019
 2018-05-02 16:11:37 +02:00
Stephane Nicoll 7879b38615 Merge branch '2.0.x' 2018-05-02 16:09:56 +02:00
Stephane Nicoll 7cca56e15b Upgrade to HikariCP 2.7.9 
Closes gh-12783
 2018-05-02 16:09:02 +02:00
Stephane Nicoll 4eeddbd889 Merge branch '2.0.x' 2018-05-02 16:08:03 +02:00
Stephane Nicoll d6244889f5 Add default value for "spring.flyway.locations" 
See gh-12193
 2018-05-02 16:07:38 +02:00
Stephane Nicoll 79c222da78 Allow to provide manual metadata for keys that are not unique 
Closes gh-12193
 2018-05-02 16:04:02 +02:00
Stephane Nicoll 44fd7d953e Merge branch '2.0.x' 2018-05-02 16:00:25 +02:00
Stephane Nicoll 782d8c63da Merge branch '1.5.x' into 2.0.x 2018-05-02 15:59:56 +02:00
Andy Wilkinson 0526594a3c Merge branch '2.0.x' 2018-05-02 12:26:23 +01:00
Andy Wilkinson f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
Andy Wilkinson 1fda677f2d Merge branch '2.0.x' 2018-05-02 11:36:23 +01:00
Andy Wilkinson 0a9d950a44 Start building against Spring Kafka 2.1.6 snapshots 
See gh-13018
 2018-05-02 11:32:26 +01:00
Andy Wilkinson 2a8eb2c113 Start building against Spring Integration 5.0.5 snapshots 
See gh-13016
 2018-05-02 11:31:29 +01:00
Andy Wilkinson c50687758e Start building against Spring Data Kay SR7 snapshots 
See gh-13017
 2018-05-02 11:30:53 +01:00
Andy Wilkinson 0d67ca1e81 Starting building against Spring Framework 5.0.6 snapshots 
See gh-13021
 2018-05-02 11:29:25 +01:00
Andy Wilkinson c17a451744 Merge branch '2.0.x' 2018-05-02 10:57:47 +01:00
Andy Wilkinson 49089546f8 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:57:29 +01:00
Stephane Nicoll 0819822eb6 Merge branch '2.0.x' 2018-05-02 10:42:03 +02:00
Stephane Nicoll fbf8f57773 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:41:24 +02:00
Madhura Bhave a193c89c6d Merge branch '2.0.x' 2018-05-01 16:42:24 -07:00
Madhura Bhave aad279208e Throw exception if RandomAccessData tries to read beyond EOF 
Fixes gh-12986
 2018-05-01 16:35:43 -07:00
Madhura Bhave ef0cfc43fe Merge branch '2.0.x' 2018-05-01 11:34:39 -07:00
Madhura Bhave d268b2102f Fix typo 2018-05-01 11:33:47 -07:00
Stephane Nicoll 9f7be62687 Backport polish commit "22b99a90" 2018-05-01 11:33:26 -07:00
Andy Wilkinson c37e6ebac5 Merge branch '2.0.x' 2018-05-01 09:25:14 +01:00
Andy Wilkinson d5841982d9 Upgrade to Testcontainers 1.7.2 
See gh-12821
 2018-05-01 09:25:04 +01:00
Stephane Nicoll 0fcffae0d9 Merge branch '2.0.x' 2018-04-30 16:50:51 +02:00
Johnny Lim d8700522d3 Rename nested *AutoConfiguration classes to *Configuration 
Closes gh-12989
 2018-04-30 16:50:18 +02:00
Stephane Nicoll 335ca62239 Merge branch '2.0.x' 2018-04-30 16:45:30 +02:00
Johnny Lim a723ac95a9 Polish 
Closes gh-12999
 2018-04-30 16:44:46 +02:00
Stephane Nicoll 284fe969e0 Merge branch '2.0.x' 2018-04-30 16:43:02 +02:00
Yaman Jain 50ca33ecd2 Fix typo 
Closes gh-12996
 2018-04-30 16:42:22 +02:00
Stephane Nicoll fb8a5a9864 Polish "Add cache actuator endpoint" 
This commit improves the initial proposal by providing a by name read
operation that returns the detail of a particular cache. It also adds
more tests and complete API documentation for the feature.

Closes gh-12216
 2018-04-30 16:34:00 +02:00
Johannes Edmeier 1a57673345 Add cache actuator endpoint 
This commits adds an actuator endpoint which lists the caches per
context and cacheManager and provides a delete operation to clear the
caches. As the statistics are exposed via the metrics endpoint they are
not included

See gh-12216
 2018-04-30 16:34:00 +02:00
Andy Wilkinson 0699f65969 Merge branch '2.0.x' 2018-04-30 12:26:38 +01:00
Sebastien Deleuze 933f0bbca8 Upgrade to Kotlin 1.2.41 
Includes KT-23973 critical regression fix.
 2018-04-30 12:25:00 +01:00
Stephane Nicoll 22b99a90de Polish 
See gh-12906
 2018-04-28 10:36:41 +02:00
Madhura Bhave acc1793e96 Merge branch '2.0.x' 2018-04-27 13:19:46 -07:00
Madhura Bhave 0385bd4131 Use spring.session.timeout for Spring Session timeout 
Fallback to server.servlet.session.timeout for backwards compatibility.

Fixes gh-12906
 2018-04-27 13:16:17 -07:00
Brian Clozel 1ef0098ab5 Add WebClient metrics support 
This commit adds support for Actuator Metrics for WebClient.
This support mirrors the current behavior for `RestTemplate`, reusing
the same metric name `"http.client.requests"` and tags.

`WebClient` is instrumented by a `MetricsWebClientFilterFunction` which
is applied by a `WebClientCustomizer`. This instrumentation happens
automatically only if you create an instance of `WebClient` using an
auto-configured `WebClient.Builder` bean.

This infrastructure is reusing de facto the `MeterFilter` that has been
added for `RestTemplate` in order to limit the "uri" tag cardinality.

Closes gh-12228
 2018-04-27 13:54:14 +02:00
Stephane Nicoll 621874708d Merge branch '2.0.x' 2018-04-27 10:20:18 +02:00
Stephane Nicoll 36fb078935 Merge branch '1.5.x' into 2.0.x 2018-04-27 10:19:45 +02:00
Stephane Nicoll c8843947fe Polish 2018-04-27 10:14:51 +02:00
Stephane Nicoll 1a41ff941a Polish 2018-04-27 10:14:31 +02:00
Johnny Lim b45c5f1a27 Polish 
See gh-12981
 2018-04-27 09:34:32 +02:00
Stephane Nicoll 4d0fe5bbe6 Merge branch '2.0.x' 2018-04-27 09:33:48 +02:00
Johnny Lim b941c5f1a6 Polish 
Closes gh-12981
 2018-04-27 09:29:16 +02:00
Madhura Bhave 59b7c50c3c Merge branch '2.0.x' 2018-04-26 15:55:38 -07:00
Madhura Bhave f2d8ca8b3a Fix failing NettyReactiveWebServerFactoryTests 
NettyReactiveWebServerFactoryTests.portInUseExceptionIsThrownWhenPortIsAlreadyInUse
started failing on CI following this change in reactor netty:
e6634c27f6
Instead of a `BindException`, a `NativeIoException` is thrown. Since that Exception
is for internal use only, we throw a generic `WebServerException`
instead of the `PortInUseException`.
 2018-04-26 15:39:08 -07:00
Madhura Bhave dafe8823cc Merge branch '2.0.x' 2018-04-26 13:46:06 -07:00
Madhura Bhave 24ce3ecb43 Fix typo in docs 2018-04-26 13:43:51 -07:00
Madhura Bhave 6bebb931e5 Merge branch '2.0.x' 2018-04-26 12:21:51 -07:00
Madhura Bhave 228c85fe67 Improve List and Map binding documentation 
Closes gh-12444
 2018-04-26 12:18:49 -07:00
Stephane Nicoll 11d583ab46 Merge branch '2.0.x' 2018-04-26 16:45:03 +02:00
Stephane Nicoll fbe88c483e Prevent rabbitmq starter to bring webflux on the classpath 
This commit excludes `com.rabbitmq:http-client` from `spring-rabbit` as
the former brings spring webflux for an optional feature. This also
prevents Spring Boot to consider that a web server should be started as
all the necessary pieces are unexpectedly present.

Closes gh-12853
 2018-04-26 16:44:42 +02:00
Stephane Nicoll 25414d1b58 Merge branch '2.0.x' 2018-04-25 17:20:30 +02:00
Stephane Nicoll 9cf8080a17 Polish "Document Kotlin custom metadata generation" 
Closes gh-12960
 2018-04-25 17:19:55 +02:00
sdeleuze c24e7a5930 Document Kotlin custom metadata generation 
See gh-12960
 2018-04-25 17:19:38 +02:00
Stephane Nicoll 03cf4fbb10 Polish "Add actuator endpoint for exposing the Spring Integration graph" 
Closes gh-12331
 2018-04-25 16:16:43 +02:00
Tim Ysewyn 8c67ef1079 Add actuator endpoint for exposing the Spring Integration graph 
See gh-12331
 2018-04-25 16:16:43 +02:00
Stephane Nicoll 518f41a4ae Improve @ConditionalOnEnabledEndpoint to be used on any component 
This commit adds an `endpoint` attribute so that the condition can be
used on arbitrary components, not only endpoints or extensions.

Closes gh-12945
 2018-04-25 13:54:04 +02:00
Stephane Nicoll b090280b0c Improve Couchbase auto-configuration 
This commit improves the couchbase auto-configuration so that it is
easier to customize the way the connection to the couchbase server is
initiated.

See gh-11146
 2018-04-25 13:35:49 +02:00
Andy Wilkinson 66872a0f96 Merge branch '2.0.x' 2018-04-25 11:58:45 +01:00
Andy Wilkinson a358f3f0e8 Merge branch '1.5.x' into 2.0.x 2018-04-25 11:58:31 +01:00
Stephane Nicoll 080e189d06 Fix broken syntax 2018-04-25 10:40:23 +02:00
Stephane Nicoll 65fda8d3d6 Merge branch '2.0.x' 2018-04-25 09:43:43 +02:00
Stephane Nicoll 11ad9bfebf Upgrade version of gradle-git-properties in doc 
Closes gh-12955
 2018-04-25 09:43:19 +02:00
Stephane Nicoll fd47b728c1 Properly handle values with spaces 
Closes gh-10741
 2018-04-24 16:26:51 +02:00
Stephane Nicoll d4729f5389 Polish 2018-04-24 15:52:47 +02:00
Stephane Nicoll 40b7e02793 Polish "Add support for environment variables" 
Closes gh-12800
 2018-04-24 15:48:54 +02:00
Dmytro Nosan 95f7e3ca37 Add support for environment variables 
See gh-12800
 2018-04-24 14:48:54 +02:00
Stephane Nicoll 5dd4a7e91e Merge branch '2.0.x' 2018-04-24 13:31:36 +02:00
Stephane Nicoll 55ef9e6dc9 Deprecate excludeArtifactIds 
While being able to exclude all artifacts of a given group is a handy
feature, excluding all artifacts with a given artifactId does not make
much sense as it should refer to a single artifact anyway. Also the
general "exclude" mechanism is meant to do the exact same thing.

Closes gh-12885
 2018-04-24 13:25:58 +02:00
Andy Wilkinson 099f61ae6d Merge branch '2.0.x' 2018-04-24 11:04:23 +01:00
Andy Wilkinson c9f04c3977 Avoid race between container starting and getting mapped port 2018-04-24 11:03:54 +01:00
Stephane Nicoll 03539d8e16 Polish "Add system properties support using explicit configuration tag" 
Closes gh-10741
 2018-04-24 11:46:20 +02:00
Vadeg ba34bf6470 Add system properties support using explicit configuration tag 
See gh-10741
 2018-04-24 11:46:20 +02:00
Andy Wilkinson fe497d70b8 Merge branch '2.0.x' 2018-04-24 10:39:11 +01:00
Andy Wilkinson f6cc1cbd76 Make Testcontainer wait strategies final 2018-04-24 10:38:57 +01:00
Andy Wilkinson c9b2afbd1e Merge branch '2.0.x' 2018-04-24 10:27:32 +01:00
Andy Wilkinson f39cea0428 Try to stabilize build by giving Cassandra longer to start 2018-04-24 10:27:11 +01:00
Andy Wilkinson 6c504a5098 Fix deprecation warnings in Testcontainers wait strategies 
See gh-12821
 2018-04-24 10:27:11 +01:00
Stephane Nicoll 760b5e8510 Merge branch '2.0.x' 2018-04-24 10:18:20 +02:00
Johnny Lim a15319ee30 Remove ManagementServerProperties.addApplicationContextHeader 
Closes gh-12926
 2018-04-24 10:16:49 +02:00
Madhura Bhave da6a8e8624 Merge branch '2.0.x' 2018-04-23 12:32:32 -07:00
Madhura Bhave 877c4f702e Use empty key-store-password if storeprovider present 
For tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the keyStore with an
empty password. Previously, if a password was supplied using the
ssl.key-store-password property, that would be the password used to
load the keystore and the connector would fail with a
"Password verification failed" exception.

Fixes gh-11391
 2018-04-23 12:31:47 -07:00
Andy Wilkinson 60bf4ef430 Merge branch '2.0.x' 2018-04-23 17:25:29 +01:00
Andy Wilkinson a5f3f36b58 Test the Gradle plugin against Gradle 4.7 
Closes gh-12952
 2018-04-23 17:24:50 +01:00
Andy Wilkinson 15a70153c1 Merge branch '2.0.x' 2018-04-23 17:08:21 +01:00
Andy Wilkinson 72ec2c8644 Polish “Only analyze configurations that we've registered to check” 
Closes gh-12784
 2018-04-23 16:45:21 +01:00
danhyun 1e447ebfbf Only analyze configurations that we've registered to check 
See gh-12784
 2018-04-23 16:25:17 +01:00
Andy Wilkinson 806978b8f1 Test unresolved dependency analysis in the Gradle plugin 
See gh-12784
 2018-04-23 15:52:56 +01:00
Brian Clozel e39e125aa2 Merge branch '2.0.x' 2018-04-23 13:54:42 +02:00
Brian Clozel e3e404f9f9 Fix optional ContentNegotiationStrategy for Actuator 
Since https://jira.spring.io/browse/SPR-16624, the contract for
`ContentNegotiationStrategy` has been refined and should never return an
empty list if it's got no preference for a media type, but it should
rather respond with a `"*/*"` instead.

This commit fixes the `OptionalPathExtensionContentNegotiationStrategy`
defined in the Spring MVC auto-configuration to have that behavior.

Fixes gh-12900
 2018-04-23 13:48:42 +02:00
Stephane Nicoll 50d73285f7 Merge branch '2.0.x' 2018-04-22 11:12:12 +02:00
Stephane Nicoll f58f23c5b8 Document that binder doesn't handle static properties 
Closes gh-12912
 2018-04-22 11:11:56 +02:00
Stephane Nicoll 49f64aab48 Merge branch '2.0.x' 2018-04-22 09:21:09 +02:00
Stephane Nicoll 469ce57016 Remove outdated note 
As we've updated the complete ref doc to use a canonical format for
configuration keys, this not is outdated and this commit removes it.
 2018-04-22 09:20:19 +02:00
Stephane Nicoll 6df1ea3544 Fix use of deprecated property in docs 
Closes gh-12940
 2018-04-22 09:19:08 +02:00
Brian Clozel e0eadfe723 Merge branch '2.0.x' 2018-04-21 09:47:20 +02:00
Brian Clozel f1b3188c3c Upgrade to Netty 4.1.24.Final 2018-04-21 09:47:02 +02:00
Madhura Bhave c449660642 Merge branch '2.0.x' 2018-04-20 12:38:09 -07:00
Madhura Bhave 5afa7d1965 Reset URLStreamHandlerFactory instance between tests 2018-04-20 12:28:53 -07:00
Stephane Nicoll 719fcb4038 Merge branch '2.0.x' 2018-04-20 07:20:24 +02:00
dreis2211 a930835b92 Replace <code> tags where possible 
Closes gh-12922
 2018-04-20 07:19:31 +02:00
Madhura Bhave d7abbe37cd Merge branch '2.0.x' 2018-04-19 15:00:38 -07:00
Madhura Bhave 5792042d5d Fix verify statements in tests 2018-04-19 14:59:48 -07:00
Madhura Bhave ca41a3c1cc Merge branch '2.0.x' 2018-04-19 14:22:25 -07:00
Madhura Bhave c93f7ddff6 Make truststore & keystore optional on SslStoreProvider 
Fixes gh-11395
 2018-04-19 14:21:57 -07:00
Stephane Nicoll 36e33a3b94 Merge branch '2.0.x' 2018-04-19 09:26:56 +02:00
evernat 91fa76a9a2 Add reference to javamelody starter 
Closes gh-12877
 2018-04-19 09:25:38 +02:00