Commit Graph

24952 Commits

Author SHA1 Message Date
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
Stephane Nicoll
8d46cafc80 Merge branch '2.2.x'
Closes gh-19963
2020-01-28 14:26:22 +01:00
Stephane Nicoll
ef78228af0 Merge branch '2.1.x' into 2.2.x
Closes gh-19962
2020-01-28 14:25:04 +01:00
Stephane Nicoll
5221c2bebf Merge pull request #19944 from dreis2211
* pr/19944:
  Replace deprecated Concourse resource for pull requests

Closes gh-19944
2020-01-28 14:24:09 +01:00
dreis2211
76975e497c Replace deprecated Concourse resource for pull requests
See gh-19944
2020-01-28 14:23:53 +01:00
Stephane Nicoll
041788d4ab Merge pull request #19899 from nosan
* pr/19899:
  Polish "Fix scope of CqlSessionBuilder bean"
  Fix scope of CqlSessionBuilder bean

Closes gh-19899
2020-01-28 14:14:53 +01:00
Stephane Nicoll
0516520b7e Polish "Fix scope of CqlSessionBuilder bean"
See gh-19899
2020-01-28 14:12:31 +01:00
Dmytro Nosan
c8105413b9 Fix scope of CqlSessionBuilder bean
See gh-19899
2020-01-28 13:49:20 +01:00
Stephane Nicoll
2a01c0262b Merge branch '2.2.x'
Closes gh-19958
2020-01-28 11:13:30 +01:00
Stephane Nicoll
9d0918bb2e Merge branch '2.1.x' into 2.2.x
Closes gh-19957
2020-01-28 11:13:06 +01:00
Stephane Nicoll
3a579ee87c Merge pull request #19956 from natrem
* pr/19956:
  Fix typo

Closes gh-19956
2020-01-28 11:12:48 +01:00
Pascal Verdage
930ec51968 Fix typo
See gh-19956
2020-01-28 11:12:21 +01:00
Stephane Nicoll
cf958f481d Merge pull request #19952 from dreis2211
* pr/19952:
  Fix links in Maven Plugin documentation

Closes gh-19952
2020-01-28 10:56:37 +01:00
dreis2211
741a4f4b2b Fix links in Maven Plugin documentation
See gh-19952
2020-01-28 10:50:36 +01:00
Stephane Nicoll
02329163a8 Merge pull request #19955 from wonwoo
* pr/19955:
  Register Stackdriver auto-config in `META-INF/spring.factories`

Closes gh-19955
2020-01-28 10:50:11 +01:00
wonwoo
8703c04475 Register Stackdriver auto-config in META-INF/spring.factories
See gh-19955
2020-01-28 10:49:59 +01:00
Stephane Nicoll
83b38599b1 Apply consistent timeout for Cassandra integration tests
Closes gh-19802
2020-01-28 10:46:47 +01:00
Madhura Bhave
84ea3d359b Increase timeout for Cassandra tests
Closes gh-19802
2020-01-27 16:37:50 -08:00
Stephane Nicoll
5410148f79 Improve documentation of 'image' parameter of Maven Plugin
Closes gh-19950
2020-01-27 20:56:42 +01:00
Stephane Nicoll
11c5fba355 Remove unnecessary execution-specific configuration in documentation
This documentation moves the specific `build-image` execution
configuration example of the Maven plugin documentation to the general
plugin configuration. This makes sure that it works in most cases and
an execution-specific configuration is not required here anyway.

Closes gh-19946
2020-01-27 20:12:00 +01:00
Andy Wilkinson
43555c9fa0 Configure formatting tasks to use UTF-8 encoding
Closes gh-19947
2020-01-27 16:41:54 +00:00
Stephane Nicoll
2cb6612044 Merge pull request #19894 from kedar-joshi
* pr/19894:
  Polish "Upgrade to Flyway 6.2.0"
  Upgrade to Flyway 6.2.0

Closes gh-19894
2020-01-27 15:29:45 +01:00