Andy Wilkinson
11c635671f
Upgrade to Rxjava2 2.1.16
...
Closes gh-13642
2018-07-03 14:32:23 +01:00
Andy Wilkinson
f173429327
Upgrade to Flatten Maven Plugin 1.0.1
...
Closes gh-13650
2018-07-03 13:33:04 +01:00
Andy Wilkinson
5220a08228
Upgrade to Xml Maven Plugin 1.0.2
...
Closes gh-13649
2018-07-03 13:33:03 +01:00
Andy Wilkinson
573f736374
Upgrade to Maven Resources Plugin 3.0.2
...
Closes gh-13648
2018-07-03 13:33:02 +01:00
Andy Wilkinson
83a56bac60
Upgrade to Maven Javadoc Plugin 3.0.1
...
Closes gh-13647
2018-07-03 13:33:01 +01:00
Andy Wilkinson
d3ef9fd2ba
Upgrade to Maven Enforcer Plugin 3.0.0-M2
...
Closes gh-13646
2018-07-03 13:33:00 +01:00
Andy Wilkinson
1c64496470
Upgrade to Jooq 3.10.8
...
Closes gh-13645
2018-07-03 13:32:59 +01:00
Andy Wilkinson
797efbd259
Upgrade to Solr 6.6.5
...
Closes gh-13644
2018-07-03 13:32:58 +01:00
Andy Wilkinson
c6dae8f305
Upgrade to Johnzon Jsonb 1.1.8
...
Closes gh-13643
2018-07-03 13:32:57 +01:00
Andy Wilkinson
aa5b70c43c
Upgrade to Rxjava2 2.1.16
...
Closes gh-13642
2018-07-03 13:32:57 +01:00
Andy Wilkinson
2859d7e649
Merge branch '2.0.x'
2018-07-03 13:25:11 +01:00
Andy Wilkinson
9120f49721
Merge branch '1.5.x' into 2.0.x
2018-07-03 13:24:19 +01:00
Karl Heinz Marbaise
0d3b49cd95
Upgrade to Maven War Plugin 3.2.2
...
Closes gh-13629
2018-07-03 09:13:41 +01:00
Karl Heinz Marbaise
205fa2507b
Remove maven-eclipse-plugin as it has been retired
...
Closes gh-13631
2018-07-03 08:38:49 +01:00
dreis2211
d641249ca8
Fix deprecation warning in SpringPhysicalNamingStrategyTests
...
Closes gh-13623
2018-07-03 08:29:11 +01:00
Madhura Bhave
149c7a85c3
Merge branch '2.0.x'
2018-07-02 13:18:45 -07:00
Madhura Bhave
673a08d228
Support microseconds in Duration conversions
...
Closes gh-13624
2018-07-02 13:18:09 -07:00
Andy Wilkinson
c3641c480b
Merge branch '2.0.x'
2018-07-02 19:18:30 +01:00
Andy Wilkinson
06a8c41943
Preserve trailing whitespace in origin-tracked property values
...
Closes gh-13602
2018-07-02 19:17:02 +01:00
Andy Wilkinson
de900e71a3
Merge branch '2.0.x'
2018-07-02 16:26:27 +01:00
Andy Wilkinson
032d5488cd
Tolerate non-existent source folders in DevTools
...
Closes gh-13620
2018-07-02 16:26:19 +01:00
Madhura Bhave
4eff07f6c0
Merge branch '2.0.x'
2018-06-28 12:49:34 -07:00
Madhura Bhave
fddc9e9c7e
Support multiple paths in DispatcherServletPathProvider
...
Closes gh-13603
2018-06-28 12:36:58 -07:00
Andy Wilkinson
4cccc9a886
Merge branch '2.0.x'
2018-06-28 14:27:21 +01:00
Andy Wilkinson
a5d20ffed7
Avoid NPE when creating method tag for WebFlux req with non-standard method
...
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.
This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.
Closes gh-13596
2018-06-28 14:27:02 +01:00
Andy Wilkinson
45fdf2ffa4
Support Tomcat 9 and Undertow 2
...
Closes gh-11749
Closes gh-12243
2018-06-28 11:33:30 +01:00
Andy Wilkinson
b4cd4f4c43
Stop mocking class that is final in latest Framework 5.1 snapshots
2018-06-28 10:51:58 +01:00
Madhura Bhave
cde3c21926
Merge branch '2.0.x'
2018-06-27 11:34:22 -07:00
dreis2211
17edf0e2fe
Fix typo
2018-06-27 11:31:06 -07:00
Madhura Bhave
598b1f4300
Merge branch '2.0.x'
2018-06-27 11:21:18 -07:00
Madhura Bhave
a1491be636
Refine DispatcherServletPathProvider creation
...
Closes gh-13527
2018-06-27 11:06:56 -07:00
Andy Wilkinson
ca0de4385c
Upgrade to Hibernate 5.3 and JPA 2.2
...
Closes gh-11725
2018-06-26 16:51:47 +01:00
Andy Wilkinson
9281e2a410
Avoid creating JsonParser for VCAP_* parsing when running outside CF
...
Closes gh-13437
2018-06-25 17:35:30 +01:00
Andy Wilkinson
8dbeb68afa
Merge branch '2.0.x'
2018-06-25 13:13:42 +01:00
Andy Wilkinson
04119585e8
Merge branch '1.5.x' into 2.0.x
2018-06-25 13:13:34 +01:00
Andy Wilkinson
80ede14510
Merge branch '2.0.x'
2018-06-25 11:25:21 +01:00
Andy Wilkinson
911453d478
Merge branch '1.5.x' into 2.0.x
2018-06-25 11:25:10 +01:00
Andy Wilkinson
a097f923c1
Provide sensible defaults for launch script properties when using Gradle
...
Closes gh-4458
2018-06-22 13:08:44 +01:00
Andy Wilkinson
5c3b4333f8
Merge branch '2.0.x'
2018-06-21 17:31:24 +01:00
Andy Wilkinson
30f0fd1fe4
Merge branch '1.5.x' into 2.0.x
2018-06-21 17:31:16 +01:00
Andy Wilkinson
24dec4807f
Merge branch '2.0.x'
2018-06-21 12:47:46 +01:00
Andy Wilkinson
fd125b4a4a
Remove assumption that a file URI can be turned into a File
...
Closes gh-13493
2018-06-21 12:47:23 +01:00
Stephane Nicoll
4c172eb6cd
Merge branch '2.0.x'
2018-06-21 13:32:31 +02:00
Stephane Nicoll
f2cc6e2ef2
Fix link of RESTEasy repository
...
Closes gh-13538
2018-06-21 13:32:07 +02:00
Stephane Nicoll
c594768640
Remove wro4j starter reference
...
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Stephane Nicoll
8858c88a4c
Remove GraphQL starter reference
...
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Andy Wilkinson
a612ba1b11
Merge branch '2.0.x'
2018-06-21 12:18:40 +01:00
Andy Wilkinson
48c5e70ac8
Merge branch '1.5.x' into 2.0.x
2018-06-21 12:18:35 +01:00
Andy Wilkinson
eb6898314a
Merge branch '2.0.x'
2018-06-21 11:41:15 +01:00
Andy Wilkinson
2624748911
Merge branch '1.5.x' into 2.0.x
2018-06-21 11:41:02 +01:00
Stephane Nicoll
56a7aa552f
Polish
2018-06-21 10:40:33 +02:00
Johnny Lim
bb60edaca6
Polish
...
Closes gh-13534
2018-06-21 09:24:36 +02:00
Stephane Nicoll
d4d169277d
Merge branch '2.0.x'
2018-06-21 09:23:43 +02:00
Johnny Lim
b9ea0fd5a7
Polish
...
See gh-13534
2018-06-21 09:20:50 +02:00
Stephane Nicoll
9e9e746554
Merge branch '1.5.x' into 2.0.x
2018-06-21 09:17:05 +02:00
Andy Wilkinson
3ea7c2e003
Merge branch '2.0.x'
2018-06-20 16:51:56 +01:00
Andy Wilkinson
4fc0a33094
Merge branch '1.5.x' into 2.0.x
2018-06-20 16:49:53 +01:00
Andy Wilkinson
c90f589906
Merge branch '2.0.x'
2018-06-20 13:57:05 +01:00
Andy Wilkinson
e2d6280d83
Merge branch '1.5.x' into 2.0.x
2018-06-20 13:56:55 +01:00
Andy Wilkinson
7571f10ae3
Merge branch '2.0.x'
2018-06-20 11:41:54 +01:00
Andy Wilkinson
e730382718
Merge branch '1.5.x' into 2.0.x
2018-06-20 11:12:51 +01:00
Andy Wilkinson
20546024d3
Merge branch '2.0.x'
2018-06-20 10:11:44 +01:00
Andy Wilkinson
e1774672af
Prefer servlet to reactive when Jersey and WebFlux are both available
...
Closes gh-13521
2018-06-20 10:10:35 +01:00
Stephane Nicoll
8b35d06cf6
Share RetryTemplate infrastructure for Rabbit listener and template
...
Closes gh-13529
2018-06-20 09:28:00 +02:00
Stephane Nicoll
65cc7c72f4
Harmonize JNDI lookups to enable resourceRef
...
This commit makes sure that JMS and Mail JNDI lookups behave the same
way as DataSource JNDI lookups by enabling the "resourceRef" flag.
This will make sure to add "java:comp/env" to the lookup if the JNDI
name doesn't already contain it. If that name does not exist, a second
attempt to the original name will be issued automatically.
Closes gh-12803
2018-06-19 21:51:18 +02:00
Andy Wilkinson
c12f8298e6
Merge branch '2.0.x'
2018-06-19 20:06:58 +01:00
Andy Wilkinson
814e90805e
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:06:44 +01:00
Stephane Nicoll
3fdb2b3c85
Merge branch '2.0.x'
2018-06-19 20:59:43 +02:00
Stephane Nicoll
864a6b3e91
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:59:27 +02:00
Stephane Nicoll
9d3ba14686
Fix conditions for CachingConnectionFactory support
...
Closes gh-12161
2018-06-19 19:58:48 +02:00
Andy Wilkinson
12eafc84b0
Merge branch '2.0.x'
2018-06-19 15:45:16 +01:00
Andy Wilkinson
497902de4e
Only bridge JUL into SLF4J when JUL has not be customized
...
Previously, Slf4jLoggingSystem would install SLF4JBridgeHandler into
JUL but would only remove a single root handler that was a
ConsoleHandler. If there were was than one root handler or the single
root handler was of a different type, they would not be uninstalled.
When deploying an application to Tomcat, this led to duplicate log
messages appearing in Tomcat’s console output and to logging from
other application or Tomcat itself being routed into an
application-specific log file enabled using the logging.file
configuration property.
A secondary, related problem was that LogbackLoggingSystem installs a
LevelChangePropagator so that Logback’s log level configuration is
propagated into JUL. This meant that an individual Boot app with
custom log level configuration could change the log levels of Tomcat
itself and of any other applications that had been deployed to Tomcat
and use JUL.
This commit updates both Slf4jLoggingSystem and LogbackLoggingSystem
so that they only change JUL’s configuration if it hasn’t already been
customized. The configuration is deemed to have not been customised if
there’s a single root handler and its a console handler.
Closes gh-13470
2018-06-19 15:29:46 +01:00
Brian Clozel
cc894ce4f2
Fix Micrometer tag providers after HttpStatus changes
...
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
2018-06-19 16:05:40 +02:00
Stephane Nicoll
8365d53554
Add support for JMS session caching
...
This commit adds support for CachingConnectionFactory for both Artemis
and ActiveMQ. If connection pooling is not enabled explicitly, sessions,
producers and consumers are cached. The factory can be further
customized, including reverting to the raw ConnectionFactory, using the
`spring.jms.*` namespace.
Closes gh-12161
2018-06-19 15:17:00 +02:00
Stephane Nicoll
0ef54a79b1
Add support for connection pooling with Artemis
...
This commit expands ActiveMQ's connection pooling to artemis. The same
pooling features are now shared by the two brokers and a
PooledConnectionFactory can be auto-configured when the necessary jar is
present.
Closes gh-13523
2018-06-19 15:05:32 +02:00
Brian Clozel
28c1bc9986
Fix DefaultErrorViewResolver after HttpStatus changes
...
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
2018-06-19 15:02:45 +02:00
Stephane Nicoll
6970f19ce3
Merge branch '2.0.x'
2018-06-19 14:12:25 +02:00
Stephane Nicoll
7ae82b070b
Stop calling Charset.availableCharsets() early
...
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.
Closes gh-13423
2018-06-19 14:12:00 +02:00
Stephane Nicoll
ae12d515ee
Merge branch '2.0.x'
2018-06-19 11:11:18 +02:00
Johnny Lim
1e7ed2ffdb
Add log level guards in ConfigFileApplicationListener
...
Closes gh-13512
2018-06-19 11:10:45 +02:00
Stephane Nicoll
f682c77691
Polish "Add reference to dozer-spring-boot-starter"
...
Closes gh-13501
2018-06-19 10:54:01 +02:00
Kazuki Shimizu
9308904af7
Add reference to dozer-spring-boot-starter
...
See gh-13501
2018-06-19 10:52:45 +02:00
Johnny Lim
fb834898ab
Use final keywords for Map fields in JacksonProperties
...
Closes gh-13517
2018-06-19 09:13:33 +02:00
Madhura Bhave
3a01914b63
Merge branch '2.0.x'
2018-06-18 17:18:16 -07:00
Madhura Bhave
87680b4ee5
Fix profile precedence when active and include provided
...
Before 2.0.2, if profiles were activated via the environment using the
active and include profile property, profiles specified via the active
property would take precedence. This commit restores that behavior.
Fixes gh-13513
2018-06-18 16:24:49 -07:00
Stephane Nicoll
165d993e5d
Merge branch '2.0.x'
2018-06-18 17:54:39 +02:00
Stephane Nicoll
62c93a4b9a
Add missing `@ConditionalOnClass` check on RedisCacheConfiguration
...
Closes gh-13508
2018-06-18 17:54:10 +02:00
Stephane Nicoll
defa171a32
Merge branch '2.0.x'
2018-06-18 13:41:36 +02:00
Johnny Lim
dd3bfdbe42
Use @ManagementContextConfiguration consistently
2018-06-18 13:28:30 +02:00
Stephane Nicoll
b4584e6a28
Support profile expression in Logback's <springProfile>
...
Closes gh-13496
2018-06-18 13:23:58 +02:00
Stephane Nicoll
a89b2ae46e
Support profile expression in yml profile matching
...
Closes gh-12469
2018-06-18 13:05:52 +02:00
Stephane Nicoll
0c4176f596
Drop JsonSimpleJsonParser and JSON simple dependency
...
Closes gh-13471
2018-06-18 10:11:50 +02:00
Stephane Nicoll
fa7da40640
Upgrade to JUnit 5.2.0
...
Closes gh-13118
2018-06-18 09:19:13 +02:00
Andy Wilkinson
f3f573a774
Merge branch '2.0.x'
2018-06-18 08:18:41 +01:00
Andy Wilkinson
b3927cfd10
Start building against Spring REST Docs 2.0.2 snapshots
...
See gh-13505
2018-06-18 08:18:15 +01:00
Stephane Nicoll
3b0c1354cb
Upgrade to Maven Surefire/Failsafe Plugin 2.22.0
...
Closes gh-13500
2018-06-17 16:43:27 +02:00
Johnny Lim
403f8927c3
Polish CachesEndpoint
...
Closes gh-13487
2018-06-15 13:56:39 +02:00
Johnny Lim
ec845c93f2
Polish HibernateProperties and its test
...
Closes gh-13484
2018-06-15 13:44:35 +02:00
Stephane Nicoll
60b109cf0c
Merge branch '2.0.x'
2018-06-15 13:38:29 +02:00
Johnny Lim
f34fb5f1ee
Reduce object creation in findMatchingItemMetadata()
...
Closes gh-13473
2018-06-15 13:36:55 +02:00
Andy Wilkinson
b96f9d635f
Upgrade to Elasticsearch 5.6.10
...
Closes gh-13479
2018-06-14 09:40:08 +01:00
Stephane Nicoll
5654fb049f
Merge branch '2.0.x'
2018-06-14 08:52:24 +02:00
Stephane Nicoll
438f0b008a
Upgrade to Spring Amqp 2.0.4
...
Closes gh-13477
2018-06-14 08:48:36 +02:00
Stephane Nicoll
2483ed3e4e
Upgrade to Spring Kafka 2.1.7
...
Closes gh-13476
2018-06-14 08:47:20 +02:00
Stephane Nicoll
f217aa40f0
Merge branch '2.0.x'
2018-06-14 08:38:33 +02:00
Stephane Nicoll
d47d84ff7a
Merge branch '1.5.x' into 2.0.x
2018-06-14 08:36:18 +02:00
Stephane Nicoll
de6ce79d5f
Upgrade to Spring Session Apple-SR3
...
Closes gh-13461
2018-06-14 08:30:11 +02:00
Stephane Nicoll
40ba15047b
Upgrade to Spring Integration 5.0.6
...
Closes gh-13457
2018-06-14 08:28:17 +02:00
Brian Clozel
6e9fee35a7
Upgrade to Spring Data Kay SR8
...
Closes gh-13455
2018-06-13 23:05:47 +02:00
Brian Clozel
cb6c8f76e2
Configure X-Forwarded-* support with Reactor Netty
...
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.
Closes gh-10900
2018-06-13 14:55:33 +02:00
Andy Wilkinson
f8eefa80df
Merge branch '2.0.x'
2018-06-13 10:55:24 +01:00
Andy Wilkinson
42c307b744
Upgrade to Solr 6.6.4
...
Closes gh-13468
2018-06-13 10:54:36 +01:00
Andy Wilkinson
bbcbc2d113
Upgrade to Reactor Bom Bismuth-SR10
...
Closes gh-13467
2018-06-13 10:54:35 +01:00
Andy Wilkinson
ed3f43fd25
Upgrade to Jackson 2.9.6
...
Closes gh-13466
2018-06-13 10:54:34 +01:00
Andy Wilkinson
0e867aec97
Upgrade to Couchbase Client 2.5.9
...
Closes gh-13465
2018-06-13 10:54:33 +01:00
Andy Wilkinson
71b8b2d242
Merge branch '1.5.x' into 2.0.x
2018-06-13 10:52:27 +01:00
Andy Wilkinson
a79c8918ff
Upgrade to Spring Security 5.0.6.RELEASE
...
Closes gh-13459
2018-06-13 09:36:47 +01:00
Stephane Nicoll
c738b73c6f
Merge branch '2.0.x'
2018-06-13 09:29:36 +02:00
Johnny Lim
870d7fe16a
Use @SpringBootTest.properties in tests and samples
...
Closes gh-13453
2018-06-13 09:24:28 +02:00
Stephane Nicoll
f8eedb04cc
Merge branch '2.0.x'
2018-06-13 09:08:57 +02:00
Jon Schneider
96a6d2923c
Upgrade to Micrometer 1.0.5
...
Closes gh-13454
2018-06-13 08:56:04 +02:00
Stephane Nicoll
d24647b07c
Upgrade to Spring Framework 5.0.7.RELEASE
...
Closes gh-13353
2018-06-13 08:51:40 +02:00
Johnny Lim
de3c3cd755
Add CLIENT_NAME_NONE to WebClientExchangeTags
2018-06-12 09:20:46 +02:00
Johnny Lim
c908445bff
Use a precompiled pattern in WebClientExchangeTags.extractPath()
2018-06-12 14:56:02 +09:00
Andy Wilkinson
5bd9a445ae
Merge branch '2.0.x'
2018-06-08 18:09:00 +01:00
Andy Wilkinson
6f2171c282
Improve error message when BootJar or BootWar has no known main class
...
Closes gh-12712
2018-06-08 18:07:24 +01:00
Andy Wilkinson
db7789ad87
Merge branch '2.0.x'
2018-06-08 15:47:55 +01:00
Andy Wilkinson
7b3be82cfa
Merge branch '1.5.x' into 2.0.x
2018-06-08 15:47:50 +01:00
Madhura Bhave
87506248b0
Merge branch '2.0.x'
2018-06-07 12:53:37 -07:00
Madhura Bhave
4194baad91
Don't log p/w when AuthenticationManagerBuilder configured
...
Fixes gh-12872
2018-06-07 12:52:15 -07:00
Madhura Bhave
f7ff8dd165
Make generated password output consistent
2018-06-07 12:39:46 -07:00
Madhura Bhave
ed734d7e43
Trace filter ignores invalid requests
...
Fixes gh-12987
2018-06-07 09:27:49 -07:00
Brian Clozel
751a2b438e
Upgrade duplicate finder maven plugin to 1.3.0
...
Closes gh-13411
2018-06-07 15:24:32 +02:00
Brian Clozel
59746de63b
Backport web server configuration doc changes
...
Closes gh-13401
2018-06-07 14:38:19 +02:00
Rossen Stoyanchev
a4ee33bf56
Follow-up dates for web server config documentation
...
See gh-13315
2018-06-07 14:32:59 +02:00
Stephane Nicoll
34167dc163
Polish
2018-06-07 13:34:18 +02:00
Stephane Nicoll
a9e56aa089
Merge branch '2.0.x'
2018-06-07 10:46:20 +02:00
Stephane Nicoll
5c96943e59
Merge branch '1.5.x' into 2.0.x
2018-06-07 10:45:59 +02:00
Phillip Webb
a0b6547aca
Don't fail build on duplicate module-info classes
...
Update the duplicate-finder-maven-plugin configuration to ignore
module-info classes.
Closes gh-13403
2018-06-06 17:32:36 -07:00
Madhura Bhave
cb621024e4
Include error stacktrace by default when devtools is in use
...
Fixes gh-828
2018-06-06 15:25:52 -07:00
Phillip Webb
375769ed5a
Merge branch '2.0.x'
2018-06-06 15:18:52 -07:00
Phillip Webb
dc1c459cde
Polish "Fix caching issues with map property sources"
...
Refine the property source cache key fix so that a copy of the
key is only taken when the values change. This allows us to
retain the previous performance optimization of not creating
unnecessary string arrays.
Closes gh-13344
2018-06-06 15:17:07 -07:00
Fahim Farook
c556d2b58f
Fix caching issues with map property sources
...
Update `SpringIterableConfigurationPropertySource` so that the cache
key from a `MapPropertySource` is invalidated when the map contents
changes.
Prior to this commit, the actual keys of the map were used as the key.
This meant that if the underlying map changed, they key wouldn't be
invalidated because it ultimately pointed to the same object instance.
See gh-13344
2018-06-06 15:02:59 -07:00
Madhura Bhave
9570cd4172
Add saaj and jax-ws to webservices starter
...
Closes gh-13360
2018-06-06 14:36:39 -07:00
Madhura Bhave
6eaae608b5
Merge branch '2.0.x'
2018-06-06 10:49:46 -07:00
Madhura Bhave
461202bc25
EndpointRequest uses empty servlet path if not available
...
Fixes gh-13399
2018-06-06 10:48:42 -07:00
Brian Clozel
0004550f7b
Document Reactor Netty server configuration
...
This commit regroups the documentation on how to configure a web server
in Spring Boot. The same concepts apply, whether the server is
Tomcat/Netty/Jetty/Undertow, or if it's deployed for a Servlet or
Reactive web application.
Closes gh-13315
2018-06-06 17:32:24 +02:00
Brian Clozel
fe3de2816c
Merge branch '2.0.x'
2018-06-06 14:07:58 +02:00
Brian Clozel
7cbbd95fc9
Ignore invalid Accept headers in WebFlux error handling
...
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.
This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.
Closes: gh-13372
2018-06-06 14:02:04 +02:00
Stephane Nicoll
ab19db19a3
Move Hibernate settings to a dedicated class
...
Closes gh-1327
2018-06-06 14:00:35 +02:00
Andy Wilkinson
cf8c0acdc5
Merge branch '2.0.x'
2018-06-06 10:16:19 +01:00
Andy Wilkinson
47615154de
Upgrade to Mongodb 3.6.4
...
Closes gh-13397
2018-06-06 10:15:33 +01:00
Andy Wilkinson
fd56e79f7a
Upgrade to Mariadb 2.2.5
...
Closes gh-13396
2018-06-06 10:15:33 +01:00
Andy Wilkinson
6d0d66cb28
Upgrade to Narayana 5.8.2.Final
...
Closes gh-13395
2018-06-06 10:15:33 +01:00
Andy Wilkinson
a4a6f482c6
Upgrade to Hsqldb 2.4.1
...
Closes gh-13394
2018-06-06 10:15:33 +01:00
Andy Wilkinson
ecd8760514
Upgrade to Hibernate Validator 6.0.10.Final
...
Closes gh-13393
2018-06-06 10:15:33 +01:00
Andy Wilkinson
50f3f50ebb
Upgrade to Activemq 5.15.4
...
Closes gh-13392
2018-06-06 10:15:33 +01:00
Andy Wilkinson
2b4d51e763
Upgrade to Rxjava2 2.1.14
...
Closes gh-13391
2018-06-06 10:15:33 +01:00
Andy Wilkinson
d79f2401be
Upgrade to Netty 4.1.25.Final
...
Closes gh-13390
2018-06-06 10:15:33 +01:00
Andy Wilkinson
2d4f1bb043
Upgrade to Unboundid Ldapsdk 4.0.6
...
Closes gh-13389
2018-06-06 10:15:33 +01:00
Andy Wilkinson
27b5fdd1e1
Merge branch '1.5.x' into 2.0.x
2018-06-06 10:15:24 +01:00
Stephane Nicoll
42c2059dd8
Merge branch '2.0.x'
2018-06-06 11:00:25 +02:00
Stephane Nicoll
f6c99361a4
Merge branch '1.5.x' into 2.0.x
2018-06-06 11:00:02 +02:00
Stephane Nicoll
0d63e7f592
Merge branch '2.0.x'
2018-06-06 09:30:46 +02:00
dreis2211
ba8a32fa4e
Replace commons-codec Base64 usage
...
See gh-13378
2018-06-06 09:19:17 +02:00
Phillip Webb
e0ae805924
Update copyright header
2018-06-05 17:45:09 -07:00
Phillip Webb
66be6c3396
Polish
2018-06-05 17:44:51 -07:00
Madhura Bhave
26b826e017
Merge branch '2.0.x'
2018-06-05 13:49:42 -07:00
Madhura Bhave
d0a2a8e929
Document ConfigurableServletWebServerFactory variants
...
Closes gh-13083
2018-06-05 13:48:43 -07:00
Brian Clozel
56ab0da287
Support EncodedResourceResolver in resource chain
...
As of https://jira.spring.io/browse/SPR-16381 , Spring Framework now
supports both gzip and Brotli as compression formats for static
resources resolved by the resource chain.
The `GzipResourceResolver` has been deprecated and replaced by the
`EncodedResourceResolver`. This commit uses this new resolver and adapts
the configuration key to reflect those changes.
Note that this resolver is now configured ahead of the
`VersionResourceResolver`.
Closes gh-13242
2018-06-05 17:25:25 +02:00
Dmytro Nosan
5b159a6bd0
Use Duration in HttpWebServiceMessageSenderBuilder
...
Closes gh-13364
2018-06-05 16:14:34 +02:00
Stephane Nicoll
909722f143
Polish
2018-06-05 16:02:32 +02:00
Stephane Nicoll
e9c3df4ad2
Polish "Add duration support for setConnectTimeout and setReadTimeout"
...
Closes gh-13355
2018-06-05 16:00:33 +02:00
Dmytro Nosan
36f3c1b883
Add duration support for setConnectTimeout and setReadTimeout
...
See gh-13355
2018-06-05 16:00:33 +02:00
Stephane Nicoll
8691d01aaf
Polish "Add duration support for setConnectTimout and setReadTimeout"
...
See gh-13355
2018-06-05 16:00:25 +02:00
Stephane Nicoll
83f7df920b
Merge branch '2.0.x'
2018-06-05 13:30:07 +02:00
Stephane Nicoll
bf56ec496d
Polish
2018-06-05 13:29:56 +02:00
Stephane Nicoll
47634f5587
Polish
2018-06-05 13:21:03 +02:00
Stephane Nicoll
1901008d6f
Merge branch '2.0.x'
2018-06-05 13:18:40 +02:00
Stephane Nicoll
fff06822dc
Polish
2018-06-05 13:15:38 +02:00
Stephane Nicoll
d84e2b90d7
Fix wrong usage of ManagementContextConfiguration
...
Closes gh-13366
2018-06-05 13:15:21 +02:00
Stephane Nicoll
51cf4e5d74
Polish "Add support to set visibility via JacksonProperties"
...
Closes gh-13214
2018-06-05 10:30:15 +02:00
Eddú Meléndez
ca3659059a
Add support to set visibility via JacksonProperties
...
This commit allows to configure properties visibility.
See gh-13214
2018-06-05 10:20:25 +02:00
Stephane Nicoll
3248400665
Merge branch '2.0.x'
2018-06-05 10:12:46 +02:00
Stephane Nicoll
b4f8361989
Make JMX metrics domain configurable
...
Closes gh-13356
2018-06-05 10:12:26 +02:00
Stephane Nicoll
c612ed2695
Polish "RestTemplateCustomizers should be applied at the end"
...
Closes gh-13358
2018-06-05 09:45:19 +02:00
Dmytro Nosan
ce3420748f
RestTemplateCustomizers should be applied at the end
...
See gh-13358
2018-06-05 09:42:42 +02:00
Phillip Webb
ade1397ea2
Merge branch '2.0.x'
2018-06-04 17:28:54 -07:00
Phillip Webb
571c50e43f
Switch to functional web code to use static imports
...
Update the samples and tests to use the more idiomatic static import
style.
2018-06-04 17:27:34 -07:00
Phillip Webb
2274ac5214
Move spring-javaformat plugins to root POM
...
Relocate spring-javaformat plugins to the root of the project.
Closes gh-13306
2018-06-04 17:25:19 -07:00
Phillip Webb
d47e7ebb5b
Merge branch '2.0.x'
2018-06-04 15:42:12 -07:00
Phillip Webb
e1d21e52d5
Allow multi-value spring.profiles properties
...
Update `ConfigFileApplicationListener` to correctly load properties
that have `spring.profiles` values containing a list.
Prior to this commit the loaded would attempt to add the same document
twice resulting in a "property source cannot be added relative to
itself" error.
Closes gh-13362
2018-06-04 15:39:16 -07:00
Phillip Webb
a12baed5de
Merge branch '2.0.x'
2018-06-04 15:02:14 -07:00
Phillip Webb
c1ab3eab69
Polish
2018-06-04 15:02:06 -07:00
Phillip Webb
67b548dafb
Protect against infinite property include loop
...
Update `ConfigFileApplicationListener` to ensure that a
`spring.profiles.include` property that refers to an already processed
profile doesn't cause an infinite loop.
Closes gh-13361
2018-06-04 14:59:29 -07:00
Madhura Bhave
378c4c9535
Stop included profiles overriding active profiles
...
Update `ConfigFileApplicationListener` so that `spring.profiles.include`
properties do not override higher priority active profiles.
This commit also changes when profiles get added to the environment.
Profiles are now added to the environment at the time of profile
processing so that they get logged in the order that they are processed.
Closes gh-13151
2018-06-04 14:46:44 -07:00
Brian Clozel
87af880446
Reactor BOM is now declaring reactor-netty 0.8
...
See gh-13321
2018-06-04 22:03:51 +02:00
Madhura Bhave
360d392eb1
Merge branch '2.0.x'
2018-06-04 12:51:07 -07:00
Madhura Bhave
60a4d67b13
Handle special characters in TraceableHttpServletRequest
...
Fixes gh-13273
2018-06-04 12:50:11 -07:00
Phillip Webb
ef5301d079
Add saaj and jax-ws dependencies for Java 9 build
...
Add test dependencies for saaj-impl and jax-ws since Java 9+ no longer
includes them.
See gh-1270
2018-06-04 12:16:30 -07:00
Andy Wilkinson
ebb99d1c20
Merge branch '2.0.x'
2018-06-04 19:38:53 +01:00
Andy Wilkinson
1a0dfa06ab
Add log4j-jul to Log4j 2 starter
...
Closes gh-12659
2018-06-04 19:38:25 +01:00
Phillip Webb
1d35b629bb
Merge branch '2.0.x'
2018-06-04 11:02:06 -07:00
Phillip Webb
abe92eba2e
Protect Inet test against "helpful" DNS resolvers
...
Update `InetAddressFormatterTests` to ensure that DNS resolvers that
return a "help" page for missing domains don't cause the build to fail.
Closes gh-11897
2018-06-04 10:50:36 -07:00
Brian Clozel
bd8106d77f
Upgrade to Spring Framework 5.1
...
As of Spring Framework 5.1, we're depending on the Reactor Californium
release train.
Reactor Netty is now at version 0.8 and changed its artifact
coordinates, package names and broke several APIs. Spring Framework is
now up-to-date with those changes and this commit does the same for
Spring Boot.
Note that in that process, the `NettyServerCustomizer` has been changed
since the former `HttpServerOptions.Builder` API is now gone from
Reactor Netty, and we're now relying on immutable server instances
instead of a stateful builder pattern.
See gh-13321
2018-06-04 18:59:17 +02:00
Andy Wilkinson
0f321abe66
Merge branch '2.0.x'
2018-06-04 17:53:50 +01:00
Andy Wilkinson
70c0d6a005
Test the Gradle plugin against Gradle 4.8
...
Closes gh-13359
2018-06-04 17:53:34 +01:00
Andy Wilkinson
00449bef6a
Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts
...
Closes gh-12631
2018-06-04 17:53:34 +01:00
Andy Wilkinson
aee6aecfc2
Merge branch '2.0.x'
2018-06-04 17:06:23 +01:00
Andy Wilkinson
624946a779
Upgrade to Maven Invoker Plugin 3.1.0
...
Closes gh-12687
2018-06-04 17:05:22 +01:00
Stephane Nicoll
93396aef51
Polish
2018-06-04 17:50:29 +02:00
Andy Wilkinson
b38f60a631
Merge branch '2.0.x'
2018-06-04 16:40:06 +01:00
Andy Wilkinson
d54072e0a8
More accurately document buildInfo's effect on up-to-date checking
...
Closes gh-13152
2018-06-04 16:39:59 +01:00
Stephane Nicoll
ee158df993
Merge branch '2.0.x'
2018-06-04 17:36:01 +02:00
Dmytro Nosan
20003489be
Auto-configure jOOQ with TransactionListenerProvider
...
Closes gh-13331
2018-06-04 17:35:40 +02:00
Andy Wilkinson
d0ce919d8c
Merge branch '2.0.x'
2018-06-04 16:30:23 +01:00
Andy Wilkinson
0df37b917b
Ignore unresolvable placeholders during property binding
...
Closes gh-13122
2018-06-04 16:27:30 +01:00
Andy Wilkinson
9c8d2c8016
Improve analysis of bind failures caused by a conversion failure
...
Closes gh-13357
2018-06-04 16:26:43 +01:00
Andy Wilkinson
92629ac5af
Merge branch '2.0.x'
2018-06-04 15:43:58 +01:00
Andy Wilkinson
ea51cfabca
Avoid uri tag explosion when use of path variable is undetected
...
Previously, WebMvcTags would fall back to using the request’s path
info if Spring MVC’s best matching path pattern attribute was not
available. For non-Spring MVC web frameworks that support path
variables, such as Jersey, this led to an explosion of URI tags that
could exhaust the heap.
Closes gh-12447
2018-06-04 15:43:48 +01:00
Stephane Nicoll
4a6102091e
Merge branch '2.0.x'
2018-06-04 15:24:18 +02:00
Stephane Nicoll
bc59434bcc
Start building against Spring Framework 5.0.7 snapshots
...
See gh-13353
2018-06-04 15:21:46 +02:00
Stephane Nicoll
99f0270fce
Merge branch '2.0.x'
2018-06-04 14:15:08 +02:00
Stephane Nicoll
a9b2826c26
Merge branch '1.5.x' into 2.0.x
2018-06-04 14:14:52 +02:00
Stephane Nicoll
8bcea0d8cc
Polish "Add auto-configuration for WebServiceTemplate"
...
Closes gh-1270
2018-06-04 12:27:29 +02:00
Stephane Nicoll
ef9c1a8e35
Extract ClientHttpRequestFactory detection to its own class
...
See gh-12707
2018-06-04 11:12:02 +02:00
dnosan
c9df1c551a
Add auto-configuration for WebServiceTemplate
...
See gh-12707
2018-06-04 11:12:02 +02:00
Stephane Nicoll
283ceaa071
Merge branch '2.0.x'
2018-06-04 10:32:21 +02:00
dreis2211
8bb7b8af51
Remove usage of deprecated Matchers class
...
Closes gh-13345
2018-06-04 10:31:25 +02:00
Stephane Nicoll
d924c89525
Merge branch '2.0.x'
2018-06-03 16:57:34 +02:00
dreis2211
29605bacd2
Polish stream creation in some PropertySources
...
Closes gh-13343
2018-06-03 16:56:51 +02:00
Madhura Bhave
37a7457f36
Polish
2018-06-01 15:02:46 -07:00
Madhura Bhave
458d574d1f
Merge branch '2.0.x'
2018-06-01 14:59:27 -07:00
Madhura Bhave
95174a0773
Don't fail if aggregate merge can't get existing value
...
Fixes gh-13303
2018-06-01 14:52:55 -07:00
Madhura Bhave
8ce13c765b
Support binding to immutable maps
...
Closes gh-13323
2018-06-01 14:52:55 -07:00
Andy Wilkinson
78b1a37d7d
Merge branch '2.0.x'
2018-06-01 17:58:03 +01:00
Andy Wilkinson
68cd27c47b
Do not require DataSourcePoolMetrics to auto-configure Hikari meters
...
Closes gh-13330
2018-06-01 17:55:43 +01:00
Andy Wilkinson
e306aad28c
Merge branch '2.0.x'
2018-06-01 17:27:10 +01:00
Andy Wilkinson
27267a7090
Ensure that condition evaluator uses runner’s class loader
...
Closes gh-13319
2018-06-01 17:26:32 +01:00
Vedran Pavic
205b1c1327
Upgrade to Hazelcast 3.10.1
...
Closes gh-13322
2018-06-01 09:30:42 +02:00
Johnny Lim
5d5a14e4f7
Make MetricsProperties fields final if possible
...
Closes gh-13324
2018-06-01 09:29:34 +02:00
Stephane Nicoll
77dcbdb1e5
Polish
...
See gh-13320
2018-06-01 09:28:55 +02:00
Stephane Nicoll
bc47bf44a9
Merge branch '2.0.x'
2018-06-01 09:26:29 +02:00
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
Madhura Bhave
817c228906
Merge branch '2.0.x'
2018-05-31 16:53:51 -07:00
Madhura Bhave
0afd947350
BindFailureAnalyzer should show original failure message
...
Fixes gh-13122
2018-05-31 16:51:42 -07:00
Stephane Nicoll
58d634f498
Merge branch '2.0.x'
2018-05-31 21:05:16 +02:00
Stephane Nicoll
fa21333e4d
Upgrade to Spring Cloud Connectors 2.0.2.RELEASE
...
Closes gh-13318
2018-05-31 21:04:02 +02:00
Stephane Nicoll
5790a26bcb
Merge branch '2.0.x'
2018-05-31 17:36:10 +02:00
Stephane Nicoll
20e349c332
Polish
2018-05-31 17:35:56 +02:00
Stephane Nicoll
fec75c42fa
Move unused property in code to metadata
2018-05-31 17:07:42 +02:00
Stephane Nicoll
74379da726
Merge branch '2.0.x'
2018-05-31 16:39:11 +02:00
Stephane Nicoll
32aa5b9bae
Merge branch '1.5.x' into 2.0.x
2018-05-31 16:38:23 +02:00
Andy Wilkinson
cff5c1ec72
Merge branch '2.0.x'
2018-05-31 13:42:23 +01:00
Andy Wilkinson
0d7d95d8a9
Align RestTemplateBuilder with Framework's removal of OkHttp 2 support
...
Closes gh-13314
2018-05-31 13:41:43 +01:00
Stephane Nicoll
55d70d5691
Merge branch '2.0.x'
2018-05-31 10:41:01 +02:00
James McShane
d74c768cdd
Remove outdated reference to @EnableReactor
...
Closes gh-13308
2018-05-31 10:39:44 +02:00
Phillip Webb
92b9b234f1
Merge branch '2.0.x'
2018-05-30 22:53:33 -07:00
Phillip Webb
3751968ecd
Add missing ExpectedException rule
...
Add ExpectedException rule which was missed from the 1.5.x merge.
2018-05-30 22:52:25 -07:00
Phillip Webb
840948c6c9
Polish
2018-05-30 21:02:57 -07:00
Phillip Webb
3fb79194a0
Merge branch '2.0.x'
2018-05-30 21:02:07 -07:00
Phillip Webb
f8ec2e6176
Polish
2018-05-30 21:01:31 -07:00
Phillip Webb
cf27917e86
Merge branch '2.0.x'
2018-05-30 20:30:38 -07:00
Phillip Webb
bdd541b2cc
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:29:03 -07:00
Phillip Webb
5ae061f491
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:27:19 -07:00
Madhura Bhave
9f4a5c13a5
Add auto-config for WebFlux OAuth2 Login
...
Closes gh-13142
2018-05-30 18:53:11 -07:00
Phillip Webb
792f0b190d
Merge branch '2.0.x'
2018-05-30 14:08:42 -07:00
Phillip Webb
2c6465abdc
Merge branch '1.5.x' into 2.0.x
2018-05-30 14:08:15 -07:00
Phillip Webb
353560278b
Merge branch '2.0.x'
2018-05-30 13:29:41 -07:00
Phillip Webb
401fcbeaa4
Merge branch '1.5.x' into 2.0.x
2018-05-30 13:29:10 -07:00
Phillip Webb
40800355c7
Merge branch '2.0.x'
2018-05-30 12:41:48 -07:00
Phillip Webb
587df6a07a
Port call setHttpOnly property on Tomcat context
...
Port "setHttpOnly on the TomcatContext" fix from commit 4d84933ee4
to
2.0.x. Since `Session` details are now configured on the
`WebServerFactory` we can directly configure the context.
See gh-12580
2018-05-30 12:23:40 -07:00
Phillip Webb
e38d5f910b
Merge branch '1.5.x' into 2.0.x
2018-05-30 12:18:38 -07:00
Phillip Webb
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
Stephane Nicoll
463e11ab2b
Merge branch '2.0.x'
2018-05-30 17:49:53 +02:00
Johnny Lim
4eb070767c
Remove an unnecessary @QuartzDataSource
...
Closes gh-13302
2018-05-30 17:49:21 +02:00
Stephane Nicoll
f06627c408
Allow CompositeHealthIndicator to be created with a Map as before
...
See gh-4965
2018-05-30 16:09:07 +02:00
Stephane Nicoll
bb69339a82
Merge branch '2.0.x'
2018-05-30 15:28:15 +02:00
Stephane Nicoll
b47a72731f
Merge branch '1.5.x' into 2.0.x
2018-05-30 15:27:58 +02:00
Stephane Nicoll
bd9299dbf9
Add missing metadata for renamed SSL properties
...
Closes gh-13239
2018-05-30 14:24:07 +02:00
Andy Wilkinson
35c48bb9bd
Polish
2018-05-30 10:28:52 +01:00
Andy Wilkinson
48a6abe217
Polish
2018-05-30 10:19:06 +01:00
Madhura Bhave
ed08e4592f
Merge branch '2.0.x'
2018-05-29 15:15:02 -07:00
Madhura Bhave
ad1283195a
Fix test in "Truststore password if SSLstoreprovider present"
...
See gh-13088
2018-05-29 15:06:39 -07:00
Ian Chan
e75d45ca45
Use empty trust-store password if SSL store provider present
...
For Tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the trust-store with an
empty password. Previously, if a password was supplied using the
ssl.trust-store-password property, that would be the password used to
load the trust-store and the connector would warn with "Password
verification failed" message.
Fixes gh-12688
2018-05-29 15:02:30 -07:00
Stephane Nicoll
3f001899b4
Harmonize ssl properties for Kafka
...
Closes gh-13239
2018-05-29 17:51:01 +02:00
Stephane Nicoll
56dd53bfba
Merge branch '2.0.x'
2018-05-29 17:28:34 +02:00
Stephane Nicoll
7849d73828
Polish
...
See gh-13031
2018-05-29 17:28:16 +02:00
Stephane Nicoll
c8f57acca6
Merge branch '2.0.x'
2018-05-29 16:03:00 +02:00
Stephane Nicoll
faa9910e46
Enable cache when a SecurityContext parameter is used
...
This commit restores caching for the main read operation when the
SecurityContext does not expose a principal (i.e. guest access).
Closes gh-13238
2018-05-29 15:56:22 +02:00
Andy Wilkinson
32a9addb57
Merge branch '2.0.x'
2018-05-29 13:59:37 +01:00
Andy Wilkinson
1ce22aa50a
Polish
2018-05-29 13:58:40 +01:00
Stephane Nicoll
39861bf819
Merge branch '2.0.x'
2018-05-29 14:18:26 +02:00
Stephane Nicoll
4259817572
Fix extension discovery when endpoint instance is sub-classed
...
This commit fixes endpoint extension discovery when the related endpoint
is sub-classed. Previously, a strict by type check was applied against
the `endpoint` attribute of `EndpointExtension`.
Rather than using a `Class` check, this commit extracts the id of an
endpoint and uses it to match its extension, if any.
Closes gh-13082
2018-05-29 14:12:23 +02:00
Stephane Nicoll
52b80c77d8
Merge branch '2.0.x'
2018-05-29 10:39:39 +02:00
nkjackzhang
17bcd1c359
Fix wrong reference in cast operation
...
Closes gh-13288
2018-05-29 10:37:32 +02:00
Stephane Nicoll
3bbdeee70b
Merge branch '2.0.x'
2018-05-29 09:33:03 +02:00
Johnny Lim
bd2053aa17
Use more Tag constants
...
Closes gh-13286
2018-05-29 09:32:26 +02:00
Stephane Nicoll
188ba14c17
Merge branch '2.0.x'
2018-05-29 09:22:15 +02:00
Johnny Lim
9de2a8786d
Fix a wrong issue reference
...
Closes gh-13284
2018-05-29 09:21:41 +02:00
Stephane Nicoll
e2c14c590a
Merge branch '2.0.x'
2018-05-29 09:04:31 +02:00
dreis2211
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
2018-05-29 09:04:00 +02:00
Stephane Nicoll
6814b7f240
Merge branch '2.0.x'
2018-05-28 14:29:00 +02:00
Stephane Nicoll
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
2018-05-28 14:28:45 +02:00
Stephane Nicoll
ec65cb1753
Merge branch '2.0.x'
2018-05-28 10:52:42 +02:00
Stephane Nicoll
15ba50ab3e
Merge branch '1.5.x' into 2.0.x
2018-05-28 10:52:21 +02:00
Johnny Lim
de01e7aad4
Polish
...
See gh-13243
2018-05-28 09:46:40 +02:00
Stephane Nicoll
f91b53747a
Merge branch '2.0.x'
2018-05-28 09:41:41 +02:00
Johnny Lim
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
Stephane Nicoll
7462401291
Merge branch '2.0.x'
2018-05-28 09:28:30 +02:00
Eddú Meléndez
065eebfb4b
Fix javadoc
...
Closes gh-13274
2018-05-28 09:26:16 +02:00
Stephane Nicoll
be9a0ef65d
Merge branch '2.0.x'
2018-05-27 18:04:38 +02:00
hengyunabc
b75e58b70f
Add enforce-rule to ensure maven version >= 3.5.0
...
Closes gh-13271
2018-05-27 18:03:52 +02:00
Phillip Webb
3739699d79
Merge branch '2.0.x'
2018-05-26 08:44:13 -07:00
Phillip Webb
dba73d76b8
Merge branch '1.5.x' into 2.0.x
2018-05-26 08:43:27 -07:00
Stephane Nicoll
1bb53ff44c
Merge branch '2.0.x'
2018-05-26 12:44:50 +02:00
Arnaud Heritier
b60eadb10b
Add missing semicolon in example
...
Closes gh-13266
2018-05-26 12:44:11 +02:00
Phillip Webb
68ffbafbae
Fix checkstyle violations
2018-05-26 00:01:45 -07:00
Phillip Webb
3702da4573
Formatting
2018-05-25 23:52:38 -07:00
Phillip Webb
2215709165
Merge branch '2.0.x'
2018-05-25 23:50:39 -07:00
Phillip Webb
6f0ccc64a5
Fix checkstyle violations
2018-05-25 23:03:17 -07:00
Phillip Webb
9fd3b9103a
Format code
2018-05-25 23:02:45 -07:00
Phillip Webb
e544922dd7
Merge branch '1.5.x' into 2.0.x
2018-05-25 23:02:08 -07:00
Phillip Webb
5626b7a50d
Merge branch '2.0.x'
2018-05-25 20:58:31 -07:00
Phillip Webb
9c5f207e22
Fix merge error
2018-05-25 20:57:46 -07:00
Phillip Webb
d8157c94f3
Merge branch '2.0.x'
2018-05-25 19:48:37 -07:00
Phillip Webb
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
Stephane Nicoll
75c10e615e
Merge branch '2.0.x'
2018-05-25 16:45:57 +02:00
Andrea Vacondio
aed118c410
Fix documentation error
...
Closes gh-13260
2018-05-25 16:43:35 +02:00
Madhura Bhave
940c3d1b75
Merge branch '2.0.x'
2018-05-25 10:39:22 +02:00
Madhura Bhave
552878c431
Fix javadoc
2018-05-25 10:37:39 +02:00
Stephane Nicoll
79967a482a
Merge branch '2.0.x'
2018-05-24 11:44:10 +02:00
Stephane Nicoll
a5b53b263e
Merge branch '1.5.x' into 2.0.x
2018-05-24 11:43:48 +02:00
Stephane Nicoll
4464a5f5bd
Remove code deprecated in 2.0
...
Closes gh-12962
2018-05-22 14:48:25 +02:00
Stephane Nicoll
1ea3e95ff6
Merge branch '2.0.x'
2018-05-22 13:40:51 +02:00
Stephane Nicoll
585135a280
Polish
2018-05-22 13:40:40 +02:00
Stephane Nicoll
d5abd57a91
Remove deprecated use of spring.main.web-environment
...
Closes gh-13231
2018-05-22 13:39:02 +02:00
Stephane Nicoll
12bbb18844
Merge branch '2.0.x'
2018-05-22 12:51:31 +02:00
Stephane Nicoll
a124379dd9
Remove use of deprecated `web` methods
...
Closes gh-13231
2018-05-22 12:51:06 +02:00
Stephane Nicoll
699b6ce6dc
Remove reference to Jersey 1
...
Closes gh-12582
2018-05-22 10:50:27 +02:00
Phillip Webb
c5f63c19a4
Merge branch '2.0.x'
2018-05-21 21:38:32 -07:00
Phillip Webb
2dc4f1df00
Polish
2018-05-21 21:32:42 -07:00
Phillip Webb
40e68a6427
Merge branch '2.0.x'
2018-05-21 17:20:04 -07:00
Phillip Webb
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
Johnny Lim
d72ba70cba
Use type parameter for Supplier in AggregateBinder.merge()
...
Closes gh-13139
2018-05-18 14:35:16 +02:00
Stephane Nicoll
243023f2ad
Merge branch '2.0.x'
2018-05-18 14:26:31 +02:00
Stephane Nicoll
300f6bf4d7
Polish contribution
...
Closes gh-13208
2018-05-18 14:20:31 +02:00
Mihhail Lapushkin
d31dbac69e
Support custom UriTemplateHandler in LocalHostUriTemplateHandler
...
See gh-13208
2018-05-18 14:19:01 +02:00
Stephane Nicoll
27c60e3deb
Merge branch '2.0.x'
2018-05-18 13:42:57 +02:00
Stephane Nicoll
48cf025093
Polish
2018-05-18 13:42:45 +02:00
Stephane Nicoll
d35d221b5c
Merge branch '2.0.x'
2018-05-18 11:54:43 +02:00
Stephane Nicoll
6893be5479
Make sure that RabbitMQ metrics are configured early
...
The ConnectionFactory can be used early in user configuration to
configure an `Exchange`. Such connection may not hold the proper
MetricCollector and can be cached, leading to missed metrics
information.
This commit moves the configuration of RabbitMQ metrics to a
BeanPostProcessor so that the proper MetricCollector is configured
before any connection is created.
Closes gh-12855
2018-05-18 11:54:11 +02:00
Stephane Nicoll
8364d121b1
Merge branch '2.0.x'
2018-05-17 16:18:17 +02:00
Stephane Nicoll
125b5974c0
Merge branch '1.5.x' into 2.0.x
2018-05-17 16:17:55 +02:00
Johnny Lim
b7fe3a5332
Make ErrorProperties.whitelabel final
...
Closes gh-13197
2018-05-17 15:31:51 +02:00
Stephane Nicoll
afe6abb20d
Merge branch '2.0.x'
2018-05-17 15:31:02 +02:00
Johnny Lim
75639aa682
Polish
...
Closes gh-13192
2018-05-17 15:29:50 +02:00
Stephane Nicoll
b51b997b70
Run specific health check
...
This commit improves the `health` endpoint to run health check for a
particular component or, if that component is itself a composite, an
instance of that component.
Concretely, it is now possible to issue a `GET` on
`/actuator/health/{component}` and
`/actuator/health/{component}/instance` to retrieve the health of a
component or an instance of a composite component, respectively.
If details cannot be showed for the current user, any request leads to a
404 and does not invoke the health check at all.
Closes gh-8865
2018-05-17 15:26:38 +02:00
Andy Wilkinson
9f6d3bb21d
Upgrade to Spring Data Lovelace M3
...
Closes gh-13169
2018-05-17 14:08:28 +01:00
Stephane Nicoll
beafba4487
Merge branch '2.0.x'
2018-05-17 09:35:29 +02:00
Stephane Nicoll
1d2edc1d37
Fix wrong reference to WebApplicationType
...
Closes gh-13195
2018-05-17 09:35:07 +02:00
Stephane Nicoll
2c176a3770
Add support for ReactiveHealthIndicatorRegistry
...
This commit updates the initial proposal to add support for reactive
use cases as well. A reactive application can use
ReactiveHealthIndicatorRegistry as an alternative to
HealthIndicatorRegistry.
Closes gh-4965
2018-05-16 17:48:41 +02:00
Stephane Nicoll
95b251590e
Polish "Introduce HealthIndicatorRegistry"
...
See gh-4965
Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
2018-05-16 17:39:20 +02:00
Vedran Pavic
d829d522be
Introduce HealthIndicatorRegistry
...
This commit introduces HealthIndicatorRegistry which handles
registration of HealthIndicator instances. Registering new
HealthIndicator instances is now possible in runtime.
See gh-4965
2018-05-16 13:59:34 +02:00
Stephane Nicoll
ffdcdc0dc6
Merge branch '2.0.x'
2018-05-16 13:17:15 +02:00
Stephane Nicoll
7b7e802129
Merge branch '1.5.x' into 2.0.x
2018-05-16 13:16:54 +02:00
Andy Wilkinson
69aa4913e3
Align tests for OAuth properties adapter with changes in Spring Security
...
Closes gh-13185
2018-05-16 11:30:28 +01:00
Andy Wilkinson
d8f9aad8d4
Upgrade to Spring Security 5.1.0.M1
...
Closes gh-13185
2018-05-16 10:22:28 +01:00
Stephane Nicoll
9ea4fce03e
Merge branch '2.0.x'
2018-05-16 09:29:02 +02:00
Johnny Lim
652bbf4ab2
Polish DefaultErrorWebExceptionHandler.renderErrorView()
...
Closes gh-13174
2018-05-16 09:28:26 +02:00
Andy Wilkinson
38b491018c
Upgrade to Solr 7.2.1
...
Closes gh-13182
2018-05-15 17:22:27 +01:00
Andy Wilkinson
b5185fbe10
Upgrade to Lettuce 5.1.0.M1
...
Closes gh-13181
2018-05-15 17:22:26 +01:00
Andy Wilkinson
148997fd43
Upgrade to Elasticsearch 6.2.4
...
Closes gh-13178
2018-05-15 17:11:28 +01:00
Andy Wilkinson
795ff45a65
Upgrade to Cassandra Java Driver 3.5.0
...
Closes gh-13177
2018-05-15 16:57:51 +01:00
Andy Wilkinson
150a19523c
Start building against Spring Data Lovelace M3 snapshots
...
See gh-13169
2018-05-15 16:57:51 +01:00
Andy Wilkinson
33fadda4d9
Upgrade to Mongo Driver Reactive Streams 1.9.0-beta1
...
Closes gh-13180
2018-05-15 16:57:50 +01:00
Andy Wilkinson
3dfacaa1e3
Upgrade to MongoDB 3.8.0-beta2
...
Closes gh-13179
2018-05-15 16:57:50 +01:00
Stephane Nicoll
e5ac3bc391
Merge branch '2.0.x'
2018-05-15 15:10:04 +02:00
Johnny Lim
b9aa934d78
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
...
Closes gh-13171
2018-05-15 15:09:35 +02:00
Stephane Nicoll
ed02d02d19
Polish "Allow repackage maven goal to take a source classifier"
...
Closes gh-11061
2018-05-15 15:02:22 +02:00
Björn
3c8e012411
Allow repackage maven goal to take a source classifier
...
Previously, the "classifier" attribute was only used to determine the
target classifier of the repackaged archive, always using the main
artifact as the source.
This commit changes the semantic of the attribute so that an existing
archive matching the "classifier" attribute can be used as source,
replacing the archive the same way the goal replaces the main archive
if no classifier is found.
If no artifact with the specified classifier exists, the repackaged
archive is still processed based on the main archive and attached to
the lifecycle using the value of the classifier attribute.
See gh-11061
2018-05-15 15:02:22 +02:00
Andy Wilkinson
08a12e7964
Merge branch '2.0.x'
2018-05-15 10:28:56 +01:00
Andy Wilkinson
be0b8eb871
Merge branch '1.5.x' into 2.0.x
2018-05-15 10:28:46 +01:00
Andy Wilkinson
72b45584eb
Merge branch '2.0.x'
2018-05-15 09:18:06 +01:00
Andy Wilkinson
8b028e30d3
Merge branch '1.5.x' into 2.0.x
2018-05-15 09:18:01 +01:00
Andy Wilkinson
46855ab8eb
Merge branch '2.0.x'
2018-05-14 20:07:57 +01:00
Andy Wilkinson
73e525a280
Merge branch '1.5.x' into 2.0.x
2018-05-14 20:07:46 +01:00
Andy Wilkinson
16457ad988
Merge branch '2.0.x'
2018-05-14 17:54:50 +01:00
Andy Wilkinson
cddc2b4483
Merge branch '1.5.x' into 2.0.x
2018-05-14 17:54:31 +01:00
Stephane Nicoll
497aebe010
Merge branch '2.0.x'
2018-05-14 18:21:33 +02:00
Stephane Nicoll
a3a6a2b291
Polish "Add CLI manifest for Scoop"
...
Closes gh-12541
2018-05-14 18:20:57 +02:00
Andrey Saksonov
daccdbb18d
Add CLI manifest for Scoop
...
See gh-12541
2018-05-14 18:00:32 +02:00
Stephane Nicoll
24024b00da
Merge branch '2.0.x'
2018-05-14 17:42:15 +02:00
Stephane Nicoll
2be1c8f527
Polish "Set classloader for JMX endpoints to application classloader"
...
Closes gh-12209
2018-05-14 17:41:47 +02:00
David Herberth
e44c81672f
Set classloader for JMX endpoints to application classloader
...
See gh-12209
2018-05-14 17:41:31 +02:00
Frank Pavageau
ab7f6654d8
Manage the Mockito/JUnit 5 dependency
...
This requires an updated Mockito dependency as well, since it was
introduced in Mockito 2.17.0 but really works starting with 2.18.0.
Closes gh-12890
2018-05-14 16:21:23 +02:00
Stephane Nicoll
c7eec5c45e
Polish "Add liquibase test rollback on update property"
...
Closes gh-13159
2018-05-14 16:14:11 +02:00
Vladyslav Kiriushkin
08279c889c
Add liquibase test rollback on update property
...
See gh-13159
2018-05-14 16:06:08 +02:00
Stephane Nicoll
b839c98de9
Merge branch '2.0.x'
2018-05-14 16:04:30 +02:00
Sebastien Deleuze
d747d43b23
Update Kotlin refdoc with the new tutorial
...
Closes gh-13161
2018-05-14 16:03:46 +02:00
Stephane Nicoll
c8dc885cc5
Add missing note
...
See gh-12933
2018-05-14 13:30:40 +02:00
Stephane Nicoll
602f52fffc
Add support for configuring common tags declaratively
...
Closes gh-12933
2018-05-14 13:26:01 +02:00
Andy Wilkinson
8e4f4317f6
Merge branch '2.0.x'
2018-05-14 11:49:08 +01:00
Andy Wilkinson
285203d272
Provide dependency management for Hibernate's JPA API module
...
Closes gh-13154
2018-05-14 11:43:31 +01:00
Stephane Nicoll
93c45cb6ec
Move server.servlet.path to spring.mvc.servlet.path
...
Closes gh-12971
2018-05-14 12:24:38 +02:00
Stephane Nicoll
406192741e
Upgrade to Maven Exec Plugin 1.6.0
...
Closes gh-13101
2018-05-14 11:19:46 +02:00
Stephane Nicoll
37324785fc
Merge branch '2.0.x'
2018-05-14 11:09:15 +02:00
Stephane Nicoll
caa271dcc1
Merge branch '1.5.x' into 2.0.x
2018-05-14 11:08:59 +02:00
Stephane Nicoll
9b379b43ae
Merge branch '2.0.x'
2018-05-14 09:33:16 +02:00
Stephane Nicoll
8f53c2e2bb
Support for custom comment prefix
...
Some Quartz initialization scripts have comments in a different format.
This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.
Closes gh-13041
2018-05-14 09:32:42 +02:00
Johnny Lim
fb2ab67f4f
Polish
...
Closes gh-13148
2018-05-14 08:24:01 +02:00
Stephane Nicoll
b17c58b114
Merge branch '2.0.x'
2018-05-14 08:23:36 +02:00
Johnny Lim
3dd2f5bb05
Polish
...
See gh-13148
2018-05-14 08:19:10 +02:00
Stephane Nicoll
15edd02e1d
Merge branch '2.0.x'
2018-05-14 08:13:40 +02:00
Johnny Lim
aa60d60b8a
Polish JpaProperties.determineDdlAuto()
...
Closes gh-13036
2018-05-14 08:13:06 +02:00
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
Madhura Bhave
5d949cc736
Merge branch '2.0.x'
2018-04-18 10:48:22 -07:00
Madhura Bhave
35af166750
Fix tests
...
See gh-11380
2018-04-18 10:47:37 -07:00
Madhura Bhave
a8707c520c
Merge branch '2.0.x'
2018-04-18 10:28:44 -07:00
Madhura Bhave
cab9bff4f4
Log included profiles according to the processing order
...
This commit includes some refactoring of active profiles
processing. Previously, there was a LIFO Queue for adding active
profiles. Profiles that were added last, were processed first.
Because of this reverse ordering, profiles were prepended to the
environment to preserve the order in which they were logged.
This however didn't work for "included" profiles as they were
prepended to the environment even though they were processed after
the active profile. In this commit, profiles are processed in a FIFO manner
and processed as they're found.
Fixes gh-11380
2018-04-18 10:03:12 -07:00
Stephane Nicoll
e72306b33e
Merge branch '2.0.x'
2018-04-18 09:50:09 +02:00
Stephane Nicoll
026d8bed5f
Fix additional missing semicolon on sample code
...
Closes gh-12895
2018-04-18 09:49:15 +02:00
Jienan Duan
90ae14ec21
Add missing semicolon on sample code
...
See gh-12895
2018-04-18 09:47:54 +02:00
Stephane Nicoll
c7645604a6
Merge branch '2.0.x'
2018-04-18 09:42:08 +02:00
Stephane Nicoll
2b98b11c12
Polish "Less object instantiation in WebMvcTags"
...
Closes gh-12894
2018-04-18 09:41:40 +02:00
Jon Schneider
d676147680
Less object instantiation in WebMvcTags
...
See gh-12894
2018-04-18 09:38:23 +02:00
Stephane Nicoll
c43eb89823
Make sure that finalName is read only
...
Closes gh-12608
2018-04-17 17:53:18 +02:00
Stephane Nicoll
b2f34f5c20
Remove spring.provides
...
Closes gh-12435
2018-04-17 17:46:43 +02:00
Stephane Nicoll
a85998f4c3
Polish "Add auto-configuration for Hibernate metrics"
...
Closes gh-12550
2018-04-17 13:46:27 +02:00
Rui Figueira
b6b92ba937
Add auto-configuration for Hibernate metrics
...
All Hibernate entityManagerFactories are automatically instrumented
and their statistics are included into Micrometer using its
HibernateMetrics binder.
Closes gh-12550
2018-04-17 13:23:18 +02:00
Stephane Nicoll
3cb2246e7a
Merge branch '2.0.x'
2018-04-16 11:33:59 +02:00
Stephane Nicoll
0bc7bef5e5
Properly handle InvalidEndpointRequestException
...
This commit makes sure that `InvalidEndpointRequestException` is wrapped
in a `ReflectionException` when invoked via JMX.
Closes gh-12857
2018-04-16 11:33:22 +02:00
Stephane Nicoll
f139dc3608
Merge branch '2.0.x'
2018-04-16 08:43:57 +02:00
Stephane Nicoll
2002115637
Add doc ref for hierarchical name mapping
2018-04-16 08:43:46 +02:00
Stephane Nicoll
12541d7efc
Merge branch '2.0.x'
2018-04-16 08:16:30 +02:00
Stephane Nicoll
1c0f589c01
Simplify Joinfaces community starter entry
...
See gh-12867
2018-04-16 08:16:18 +02:00
Stephane Nicoll
0fd743cdb1
Merge branch '2.0.x'
2018-04-16 08:10:17 +02:00
dreis2211
2bbf438c36
Fix duplicate words in comments
...
Closes gh-12866
2018-04-16 08:09:40 +02:00
Stephane Nicoll
1583d342cc
Merge branch '2.0.x'
2018-04-13 16:40:27 +02:00
Stephane Nicoll
bfe31e6688
Fix broken build
2018-04-13 16:40:15 +02:00
Stephane Nicoll
d0b2b9b1a5
Merge branch '2.0.x'
2018-04-13 16:29:44 +02:00
Stephane Nicoll
fa542bacc0
Translate user-defined exception when invoking JMX operation
...
This commit makes sure to respect the MBeanServer#invoke contract by
wrapping any user-defined exception in an MBeanException. Also, any
exception not from the JDK is translated, as it may lead to unexpected
issue on the client if that class isn't present. This is consistent
with our operation result mapping strategy.
Closes gh-10448
2018-04-13 16:26:04 +02:00
Stephane Nicoll
fb60716e1b
Merge branch '2.0.x'
2018-04-13 15:19:06 +02:00
Stephane Nicoll
2204d5f750
Polish
2018-04-13 15:18:42 +02:00
Stephane Nicoll
31441a7590
Add a note to explain how to disable the web server
...
See gh-12853
2018-04-13 15:18:08 +02:00
Stephane Nicoll
2fd5cebe31
Merge branch '2.0.x'
2018-04-13 14:51:07 +02:00
Stephane Nicoll
7550f92ea5
Clarify DataSource metrics section for custom DataSources
...
Closes gh-12851
2018-04-13 14:50:44 +02:00
Brian Clozel
02b0b6ff9c
Merge branch '2.0.x'
2018-04-13 11:50:03 +02:00
Brian Clozel
29a719dfb3
Upgrade to Undertow 1.4.24.Final
...
This commit also updates tests since UNDERTOW-1260 has been fixed in
this release.
Closes gh-12852
2018-04-13 11:48:09 +02:00
Brian Clozel
33c7401e10
Merge branch '2.0.x'
2018-04-12 22:52:51 +02:00
Brian Clozel
b2e7be17ab
Polish gh-11514
...
As pointed out by Rossen in gh-11514 comments, a handler might commit
the response and then send an error signal in the pipeline. In this
case, adding a callback to `beforeCommit` is useless because it won't be
triggered. In those cases, we need to collect metrics right away.
2018-04-12 22:50:16 +02:00
Madhura Bhave
20acd2a89b
Merge branch '2.0.x'
2018-04-12 10:33:11 -07:00
Madhura Bhave
9c7612e681
Fix NPE in WaitStrategy used for test containers
2018-04-12 10:30:36 -07:00
Brian Clozel
5e1d0d7bdd
Merge branch '2.0.x'
2018-04-12 18:02:04 +02:00
Brian Clozel
b7695fabab
Switch to Reactor Bismuth SNAPSHOTs
2018-04-12 18:01:33 +02:00
Vedran Pavic
7b9c5a3dc3
Use Jersey BOM in dependency management
...
Closes gh-12847
2018-04-12 15:58:32 +02:00
Vedran Pavic
ec4f054497
Upgrade to Jersey 2.27
...
Closes gh-12847
2018-04-12 15:56:19 +02:00
Stephane Nicoll
ed19f20ca0
Merge branch '2.0.x'
2018-04-12 15:48:57 +02:00
Stephane Nicoll
38bd4bd58c
Stop associating an Executor bean to Quartz
...
This commits make sure that the Quartz auto-configuration no longer
associates an `Executor` bean if present in the context as Quartz offers
properties to tune it, which would mutate and lead to unexpected
results.
Closes gh-12823
2018-04-12 15:48:20 +02:00
Stephane Nicoll
e4e56bbcc3
Migrate to ApplicationContextRunner
2018-04-12 15:48:20 +02:00
Brian Clozel
70826f5478
Merge branch '2.0.x'
2018-04-12 14:51:34 +02:00
Brian Clozel
3fa8fe85af
Deprecate RouterFunctionMetrics
...
Spring Boot now deploys both annotation-based and functional endpoints
under the same `HttpHandler`; this means the currently auto-configured
`MetricsWebFilter` is instrumenting all endpoints to produce metrics.
There is no need for a WebFlux functional specific support.
This commit removes mentions of `RouterFunctionMetrics` in the docs and
deprecates that class.
Closes gh-12833
2018-04-12 12:08:44 +02:00
Brian Clozel
efd4245785
Merge branch '2.0.x'
2018-04-12 11:44:45 +02:00
Brian Clozel
77be10e7bc
Fix "status" metrics tag for error responses
...
Prior to this commit, the metrics `WebFilter` would handle exceptions
flowing through the pipeline and extract tag information right away.
Since error handling turns the exception information into error HTTP
responses later in the chain, the information extracted from the
response earlier is invalid.
In this case, the "status" information could be "200" whereas error
handlers would later set that status to "500".
This commit delays the tags extraction later in the process, right
before the response is comitted. The happy path is not changed, as
handlers signal that the response is fully taken care of at that point.
Fixes gh-11514
2018-04-12 11:30:43 +02:00
Stephane Nicoll
7198b038aa
Merge branch '2.0.x'
2018-04-12 09:44:49 +02:00
DK Lee
1f91ae541f
Fix WebClient example constructor name
...
Closes gh-12842
2018-04-12 09:44:03 +02:00
Madhura Bhave
d27ad41a88
Merge branch '2.0.x'
2018-04-11 10:42:22 -07:00
Madhura Bhave
4fab679829
Upgrade testcontainers to 1.7.0
...
Closes gh-12821
2018-04-11 10:40:54 -07:00
Stephane Nicoll
8944fa503b
Upgrade to AspectJ 1.9.0
...
Closes gh-12834
2018-04-11 18:28:10 +02:00
Stephane Nicoll
f55753c1dc
Add reference to Axon Framework
2018-04-11 17:43:33 +02:00
Stephane Nicoll
5cba7400e1
Add reference to Flowable
2018-04-11 11:53:33 +02:00
Stephane Nicoll
3c169b4e0a
Fix bean name of EnvironmentEndpointWebExtension
...
Closes gh-12827
2018-04-11 11:34:44 +02:00
Ken Kwon
16ad34aa19
Fix typo
...
Closes gh-12825
2018-04-11 10:51:20 +02:00
Stephane Nicoll
e8fac7d9c4
Properly discover endpoints that are proxied
...
Previously to this commit, if a `@ControllerEndpoint`,
`@RestControllerEndpoint` or `@ServletEndpoint` annotated bean was
proxied, the endpoint wasn't properly detected.
This commit makes sure that annotation retrieval works on the user class
while preserving the get (vs. find) retrieval semantic
Closes gh-12441
2018-04-10 20:23:55 +02:00
Stephane Nicoll
86b96254a1
Migrate to ApplicationContextRunner
2018-04-10 20:23:54 +02:00
Stephane Nicoll
f83934e192
Polish contribution
...
Closes gh-12812
2018-04-10 11:46:16 +02:00
Johnny Lim
f03849d502
Polish
...
See gh-12812
2018-04-10 11:46:16 +02:00
Andy Wilkinson
4fbe0b1283
Add dependency management for Kafka
...
Closes gh-12815
2018-04-10 09:07:19 +01:00
Phillip Webb
ba85cefce3
Polish
2018-04-09 14:50:03 -07:00
Andy Wilkinson
8d5b9f37d5
Merge branch '1.5.x'
2018-04-09 17:59:53 +01:00
Andy Wilkinson
8b1a101cb6
Merge branch '1.5.x'
2018-04-09 17:39:26 +01:00
Stephane Nicoll
6692301d51
Polish "Replace Couchbase's deprecated methods"
...
Closes gh-12655
2018-04-09 16:17:46 +02:00
Yulin Qin
3236306e53
Replace Couchbase's deprecated methods
...
See gh-12655
2018-04-09 13:22:22 +02:00
Stephane Nicoll
92d9479765
Gracefully handle exclusion of DataSourceAutoConfiguration
...
This commit makes sure that an auto-configuration that requires
`DataSourceProperties` will not break if `DataSourceAutoConfiguration`
has been explicitly excluded.
Closes gh-12512
2018-04-09 10:34:23 +02:00
Madhura Bhave
2f5ab50367
Add @QuartzDataSource for quartz auto-configuration
...
Closes gh-12755
2018-04-05 16:49:04 -07:00
Andy Wilkinson
c3bf8541d7
Do not rely on findAvailableTcpPort finding an available port
...
Closes gh-12779
2018-04-05 11:35:58 +01:00
Jichun Liu
34986ed12f
Add docker-api starter to 3rd party list
...
See https://github.com/jliu666/docker-api-spring-boot
Closes gh-12605
2018-04-05 11:12:29 +02:00
Andy Wilkinson
f335ec00bf
Polish
2018-04-05 09:31:17 +01:00
Andy Wilkinson
71df9c8618
Upgrade to Spring Kafka 2.1.5.RELEASE
...
Closes gh-12775
2018-04-05 07:51:52 +01:00
Andy Wilkinson
b42325f388
Upgrade to Spring Amqp 2.0.3.RELEASE
...
Closes gh-12774
2018-04-05 07:51:51 +01:00
Andy Wilkinson
0c6a09201d
Upgrade to Couchbase Client 2.5.7
...
Closes gh-12773
2018-04-05 07:51:50 +01:00
Andy Wilkinson
87aef1c379
Merge branch '1.5.x'
2018-04-05 07:50:17 +01:00
Andy Wilkinson
a8bbf7120e
Merge branch '1.5.x'
2018-04-05 07:11:34 +01:00
Phillip Webb
0c98d0e7d3
Polish "Allow validation api without implementation"
...
Closes gh-12669
2018-04-04 21:24:25 -07:00
geo_m
a74dc74ec3
Allow validation api without implementation
...
Allow validation api in the classpath without
a validator, as long as no bean is annotated `@Validated`
See gh-12669
2018-04-04 21:24:20 -07:00
Phillip Webb
41dc70146a
Polish "Prevent warnings when running embedded Artemis"
...
Closes gh-12680
2018-04-04 21:10:35 -07:00
Benjamin Graf
19818b752c
Prevent warnings when running embedded Artemis
...
Configure AddressSettings for DLQ and ExpiryQueue for the embedded
Artemis broker to prevent warnings from being logged.
Closes gh-12680
2018-04-04 21:03:04 -07:00
Phillip Webb
68dc9fed3b
Upgrade to Spring Integration 5.0.4
...
Closes gh-12693
2018-04-04 20:47:51 -07:00
Phillip Webb
ec419fca8b
Upgrade to Spring Security 5.0.4
...
Closes gh-12694
2018-04-04 20:46:36 -07:00
Phillip Webb
0c0b60bfa4
Upgrade to Spring Data Kay SR6
...
Closes gh-12696
2018-04-04 20:43:47 -07:00
Jon Schneider
03158e2fd5
Upgrade to Micrometer 1.0.3
...
Closes gh-12767
2018-04-04 20:42:23 -07:00
Phillip Webb
685babc829
Polish "Use lambdas for map entry iteration where possible"
...
Closes gh-12626
2018-04-04 19:36:18 -07:00
igor-suhorukov
69bc19e0ca
Use lambdas for map entry iteration where possible
...
See gh-12626
2018-04-04 19:36:10 -07:00
Clement Stoquart
276037cd56
Add missing managed JUnit Jupiter dependencies
...
Add managed dependencies for `junit-jupiter-params` and
`junit-vintage-engine`.
Closes gh-12635
2018-04-04 18:12:46 -07:00
dreis2211
cc66de28d0
Populate cache in ConfigFileApplicationListener
...
Fix `ConfigFileApplicationListener` so that the loadDocumentsCache is
populated when documents are loaded.
Closes gh-12732
2018-04-04 18:09:08 -07:00
dreis2211
35b4cd01ab
Polish
2018-04-04 18:08:38 -07:00
Phillip Webb
bc15f9ee9b
Upgrade Maven failsafe plugin to 2.21.0
...
See gh-12721
2018-04-04 18:06:45 -07:00
Stephan Köninger
373f5e7682
Upgrade Maven surefire plugin to 2.21.0
...
Closes gh-12721
2018-04-04 18:05:10 -07:00
Phillip Webb
598e9bb842
Polish
2018-04-04 18:01:25 -07:00
Phillip Webb
ce9ca6ae70
Polish "Apply MeterRegistryCustomizer to composites"
...
Closes gh-12762
2018-04-04 16:00:53 -07:00
Jon Schneider
1fce462944
Apply MeterRegistryCustomizer to composites
...
Update `MeterRegistryConfigurer` to also apply customizers to
composite meter registries. Prior to this commit composites were
skipped due to the incorrect assumption that did not contain
their own state.
Closes gh-12762
2018-04-04 15:58:16 -07:00
Phillip Webb
d49a1024bd
Merge branch '1.5.x'
2018-04-04 15:35:20 -07:00
Phillip Webb
696aedaef8
Merge branch '1.5.x'
2018-04-04 14:51:16 -07:00
Brian Clozel
799e1ba077
Upgrade to Netty 4.1.23.Final
...
Closes gh-12764
2018-04-04 23:07:46 +02:00
Phillip Webb
6fb4fba43a
Merge branch '1.5.x'
2018-04-04 12:17:57 -07:00
Andy Wilkinson
aa27334671
Run deployment tests on JDK 9 and 10 where possible
...
Closes gh-10414
2018-04-04 14:48:58 +01:00
Andy Wilkinson
e44bfbea4a
Merge branch '1.5.x'
2018-04-04 14:15:52 +01:00
Andy Wilkinson
7b39cdd5c4
Merge branch '1.5.x'
2018-04-04 13:49:18 +01:00
Andy Wilkinson
b951397a7c
Upgrade to Spring REST Docs 2.0.1.RELEASE
...
Closes gh-12681
2018-04-04 12:50:37 +01:00
Brian Clozel
f6d16c8b99
Align WebFluxTags uri support on WebMvcTags
...
This commit ensures that `WebFluxTags` not only relies on
`BEST_MATCHING_PATTERN_ATTRIBUTE` or request URI to provide the "uri"
tag information.
To avoid cardinality explosion, HTTP not found and redirects are
assigned fixed uri tags.
Closes gh-12685
2018-04-04 11:46:10 +02:00
Stephane Nicoll
ad6a888e47
Polish
2018-04-04 11:29:37 +02:00
Stephane Nicoll
f99752283f
Fix relaxed binding examples
...
Closes gh-12750
2018-04-04 11:29:18 +02:00
Stephane Nicoll
bf06854218
Merge branch '1.5.x'
2018-04-04 11:24:20 +02:00
Madhura Bhave
30e3cf4c01
Make sure property mapping exception are swallowed
2018-04-03 16:12:24 -07:00
Madhura Bhave
e5f8078749
Support dots in System environment properties
...
Fixes gh-12728
2018-04-03 14:37:06 -07:00
Stephane Nicoll
d14cd2cbae
Upgrade to Spring Framework 5.0.5.RELEASE
...
Closes gh-12340
2018-04-03 23:00:25 +02:00
Stephane Nicoll
f424297fef
Upgrade to Reactor Bismuth SR8
...
Closes gh-12698
2018-04-03 22:59:43 +02:00
Andy Wilkinson
195a66f009
Upgrade to Hibernate Validator 6.0.9.Final
...
Closes gh-12746
2018-04-03 16:05:11 +01:00
Andy Wilkinson
d5caddf4ca
Upgrade to Rxjava 1.3.8
...
Closes gh-12745
2018-04-03 16:05:10 +01:00
Andy Wilkinson
16f5f8d53c
Upgrade to Lettuce 5.0.3.RELEASE
...
Closes gh-12744
2018-04-03 16:05:09 +01:00
Andy Wilkinson
e20fcf0e17
Merge branch '1.5.x'
2018-04-03 16:01:29 +01:00
Rui Figueira
958aa5db55
Remove outdated reference to `EnvironmentTestUtils`
...
Documentation still refers to the now deprecated `EnvironmentTestUtils`
class instead of `TestPropertyValues` for setting environment values in
tests.
This commit replaces it with `TestPropertyValues` and provides an
equivalent code example.
Closes gh-12711
2018-04-03 14:10:35 +02:00
Andy Wilkinson
72cf471e83
Merge branch '1.5.x'
2018-04-03 10:55:06 +01:00
Stephane Nicoll
b6f9b46be8
Only create a WebTestClient with WebFlux
...
This commit updates WebTestClientAutoConfiguration to only create a
WebTestClient when running a WebFlux-based application as mocking the
context only works with that mode at the moment.
Closes gh-12318
2018-04-03 11:31:37 +02:00
Stephane Nicoll
7dbeaaa932
Polish "Remove HierarchicalNameMapper as a configured @Bean"
...
Closes gh-12683
2018-04-03 11:23:05 +02:00
Jon Schneider
8572a091b8
Remove HierarchicalNameMapper as a configured @Bean
...
HierarchicalNameMapper is not a component that can be shared amongst
multiple monitoring systems.
See gh-12683
2018-04-03 11:14:43 +02:00
Stephane Nicoll
7c36c00331
Fix default HierarchicalNameMapper implementation for Graphite
...
Closes gh-12557
2018-04-03 10:39:14 +02:00
Johnny Lim
4ab439856c
Remove destroyMethod attribute in @Bean for MeterRegistry
...
Closes gh-12725
2018-04-03 10:14:13 +02:00
Andy Wilkinson
3568019118
Merge branch '1.5.x'
2018-04-03 09:07:38 +01:00
Attila Pápai
95385cecba
Add space between right parentheses and next word
...
Closes gh-12722
2018-04-03 10:05:32 +02:00
Benjamin Graf
101a42c572
Fix outdated import statements
...
Closes gh-12697
2018-04-03 09:58:15 +02:00
Madhura Bhave
8e81f0c23d
Fix conditions report message for same short name
...
If two auto-configuration classes with the same name are present,
the conditions report message now uses the fully qualified name for
both instead of the short name.
Fixes gh-11710
2018-04-02 12:57:28 -07:00
Madhura Bhave
270ee6dd2c
Configure RequestContextFilter in mgmt context
...
Closes gh-12546
2018-04-02 11:16:46 -07:00
Phillip Webb
a657a28f58
Fix properties unicode value decoding
...
Fix a range error when checking for unicode hex chars.
Fixes gh-12716
2018-04-02 10:12:42 -07:00
Phillip Webb
47a56616ae
Merge branch '1.5.x'
2018-04-02 09:51:03 -07:00
Stephane Nicoll
c90806477c
Fix outdated reference to DurationUnit
...
Closes gh-12708
2018-04-02 16:06:03 +02:00
Madhura Bhave
821af30277
Add missing javadoc for Bindable
...
Closes gh-12643
2018-03-30 12:48:15 -07:00
Andy Wilkinson
f108224b22
Start building against Spring Data Kay SR6 snapshots
...
See gh-12696
2018-03-30 08:38:22 +01:00
Andy Wilkinson
24da1dc97e
Start building against Spring Security 5.0.4 snapshots
...
See gh-12694
2018-03-30 08:34:13 +01:00
Andy Wilkinson
29c03da7df
Start building against Spring Integration 5.0.4 snapshots
...
See gh-12693
2018-03-30 08:30:45 +01:00
Phillip Webb
7649eb6230
Allow auto-configure sort with incomplete chain
...
Update `AutoConfigurationSorter` so that all `@AutoConfigureBefore` and
`@AutoConfigureAfter` classes are considered even if they are ultimately
not part of the requested set.
Prior to this commit, given classes ordered with annotations such that
A -> B -> C a call to sort only [A, B] could return the incorrect order.
Fixes gh-12660
2018-03-29 18:00:38 -07:00