Stephane Nicoll
bb89012922
Merge branch '2.0.x'
2018-10-05 16:43:30 +02:00
Stephane Nicoll
febaf15b61
Guard WebApplicationType detection in case spring web is not present
...
Closes gh-14589
2018-10-05 16:41:22 +02:00
Andy Wilkinson
4108f4a478
Merge branch '2.0.x'
2018-10-05 15:18:49 +01:00
Andy Wilkinson
8573edc03e
Provide complete dependency management for Micrometer
...
Closes gh-14700
2018-10-05 15:11:54 +01:00
Andy Wilkinson
4d1fc196de
Use Windows-specific custom features so download URI is correct
...
Closes gh-14690
2018-10-05 14:56:07 +01:00
Stephane Nicoll
bdd8e53124
Improve filtering of actuator auto-configurations
...
This commit splits auto-configurations that require different
environments so that they can be filtered early.
Closes gh-12260
2018-10-05 14:57:17 +02:00
Andy Wilkinson
9bc6dbd8d8
Merge branch '2.0.x'
2018-10-05 13:06:38 +01:00
Andy Wilkinson
ad647ba073
Make JSON-B auto-config back of if no JSON-P implementation is available
...
Closes gh-14675
2018-10-05 13:05:14 +01:00
Andy Wilkinson
2d3bd62353
Merge branch '2.0.x'
2018-10-05 12:59:35 +01:00
Stephane Nicoll
3e4631011a
Merge pull request #13926 from schCRABicus
...
* pr/13926:
Polish "Add reactive health indicator for Couchbase"
Add reactive health indicator for Couchbase
2018-10-05 13:57:48 +02:00
Stephane Nicoll
91b4dc2f69
Polish "Add reactive health indicator for Couchbase"
...
Closes gh-13926
2018-10-05 13:57:31 +02:00
Mikalai Lushchytski
20ff0d97e4
Add reactive health indicator for Couchbase
...
See gh-13926
2018-10-05 13:57:17 +02:00
Stephane Nicoll
36e2c8bcb5
Add missing entry for Couchbase health indicator
2018-10-05 13:56:50 +02:00
Andy Wilkinson
8ee4c5e4a1
Use offical JSON API jar rather than Geronimo's in Artemis starter
...
Closes gh-14691
2018-10-05 12:44:53 +01:00
Andy Wilkinson
b915234513
Merge branch '2.0.x'
2018-10-05 12:11:24 +01:00
Andy Wilkinson
0ad0785bf7
Provide complete dependency management for Apache Johnzon
...
Closes gh-14692
2018-10-05 12:00:26 +01:00
Andy Wilkinson
5bbdca8cdb
Use offical JSON API jar rather than Geronimo's in Artemis starter
...
Closes gh-14691
2018-10-05 11:48:47 +01:00
Andy Wilkinson
8a7d127600
Merge branch '2.0.x'
2018-10-05 11:04:10 +01:00
Andy Wilkinson
7490d8b99d
Make JSON-B auto-config back off when no implementation is available
...
Previously, the JSON-B auto-configuration would be enabled when the JSON-B API was
on the classpath. This led to a failure if there was no implementation available.
The JSON-B API loads an implementation using the service loader. This commit updates
the auto-configuration to be conditional on the presence of a
META-INF/services/javax.json.bind.spi.JsonbProvider file on the classpath.
Closes gh-14675
2018-10-05 11:03:49 +01:00
Andy Wilkinson
35bb5abe1d
Merge pull request #14585 from JB Nizet
...
* gh-14585:
Polish "Add Kotlin DSL examples to Gradle Plugin's documentation"
Add Kotlin DSL examples to Gradle Plugin's documentation
2018-10-05 10:41:24 +01:00
Andy Wilkinson
a3d2f3f594
Polish "Add Kotlin DSL examples to Gradle Plugin's documentation"
...
Closes gh-14585
2018-10-05 10:41:13 +01:00
jnizet
5ed6c0d1ab
Add Kotlin DSL examples to Gradle Plugin's documentation
...
See gh-14585
2018-10-05 10:41:13 +01:00
Stephane Nicoll
f8f6b474eb
Merge branch '2.0.x'
2018-10-05 10:38:15 +02:00
Stephane Nicoll
1da5d3462c
Merge pull request #14620 from Hanope
...
* pr/14620:
Simplify escaping of newline characters when publishing release notes
2018-10-05 10:38:05 +02:00
Hanope
31a5bfdcba
Simplify escaping of newline characters when publishing release notes
...
Closes gh-14620
2018-10-05 10:37:26 +02:00
Andy Wilkinson
b0e1dc2a5b
Merge pull request #14684 from Artsiom Yudovin
...
* gh-14684:
Polish "Drop support for "all" from management.metrics.distribution.sla"
Drop support for "all" from management.metrics.distribution.sla
2018-10-05 09:28:31 +01:00
Andy Wilkinson
c9da881322
Polish "Drop support for "all" from management.metrics.distribution.sla"
...
Closes gh-14684
2018-10-05 09:25:10 +01:00
artsiom
ccb964e886
Drop support for "all" from management.metrics.distribution.sla
...
See gh-14684
2018-10-05 09:22:43 +01:00
Andy Wilkinson
ef7c2bc6ea
Merge branch '2.0.x'
2018-10-05 08:37:45 +01:00
Andy Wilkinson
e7f100d5d7
Improve test coverage of PropertiesMeterFilter
...
Closes gh-14689
2018-10-05 08:37:19 +01:00
Stephane Nicoll
5d2828c74e
Merge branch '2.0.x'
2018-10-05 09:11:36 +02:00
Stephane Nicoll
171f78a9ce
Merge pull request #14688 from dreis2211
...
* pr/14688:
Fix BeansEndpoint typo in readme
2018-10-05 09:11:24 +02:00
dreis2211
42a6c36716
Fix BeansEndpoint typo in readme
...
Closes gh-14688
2018-10-05 09:10:46 +02:00
Phillip Webb
486a06349c
Merge pull request #13377 from ruifigueira
...
* pr/13377:
Polish "Add ReloadableResourceBundleMessageSource support"
Add ReloadableResourceBundleMessageSource support
2018-10-04 19:45:42 -07:00
Phillip Webb
11ac9bf6b5
Polish "Add ReloadableResourceBundleMessageSource support"
...
See gh-13377
2018-10-04 19:45:42 -07:00
Phillip Webb
8b59503291
Validate server.servlet.path does not contain '*'
...
Update `WebMvcProperties` to enforce that `server.servlet.path` never
contains a wildcard ['*'] character.
Closes gh-13292
2018-10-04 19:45:41 -07:00
Rui Figueira
22abe35f95
Add ReloadableResourceBundleMessageSource support
...
Add a `spring.messages.reloadable` configuration property which can be
used to auto-configure a `ReloadableResourceBundleMessageSource` rather
than a `ResourceBundleMessageSource`.
Closes gh-13377
2018-10-04 19:45:41 -07:00
Phillip Webb
6baaa3df77
Use ResourceLoader.getClassLoader() for factories
...
Update `SpringApplication` to load and initialize `spring.factories`
classes using the `ResourceLoader.getClassLoader()`.
Closes gh-14641
2018-10-04 19:45:40 -07:00
Madhura Bhave
daa3d457b7
Revert OAuth2 Client Registration Grant Type Hierarchy
...
Closes gh-14554
2018-10-04 15:21:36 -07:00
Phillip Webb
546bd89f2e
Merge branch '2.0.x'
2018-10-04 10:17:29 -07:00
Phillip Webb
2b6bdfe277
Fix Reactive...Context NPE
...
Fix possible NPE in `ReactiveWebServerApplicationContext`.
See gh-14666
2018-10-04 10:16:23 -07:00
Andy Wilkinson
0370aa60f0
Merge pull request #14680 from JB Nizet
...
* gh-14680:
Polish "Refactor Gradle plugin tests to use runner's plugin classpath"
Refactor Gradle plugin tests to use runner's plugin classpath
2018-10-04 17:28:14 +01:00
Andy Wilkinson
8c6910cf58
Polish "Refactor Gradle plugin tests to use runner's plugin classpath"
...
This commit removes the need for the Kotlin plugin tests to continue
to set the plugin classpath in each test build script. This is
achieved by adding the jars files containing the Kotlin plugin and
its dependencies to the runner's plugin classpath in the same way as
was already done for the dependency management plugin.
Closes gh-14680
2018-10-04 17:27:26 +01:00
jnizet
c51449585e
Refactor Gradle plugin tests to use runner's plugin classpath
...
Previously, each test build script used a property to configure its
classpath. This commit simplifies the tests by setting the classpath
once on the GradleRunner, thereby removing the need for it to be set in
each test script. It also allows, and, in fact, requires, the use of
the plugins block to apply the Boot plugin under test.
Unfortunately, this doesn't work for the tests for the reaction to the
Kotlin plugin. See the comments in the GradleBuild class and in each
KotlingPluginActionIntegrationTests build script.
See gh-14680
2018-10-04 17:26:42 +01:00
Stephane Nicoll
7e3bee35d7
Merge branch '2.0.x'
2018-10-04 17:54:25 +02:00
Stephane Nicoll
1774a282b0
Merge pull request #14583 from ayudovin
...
* pr/14583:
Polish "Make sure cache busting works with error pages"
Make sure cache busting works with error pages
2018-10-04 17:54:08 +02:00
Stephane Nicoll
6cc272ecf5
Polish "Make sure cache busting works with error pages"
...
Closes gh-14583
2018-10-04 17:53:56 +02:00
artsiom
64f04fceea
Make sure cache busting works with error pages
...
See gh-14583
2018-10-04 17:53:56 +02:00
Phillip Webb
3e25996405
Merge branch '2.0.x'
2018-10-04 08:00:16 -07:00
Phillip Webb
8c896d9376
Improve Reactive...Context thread safety
...
Refactor `ReactiveWebServerApplicationContext` to improve thread safety
by using a single manager object rather than then trying to synchronize
the `WebServer` and `HttpHandler`.
Closes gh-14666
2018-10-04 07:59:39 -07:00