Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,781 Commits 23 Branches 0 Tags
bb86d2b3d46ddc7202e24a191d00ebf2dce10fda
Commit Graph

26781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
bb86d2b3d4 Merge branch '2.3.x' 2020-06-05 16:25:38 +02:00
Stephane Nicoll
79a5ca2941 Merge branch '2.2.x' into 2.3.x 2020-06-05 16:25:24 +02:00
Stephane Nicoll
eb38eeaf30 Polish 2020-06-05 16:25:12 +02:00
Andy Wilkinson
2f06cbc9c9 Merge pull request #21559 from dreis2211 
* gh-21559:
  Polish "Print the java version being used on startup"
  Print the java version being used on startup

Closes gh-21559
 2020-06-05 14:19:46 +01:00
Andy Wilkinson
82cc7e972d Polish "Print the java version being used on startup" 
See gh-21559
 2020-06-05 14:19:15 +01:00
dreis2211
731c192817 Print the java version being used on startup 
See gh-21559
 2020-06-05 14:12:08 +01:00
Andy Wilkinson
7b7e68a9aa Merge pull request #21691 from dreis2211 
* gh-21691:
  Add Java 15 to JavaVersion enum

Closes gh-21691
 2020-06-05 14:09:08 +01:00
dreis2211
85a6686cae Add Java 15 to JavaVersion enum 
See gh-21691
 2020-06-05 14:08:09 +01:00
Andy Wilkinson
8fb7a6cace Remove JUnit 5's vintage engine from spring-boot-starter-test 
Closes gh-21625
 2020-06-05 14:02:26 +01:00
Stephane Nicoll
721399bdc4 Merge branch '2.3.x' 2020-06-05 14:54:55 +02:00
Stephane Nicoll
baef6c803d Merge pull request #21692 from making 
* pr/21692:
  Fix event name in documentation

Closes gh-21692
 2020-06-05 14:54:42 +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
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
 2020-06-05 14:49:25 +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
Andy Wilkinson
292f549cd2 Merge branch '2.3.x' 
Closes gh-21719
 2020-06-05 13:41:56 +01:00
Andy Wilkinson
4fdd1a64c9 Merge branch '2.2.x' into 2.3.x 
Closes gh-21718
 2020-06-05 13:41:21 +01:00
Andy Wilkinson
1a52009cfb Migrate CustomServletPathSampleActuatorTests to JUnit Jupiter 
Closes gh-21717
 2020-06-05 13:40:30 +01:00
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
 2020-06-05 14:16:49 +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
Andy Wilkinson
c848f80c27 Merge branch '2.3.x' 
Closes gh-21680
 2020-06-05 12:53:05 +01:00
Andy Wilkinson
0415c307c7 Merge branch '2.2.x' into 2.3.x 
Closes gh-21683
 2020-06-05 12:52:50 +01:00
Andy Wilkinson
97533a5364 Merge branch '2.1.x' into 2.2.x 
Closes gh-21682
 2020-06-05 12:52:24 +01:00
Andy Wilkinson
20f0b41099 Upgrade CI to Docker 19.03.9 
Closes gh-21681
 2020-06-05 12:48:49 +01:00
Stephane Nicoll
78165c619d Merge pull request #21605 from dreis2211 
* pr/21605:
  Fix multi-release JAR test on JDK 15

Closes gh-21605
 2020-06-05 13:07:31 +02:00
dreis2211
54f93e9b0f Fix multi-release JAR test on JDK 15 
See gh-21605
 2020-06-05 11:56:50 +02:00
Phillip Webb
2fe299f6d0 Merge branch '2.3.x' 
Closes gh-21710
 2020-06-04 20:10:59 -07:00
Phillip Webb
7561123cd9 Merge branch '2.2.x' into 2.3.x 
Closes gh-21709
 2020-06-04 20:10:18 -07:00
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
 2020-06-04 20:10:09 -07:00
Phillip Webb
87a155410b Merge branch '2.3.x' 
Closes gh-21707
 2020-06-04 20:08:20 -07:00
Phillip Webb
ba53d10060 Merge branch '2.2.x' into 2.3.x 
Closes gh-21706
 2020-06-04 20:07:13 -07:00
Phillip Webb
39caf45155 Allow forward merge to work with .x patterns 
Closes gh-21687
 2020-06-04 20:05:17 -07:00
Phillip Webb
4a6e08c817 Add logging to forward-merge script 
Add some logging to aid with development.
 2020-06-04 20:05:01 -07:00
Phillip Webb
c666f0ff05 Merge branch '2.3.x' 2020-06-04 14:03:59 -07:00
Phillip Webb
4a0d372675 Merge branch '2.2.x' into 2.3.x 2020-06-04 14:00:57 -07:00
Phillip Webb
b6474f2ca1 Remove accidentally committed hook file 2020-06-04 13:59:14 -07: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
Andy Wilkinson
15ec26171c Merge branch '2.3.x' 
Closes gh-21699
 2020-06-04 16:53:26 +01:00
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
 2020-06-04 16:10:12 +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
eac90d5342 Merge branch '2.3.x' 
Closes gh-21678
 2020-06-03 18:47:32 +01:00
Andy Wilkinson
1486ce5ae0 Merge pull request #21673 from dreis2211 
* gh-21673:
  Polish Slack notification when no build scan was published

Closes gh-21673
 2020-06-03 18:47:20 +01:00
dreis2211
0f6767f274 Polish Slack notification when no build scan was published 
See gh-21673
 2020-06-03 18:46:58 +01:00
Andy Wilkinson
99323e8b06 Merge branch '2.3.x' 
Closes gh-21677
 2020-06-03 17:48:11 +01:00