Commit Graph

24973 Commits

Author SHA1 Message Date
Stephane Nicoll
cf473eeb65 Merge branch '2.2.x'
Closes gh-20017
2020-02-03 10:47:02 +01:00
Stephane Nicoll
d5ed61317a Merge branch '2.1.x' into 2.2.x
Closes gh-20015
2020-02-03 10:39:05 +01:00
Stephane Nicoll
c8a5106cdf Upgrade to spring-javaformat 0.0.20
This commit upgrades to spring javaformat 0.0.20 and Checkstyle 8.29.

This commit also upgrades to the Checkstyle maven plugin 3.1.0.

See gh-20011
2020-02-03 10:36:27 +01:00
Stephane Nicoll
df67a0755d Merge pull request #20002 from dreis2211
* pr/20002:
  Upgrade to Ant 1.10.7

Closes gh-20002
2020-02-03 10:31:03 +01:00
dreis2211
326092b69e Upgrade to Ant 1.10.7
See gh-20002
2020-02-03 10:29:24 +01:00
Stephane Nicoll
52659b1df4 Merge branch '2.2.x'
Closes gh-20013
2020-02-03 09:44:40 +01:00
Stephane Nicoll
03d126cbd5 Merge pull request #20004 from izeye
* pr/20004:
  Polish samples in doc

Closes gh-20004
2020-02-03 09:44:28 +01:00
Johnny Lim
6ef288f45b Polish samples in doc
See gh-20004
2020-02-03 09:37:06 +01:00
Stephane Nicoll
ae169a3617 Merge pull request #20009 from dreis2211
* pr/20009:
  Use Spring 5 module of Jersey

Closes gh-20009
2020-02-03 09:35:22 +01:00
dreis2211
56df70b0e7 Use Spring 5 module of Jersey
See gh-20009
2020-02-03 09:34:57 +01:00
Andy Wilkinson
bca98c5126 Use a RegularFileProperty to configure BootBuildImage's input jar
Closes gh-20010
2020-02-02 14:39:50 +00:00
Stephane Nicoll
199cea206f Merge pull request #20001 from izeye
* pr/20001:
  Polish

Closes gh-20001
2020-02-01 16:15:21 +01:00
Johnny Lim
0ddf8be151 Polish
See gh-20001
2020-02-01 16:13:51 +01:00
Stephane Nicoll
7cb13eb16e Merge pull request #19995 from izeye
* pr/19995:
  Upgrade copyright date
  Polish

Closes gh-19995
2020-02-01 09:27:03 +01:00
Stephane Nicoll
9b79208b60 Upgrade copyright date
See gh-19995
2020-02-01 09:26:50 +01:00
Johnny Lim
e6d5f5a271 Polish
See gh-19995
2020-02-01 09:24:20 +01:00
Scott Frederick
afb67887da Restore deprecated class required by Spring Cloud
See gh-19860
2020-01-31 17:13:09 -06:00
Phillip Webb
cbacab5e26 Polish 2020-01-30 17:14:36 -08:00
Phillip Webb
1eee83a07e Update copyright year of changed files 2020-01-30 17:09:49 -08:00
Phillip Webb
234c5033d4 Polish whitespace 2020-01-30 17:09:49 -08:00
Scott Frederick
653cabe2ce Add documentation for gradle bootBuildImage task 2020-01-30 17:54:15 -06:00
Madhura Bhave
bceed1305f Jar files added after build time should be added to classpath
Fixes gh-19973
2020-01-30 15:38:49 -08:00
Scott Frederick
b281af0b9b Remove adding of existing layers to EphemeralBuilder
Layers were being added to the EphemeralBuilder each time one was
created, but those layers already existed in the base builder image.

