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

26753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Wilkinson
9bfb088931 Upgrade to Gradle Enterprise Plugin 3.3.3 
Closes gh-21675
 2020-06-03 17:47:35 +01:00
Andy Wilkinson
5eec39795b Merge branch '2.3.x' 
Closes gh-21676
 2020-06-03 17:40:37 +01:00
Andy Wilkinson
23b329be07 Upgrade to Gradle Enterprise Conventions Plugin 0.0.3 
Closes gh-21674
 2020-06-03 17:27:14 +01:00
Andy Wilkinson
933a85144a Merge branch '2.3.x' 
Closes gh-21669
 2020-06-03 13:07:35 +01:00
Andy Wilkinson
daeca9f332 Restore Boot 2.2's compile-scoped dependencies 
Fixes gh-21507
 2020-06-03 12:55:11 +01:00
Andy Wilkinson
f041be8877 Merge branch '2.3.x' 
Closes gh-21668
 2020-06-03 11:46:59 +01:00
Andy Wilkinson
210e565741 Use dirMode and fileMode to configure CLI archive entry permissions 
Closes gh-21453
 2020-06-03 11:46:01 +01:00
Andy Wilkinson
f0909aa18f Merge branch '2.3.x' 
Closes gh-21667
 2020-06-03 10:36:26 +01:00
Andy Wilkinson
d30a0ee811 Ensure that the build uses UTF-8 encoding everywhere by default 
Closes gh-21664
 2020-06-03 10:35:26 +01:00
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