Commit Graph

26776 Commits (731c19281788b8fba88df45d11eb8e83c94f7f1d)
 

Author SHA1 Message Date
dreis2211 731c192817 Print the java version being used on startup
See gh-21559
5 years ago
Andy Wilkinson 7b7e68a9aa Merge pull request #21691 from dreis2211
* gh-21691:
  Add Java 15 to JavaVersion enum

Closes gh-21691
5 years ago
dreis2211 85a6686cae Add Java 15 to JavaVersion enum
See gh-21691
5 years ago
Andy Wilkinson 8fb7a6cace Remove JUnit 5's vintage engine from spring-boot-starter-test
Closes gh-21625
5 years ago
Stephane Nicoll 721399bdc4 Merge branch '2.3.x' 5 years ago
Stephane Nicoll baef6c803d Merge pull request #21692 from making
* pr/21692:
  Fix event name in documentation

Closes gh-21692
5 years ago
Toshiaki Maki 0cd526c266 Fix event name in documentation
See gh-21692
5 years ago
Stephane Nicoll 8353dea111 Merge branch '2.3.x' 5 years ago
Stephane Nicoll e936e9aa6a Merge pull request #21653 from ThierrySquirrel
* pr/21653:
  Polish "Add reference to rocketmq-spring-boot-starter"
  Add reference to rocketmq-spring-boot-starter

Closes gh-21653
5 years ago
Stephane Nicoll 4624bf6552 Polish "Add reference to rocketmq-spring-boot-starter"
See gh-21653
5 years ago
ThierrySquirrel c547567882 Add reference to rocketmq-spring-boot-starter
See gh-21653
5 years ago
Andy Wilkinson 292f549cd2 Merge branch '2.3.x'
Closes gh-21719
5 years ago
Andy Wilkinson 4fdd1a64c9 Merge branch '2.2.x' into 2.3.x
Closes gh-21718
5 years ago
Andy Wilkinson 1a52009cfb Migrate CustomServletPathSampleActuatorTests to JUnit Jupiter
Closes gh-21717
5 years ago
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