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
Phillip Webb
ac9482d463
Merge branch '2.3.x'
...
Closes gh-21649
2020-06-01 21:21:20 -07:00
Phillip Webb
7104d8d81e
Polish
2020-06-01 21:20:45 -07:00
Phillip Webb
fc4efe3bf0
Fix Maven plugin help support
...
Update `MavenPluginPlugin` to fix HelpMojo support.
Closes gh-21556
2020-06-01 21:20:45 -07: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
Andy Wilkinson
84545a2baa
Merge branch '2.3.x'
...
Closes gh-21637
2020-06-01 13:17:23 +01:00
Andy Wilkinson
d995149b21
Support new version scheme in forward-merge hook
...
Closes gh-21636
2020-06-01 13:16:50 +01:00
Andy Wilkinson
37c6618510
Fix pattern for spring-boot-tools' name predicate
...
Closes gh-21634
2020-06-01 12:46:07 +01:00
Andy Wilkinson
d08d076fd8
Merge pull request #21612 from dreis2211
...
* gh-21612:
Update some references to 2.4.x where appropriate
Closes gh-21612
2020-06-01 08:26:19 +01:00
dreis2211
e1dc730388
Update some references to 2.4.x where appropriate
...
See gh-21612
2020-06-01 08:07:40 +01:00
Phillip Webb
1defd67347
Request only genuine pull-requests are submitted
...
Update `PULL_REQUEST_TEMPLATE` with an attempt to persuade people not
to use our repo as a GitHub playground.
2020-05-29 17:59:44 -07: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
Scott Frederick
7722394e19
Provide better error message if Docker is not running
...
Previously, if the Spring Boot build plugins got a connection error
when attempting to communicate with a Docker daemon (for example,
when the daemon isn't running), the error message made it appear that
the daemon returned an HTTP error code. This commit makes a connection
error distinct from an HTTP error response code to make it easier for
the user to diagnose the root cause of the problem.
Fixes gh-21554
2020-05-29 12:37:06 -05:00
Andy Wilkinson
685b2796f0
Merge branch '2.3.x'
2020-05-28 13:25:07 +01:00
Andy Wilkinson
8e8548756e
Start work on Spring Boot 2.4
2020-05-28 10:52:18 +01:00
Andy Wilkinson
d3ef6f2382
Prepare 2.3.x branch
2020-05-28 09:56:01 +01:00
Phillip Webb
a84b7bccf1
Merge branch '2.2.x'
2020-05-27 19:19:51 -07:00
Phillip Webb
14c9804c5c
Fix checkstyle issues
2020-05-27 19:19:11 -07:00
Phillip Webb
1c3f147c1e
Merge branch '2.2.x'
...
Closes gh-21598
2020-05-27 16:47:40 -07:00
Phillip Webb
af90604030
Merge branch '2.1.x' into 2.2.x
...
Closes gh-21597
2020-05-27 16:45:08 -07:00
Phillip Webb
587b840666
Restrict use of custom YAML types
...
Update `YamlJsonParser` and `OriginTrackedYamlLoader` to ensure that
custom types cannot be loaded.
Closes gh-21596
2020-05-27 16:36:46 -07:00
