Stephane Nicoll
721399bdc4
Merge branch '2.3.x'
2020-06-05 14:54:55 +02:00
Toshiaki Maki
0cd526c266
Fix event name in documentation
...
See gh-21692
2020-06-05 14:51:53 +02:00
Stephane Nicoll
8353dea111
Merge branch '2.3.x'
2020-06-05 14:49:55 +02:00
Stephane Nicoll
4624bf6552
Polish "Add reference to rocketmq-spring-boot-starter"
...
See gh-21653
2020-06-05 14:49:19 +02:00
ThierrySquirrel
c547567882
Add reference to rocketmq-spring-boot-starter
...
See gh-21653
2020-06-05 14:49:19 +02:00
Stephane Nicoll
da5e8d70a1
Polish "Support filtered scrape for Prometheus"
...
See gh-21545
2020-06-05 14:16:42 +02:00
Johnny Lim
cd1baf18fe
Support filtered scrape for Prometheus
...
See gh-21545
2020-06-05 14:16:42 +02:00
dreis2211
54f93e9b0f
Fix multi-release JAR test on JDK 15
...
See gh-21605
2020-06-05 11:56:50 +02:00
Andy Wilkinson
c4faeac4d7
Merge branch '2.3.x'
...
Closes gh-21703
2020-06-04 20:27:18 +01:00
Andy Wilkinson
24138c104c
Use highlightjs for syntax highlighting in Asciidoctor's HTML output
...
Closes gh-21701
2020-06-04 20:25:29 +01:00
Phillip Webb
16cab0d83c
Merge branch '2.3.x'
...
Closes gh-21690
2020-06-03 19:20:01 -07:00
Phillip Webb
4d37430bfe
Use servlet context that can access classloader
...
Update `SpringBootServletInitializer` to use the `ServletContext` that
was provided to the initial `onStartup` call rather than the
one from the `ServletContextEvent`. This allows the `getClassLoader()`
call to complete without throwing an `UnsupportedOperationException`.
Fixes gh-21684
2020-06-03 19:18:12 -07:00
Scott Frederick
87f5894a9a
Merge branch '2.3.x'
...
Closes gh-21685
2020-06-03 16:54:37 -05:00
Scott Frederick
29253264b4
Improve Docker API 5xx error messages
...
This commit improves the error messages returned by the Spring Boot
build plugins when a 5xx status code is returned from the Docker
API while attempting to build an image. If the error response has
contents containing a JSON structure with a "message" key, the value
associated with that key will be included in the exception message
and in the build plugin output error.
Fixes gh-21515
2020-06-03 16:53:44 -05:00
Andy Wilkinson
933a85144a
Merge branch '2.3.x'
...
Closes gh-21669
2020-06-03 13:07:35 +01:00
Andy Wilkinson
daeca9f332
Restore Boot 2.2's compile-scoped dependencies
...
Fixes gh-21507
2020-06-03 12:55:11 +01:00
Andy Wilkinson
f041be8877
Merge branch '2.3.x'
...
Closes gh-21668
2020-06-03 11:46:59 +01:00
Andy Wilkinson
210e565741
Use dirMode and fileMode to configure CLI archive entry permissions
...
Closes gh-21453
2020-06-03 11:46:01 +01:00
Andy Wilkinson
38b91f134e
Merge branch '2.3.x'
...
Closes gh-21665
2020-06-03 09:26:29 +01:00
Andy Wilkinson
a2bfdb5b33
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21663
2020-06-03 08:13:44 +01:00
Andy Wilkinson
29c2a0471d
Add Oracle DB dependency management under com.oracle.database
...
Closes gh-20333
2020-06-03 08:06:26 +01:00
Phillip Webb
39216ce3f4
Merge branch '2.3.x'
2020-06-02 22:48:16 -07:00
Phillip Webb
e39d7971fb
Merge branch '2.2.x' into 2.3.x
2020-06-02 22:48:01 -07:00
Phillip Webb
864daab03a
Merge branch '2.1.x' into 2.2.x
2020-06-02 22:47:41 -07:00
Phillip Webb
b5fe3c3494
Refine YAML type restriction error
...
Closes gh-21596
2020-06-02 22:46:47 -07:00
Phillip Webb
20c11a3cbd
Merge branch '2.3.x'
...
Closes gh-21661
2020-06-02 22:29:38 -07:00
Phillip Webb
ebb3f5f286
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21660
2020-06-02 22:28:39 -07:00
Phillip Webb
4fc0dec6c4
Support wrapped random property sources
...
Update `SpringConfigurationPropertySource` so that wrapped random
property sources can be used. It's assumed that wrapped random
sources will use the name of the source as the prefix.
Closes gh-21595
2020-06-02 22:22:40 -07:00
Madhura Bhave
e0f548fdd3
Merge branch '2.3.x'
...
Closes gh-21657
2020-06-02 17:24:20 -07:00
Madhura Bhave
2dc8048d08
Add missing since tags
...
Closes gh-21576
2020-06-02 17:22:46 -07:00
Phillip Webb
fc8fdf2de0
Merge branch '2.3.x'
...
Closes gh-21656
2020-06-02 10:59:35 -07:00
Phillip Webb
2589f980d5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21655
2020-06-02 10:58:36 -07:00
Phillip Webb
09a47c9aad
Fix containsDescendantOf for random sources
...
Fix the `containsDescendantOf` logic for random property sources to
ensure that ancestors are correctly matched.
Closes gh-21654
2020-06-02 10:57:48 -07:00
Andy Wilkinson
399d0f7b95
Merge branch '2.3.x'
...
Closes gh-21651
2020-06-02 09:42:34 +01:00
Andy Wilkinson
f0bc8ee73c
Fix version placeholder replacement in Gradle plugin docs
...
Closes gh-21640
2020-06-02 08:59:14 +01:00
Madhura Bhave
dcd83ec616
Merge branch '2.3.x'
2020-06-01 15:16:14 -07:00
Madhura Bhave
1f28141f3e
Use the right property in test
2020-06-01 15:15:53 -07:00
Phillip Webb
c6b3db542a
Merge branch '2.3.x'
...
Closes gh-21646
2020-06-01 15:08:10 -07:00
Phillip Webb
4dff0beb80
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21645
2020-06-01 15:07:26 -07:00
Phillip Webb
ad73daf5bc
Merge branch '2.3.x'
...
Closes gh-21644
2020-06-01 15:06:01 -07:00
Phillip Webb
14e6c734a9
Merge branch '2.1.x' into 2.2.x
...
Closes gh-21643
2020-06-01 14:45:39 -07:00
Phillip Webb
502e2a4c64
Polish
2020-06-01 14:27:39 -07:00
Phillip Webb
95031295b9
Restore TomcatReactiveWebServerFactoryTests
...
Restore tests that were previously ignored due to a framework bug.
Closes gh-19702
2020-06-01 14:19:20 -07:00
Madhura Bhave
d3f72326d0
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21642
2020-06-01 13:49:59 -07:00
Madhura Bhave
573cb98d90
Make management security configuration back off when SAML present
...
Fixes gh-21620
2020-06-01 13:39:46 -07:00
Andy Wilkinson
8f8bee7ccd
Merge branch '2.3.x'
...
Closes gh-21641
2020-06-01 17:48:48 +01:00
Andy Wilkinson
3d143e59e7
Fix inclusion of version-specific content in Gradle plugin's docs
...
Fixes gh-21610
2020-06-01 17:47:42 +01:00
Andy Wilkinson
acd7961127
Merge branch '2.3.x'
...
Closes gh-21639
2020-06-01 16:45:54 +01:00
Andy Wilkinson
b1777b9dee
Use stable file repository for testing snapshot layers
...
Closes gh-21629
2020-06-01 16:28:33 +01:00
Scott Frederick
687b9b0353
Merge branch '2.3.x'
...
Fixes gh-21554 in 2.4.0-M1
2020-05-29 12:48:50 -05:00