Stephane Nicoll
6db4103b26
Merge pull request #21545 from izeye
...
* pr/21545:
Polish "Support filtered scrape for Prometheus"
Support filtered scrape for Prometheus
Upgrade CI to Docker 19.03.9
Closes gh-21545
5 years ago
Stephane Nicoll
da5e8d70a1
Polish "Support filtered scrape for Prometheus"
...
See gh-21545
5 years ago
Johnny Lim
cd1baf18fe
Support filtered scrape for Prometheus
...
See gh-21545
5 years ago
Andy Wilkinson
c848f80c27
Merge branch '2.3.x'
...
Closes gh-21680
5 years ago
Andy Wilkinson
0415c307c7
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21683
5 years ago
Andy Wilkinson
97533a5364
Merge branch '2.1.x' into 2.2.x
...
Closes gh-21682
5 years ago
Andy Wilkinson
20f0b41099
Upgrade CI to Docker 19.03.9
...
Closes gh-21681
5 years ago
Stephane Nicoll
78165c619d
Merge pull request #21605 from dreis2211
...
* pr/21605:
Fix multi-release JAR test on JDK 15
Closes gh-21605
5 years ago
dreis2211
54f93e9b0f
Fix multi-release JAR test on JDK 15
...
See gh-21605
5 years ago
Phillip Webb
2fe299f6d0
Merge branch '2.3.x'
...
Closes gh-21710
5 years ago
Phillip Webb
7561123cd9
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21709
5 years ago
Phillip Webb
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
Phillip Webb
87a155410b
Merge branch '2.3.x'
...
Closes gh-21707
5 years ago
Phillip Webb
ba53d10060
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21706
5 years ago
Phillip Webb
39caf45155
Allow forward merge to work with .x patterns
...
Closes gh-21687
5 years ago
Phillip Webb
4a6e08c817
Add logging to forward-merge script
...
Add some logging to aid with development.
5 years ago
Phillip Webb
c666f0ff05
Merge branch '2.3.x'
5 years ago
Phillip Webb
4a0d372675
Merge branch '2.2.x' into 2.3.x
5 years ago
Phillip Webb
b6474f2ca1
Remove accidentally committed hook file
5 years ago
Andy Wilkinson
c4faeac4d7
Merge branch '2.3.x'
...
Closes gh-21703
5 years ago
Andy Wilkinson
24138c104c
Use highlightjs for syntax highlighting in Asciidoctor's HTML output
...
Closes gh-21701
5 years ago
Andy Wilkinson
15ec26171c
Merge branch '2.3.x'
...
Closes gh-21699
5 years ago
Andy Wilkinson
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
Phillip Webb
16cab0d83c
Merge branch '2.3.x'
...
Closes gh-21690
5 years ago
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
5 years ago
Scott Frederick
87f5894a9a
Merge branch '2.3.x'
...
Closes gh-21685
5 years ago
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
5 years ago
Andy Wilkinson
eac90d5342
Merge branch '2.3.x'
...
Closes gh-21678
5 years ago
Andy Wilkinson
1486ce5ae0
Merge pull request #21673 from dreis2211
...
* gh-21673:
Polish Slack notification when no build scan was published
Closes gh-21673
5 years ago
dreis2211
0f6767f274
Polish Slack notification when no build scan was published
...
See gh-21673
5 years ago
Andy Wilkinson
99323e8b06
Merge branch '2.3.x'
...
Closes gh-21677
5 years ago
Andy Wilkinson
9bfb088931
Upgrade to Gradle Enterprise Plugin 3.3.3
...
Closes gh-21675
5 years ago
Andy Wilkinson
5eec39795b
Merge branch '2.3.x'
...
Closes gh-21676
5 years ago
Andy Wilkinson
23b329be07
Upgrade to Gradle Enterprise Conventions Plugin 0.0.3
...
Closes gh-21674
5 years ago
Andy Wilkinson
933a85144a
Merge branch '2.3.x'
...
Closes gh-21669
5 years ago
Andy Wilkinson
daeca9f332
Restore Boot 2.2's compile-scoped dependencies
...
Fixes gh-21507
5 years ago
Andy Wilkinson
f041be8877
Merge branch '2.3.x'
...
Closes gh-21668
5 years ago
Andy Wilkinson
210e565741
Use dirMode and fileMode to configure CLI archive entry permissions
...
Closes gh-21453
5 years ago
Andy Wilkinson
f0909aa18f
Merge branch '2.3.x'
...
Closes gh-21667
5 years ago
Andy Wilkinson
d30a0ee811
Ensure that the build uses UTF-8 encoding everywhere by default
...
Closes gh-21664
5 years ago
Andy Wilkinson
38b91f134e
Merge branch '2.3.x'
...
Closes gh-21665
5 years ago
Andy Wilkinson
a2bfdb5b33
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21663
5 years ago
Andy Wilkinson
29c2a0471d
Add Oracle DB dependency management under com.oracle.database
...
Closes gh-20333
5 years ago
Phillip Webb
39216ce3f4
Merge branch '2.3.x'
5 years ago
Phillip Webb
e39d7971fb
Merge branch '2.2.x' into 2.3.x
5 years ago
Phillip Webb
864daab03a
Merge branch '2.1.x' into 2.2.x
5 years ago
Phillip Webb
b5fe3c3494
Refine YAML type restriction error
...
Closes gh-21596
5 years ago
Phillip Webb
20c11a3cbd
Merge branch '2.3.x'
...
Closes gh-21661
5 years ago
Phillip Webb
ebb3f5f286
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21660
5 years ago
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
5 years ago