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