10fdd65063
Add prepare-forward-merge script
...
Add a git hook script that can be used to prepare a sensible merge
commit message.
Closes gh-21688
5 years ago
87a155410b
Merge branch '2.3.x'
...
Closes gh-21707
5 years ago
ba53d10060
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21706
5 years ago
39caf45155
Allow forward merge to work with .x patterns
...
Closes gh-21687
5 years ago
4a6e08c817
Add logging to forward-merge script
...
Add some logging to aid with development.
5 years ago
c666f0ff05
Merge branch '2.3.x'
5 years ago
4a0d372675
Merge branch '2.2.x' into 2.3.x
5 years ago
b6474f2ca1
Remove accidentally committed hook file
5 years ago
c4faeac4d7
Merge branch '2.3.x'
...
Closes gh-21703
5 years ago
24138c104c
Use highlightjs for syntax highlighting in Asciidoctor's HTML output
...
Closes gh-21701
5 years ago
15ec26171c
Merge branch '2.3.x'
...
Closes gh-21699
5 years ago
c0f748e143
Always apply retry plugin but only retry on CI
...
Previously, the retry plugin was only applied on CI as we do not want
tests to be retried in local builds. Unfortunately, this arrangement
led to test tasks from CI builds having additional doFirst and doLast
actions and an additional property. These differences meant that the
output from a test task that has run on CI could not be used by a
local build.
This commit changes our configuration of the test retry plugin so
that it is now always applied. To retain the behaviour of only
retrying tests on CI, max retries is configured to 3 on CI and 0 for
local builds.
Closes gh-21698
5 years ago
16cab0d83c
Merge branch '2.3.x'
...
Closes gh-21690
5 years ago
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
5 years ago
87f5894a9a
Merge branch '2.3.x'
...
Closes gh-21685
5 years ago
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
5 years ago
eac90d5342
Merge branch '2.3.x'
...
Closes gh-21678
5 years ago
1486ce5ae0
Merge pull request #21673 from dreis2211
...
* gh-21673:
Polish Slack notification when no build scan was published
Closes gh-21673
5 years ago
0f6767f274
Polish Slack notification when no build scan was published
...
See gh-21673
5 years ago
99323e8b06
Merge branch '2.3.x'
...
Closes gh-21677
5 years ago
9bfb088931
Upgrade to Gradle Enterprise Plugin 3.3.3
...
Closes gh-21675
5 years ago
5eec39795b
Merge branch '2.3.x'
...
Closes gh-21676
5 years ago
23b329be07
Upgrade to Gradle Enterprise Conventions Plugin 0.0.3
...
Closes gh-21674
5 years ago
933a85144a
Merge branch '2.3.x'
...
Closes gh-21669
5 years ago
daeca9f332
Restore Boot 2.2's compile-scoped dependencies
...
Fixes gh-21507
5 years ago
f041be8877
Merge branch '2.3.x'
...
Closes gh-21668
5 years ago
210e565741
Use dirMode and fileMode to configure CLI archive entry permissions
...
Closes gh-21453
5 years ago
f0909aa18f
Merge branch '2.3.x'
...
Closes gh-21667
5 years ago
d30a0ee811
Ensure that the build uses UTF-8 encoding everywhere by default
...
Closes gh-21664
5 years ago
38b91f134e
Merge branch '2.3.x'
...
Closes gh-21665
5 years ago
a2bfdb5b33
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21663
5 years ago
29c2a0471d
Add Oracle DB dependency management under com.oracle.database
...
Closes gh-20333
5 years ago
39216ce3f4
Merge branch '2.3.x'
5 years ago
e39d7971fb
Merge branch '2.2.x' into 2.3.x
5 years ago
864daab03a
Merge branch '2.1.x' into 2.2.x
5 years ago
b5fe3c3494
Refine YAML type restriction error
...
Closes gh-21596
5 years ago
20c11a3cbd
Merge branch '2.3.x'
...
Closes gh-21661
5 years ago
ebb3f5f286
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21660
5 years ago
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
5 years ago
e0f548fdd3
Merge branch '2.3.x'
...
Closes gh-21657
5 years ago
2dc8048d08
Add missing since tags
...
Closes gh-21576
5 years ago
fc8fdf2de0
Merge branch '2.3.x'
...
Closes gh-21656
5 years ago
2589f980d5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21655
5 years ago
09a47c9aad
Fix containsDescendantOf for random sources
...
Fix the `containsDescendantOf` logic for random property sources to
ensure that ancestors are correctly matched.
Closes gh-21654
5 years ago
399d0f7b95
Merge branch '2.3.x'
...
Closes gh-21651
5 years ago
f0bc8ee73c
Fix version placeholder replacement in Gradle plugin docs
...
Closes gh-21640
5 years ago
ac9482d463
Merge branch '2.3.x'
...
Closes gh-21649
5 years ago
7104d8d81e
Polish
5 years ago
fc4efe3bf0
Fix Maven plugin help support
...
Update `MavenPluginPlugin` to fix HelpMojo support.
Closes gh-21556
5 years ago
dcd83ec616
Merge branch '2.3.x'
5 years ago
Phillip Webb
Andy Wilkinson
Scott Frederick
dreis2211
Madhura Bhave