Closes gh-19832
2020-01-30 16:34:02 -06:00
Andy Wilkinson
cf25623d6f Merge branch '2.2.x' 2020-01-30 15:13:03 +00:00
Andy Wilkinson
7b0d1eaffc Test the Gradle Plugin against Gradle 6.1.1
Closes gh-19912
2020-01-30 15:12:30 +00:00
Andy Wilkinson
886e7ba38c Merge branch '2.2.x'
Closes gh-19989
2020-01-30 15:10:35 +00:00
Andy Wilkinson
a37c170376 Try to make CouchbaseAutoConfigurationIntegrationTests less flakey
Closes gh-19932
2020-01-30 15:10:13 +00:00
Andy Wilkinson
2725264be1 Polishing formatting of DockerApi 2020-01-30 14:08:45 +00:00
Andy Wilkinson
6db5ca97d3 Sort names alphabetically in metrics list response
Closes gh-19934
2020-01-30 14:05:53 +00:00
Andy Wilkinson
28442b5ca5 Lower the minimum required Docker API version to 1.24
Closes gh-19945
2020-01-30 13:57:18 +00:00
Andy Wilkinson
54b3f480b4 Use posix long names when creating tar archive for image building
Fixes gh-19964
2020-01-30 13:31:27 +00:00
Stephane Nicoll
02d095d71a Merge pull request #19985 from dreis2211
* pr/19985:
  Polish "Use new AssertJ duration assertions"
  Use new AssertJ duration assertions
  Upgrade to AssertJ 3.15.0

Closes gh-19985
2020-01-30 08:28:40 +01:00
Stephane Nicoll
bae1d8d780 Polish "Use new AssertJ duration assertions"
See gh-19985
2020-01-30 08:20:49 +01:00
dreis2211
fac6f08ca3 Use new AssertJ duration assertions
See gh-19985
2020-01-30 08:14:49 +01:00
dreis2211
7de3712e56 Upgrade to AssertJ 3.15.0
See gh-19985
2020-01-30 08:14:47 +01:00
Scott Frederick
c6a6024062 Stop image building on error from builder
Previously, the image builder used by the build tool plugins ignored
errors from lifecycle phases and continued with subsequent phases.

This commit inspects the status of the builder container after each
lifecycle phase and aborts the image building process if the exit
status of the container after any phase is non-zero.

Fixes #19949
2020-01-29 17:51:32 -06:00
Madhura Bhave
dc542b29d8 Merge branch '2.2.x'
Closes gh-19977
2020-01-28 17:00:55 -08:00
Madhura Bhave
7cb1fcf951 Merge pull request #19976 from izeye
* pr/19976:
  Update test name in WebFluxTagsTests

Closes gh-19976
2020-01-28 17:00:08 -08:00
Johnny Lim
f3aed11714 Update test name in WebFluxTagsTests
See gh-19976
2020-01-28 16:59:43 -08:00
Stephane Nicoll
b6c5c3a113 Polish
See gh-19802
2020-01-28 18:22:28 +01:00
Andy Wilkinson
9882e749e9 Merge branch '2.2.x'
Closes gh-19971
2020-01-28 17:17:01 +00:00
Andy Wilkinson
553311c690 Merge branch '2.1.x' into 2.2.x
Closes gh-19970
2020-01-28 17:15:57 +00:00
Andy Wilkinson
140f5e7baf Unwraper handler to find ContextHandler when logging context path
Previously, only the top-level handlers were examined to find the
ContextHandlers and log the context path. If those handlers had
been wrapped, this prevented the ContextHandlers from being found
and an empty string was always logged.

When finding the context path, this commit unwraps the handler held
by a HandlerWrapper until the ContextHandler is found.

Fixes gh-19969
2020-01-28 17:01:11 +00:00
Stephane Nicoll
eb852f1ad6 Disable bean overriding by default in ApplicationContextRunner
For consistency with SpringApplication, this commit disables bean
overriding by default in ApplicationContextRunner. Bean overriding can
be enabled again using withAllowBeanDefinitionOverriding.

Closes gh-18019
2020-01-28 15:57:28 +01:00
Stephane Nicoll
e92e818b7c Merge pull request #19864 from dreis2211
* pr/19864:
  Use Supplier variants of Assert

Closes gh-19864
2020-01-28 15:30:50 +01:00
dreis2211
d8e2349e47 Use Supplier variants of Assert
See gh-19864
2020-01-28 15:04:11 +01:00
Stephane Nicoll
9fbaf7611b Merge branch '2.2.x'
Closes gh-19966
2020-01-28 14:43:54 +01:00
Stephane Nicoll
b420bdb3ac Merge branch '2.1.x' into 2.2.x
Closes gh-19965
2020-01-28 14:43:30 +01:00
Stephane Nicoll
f506559763 Merge pull request #19961 from dreis2211
* pr/19961:
  Fix Gradle plugin documentation links

Closes gh-19961
2020-01-28 14:43:16 +01:00
dreis2211
db2bacc62a Fix Gradle plugin documentation links
See gh-19961
2020-01-28 14:41:05 +01:00