Commit Graph

28160 Commits

Author SHA1 Message Date
Tomek Szmytka c13385ea74 Use Awaitility instead of Thread.sleep
See gh-21988
2020-06-19 08:17:53 +01:00
Scott Frederick 28643e4d2d Validate image references before passing to CNB builder
Prior to this commit, an image name or run image name derived from
the project name or provided by the user would be passed to the CNB
builder without validation by the Maven plugin build-image goal or
Gradle plugin bootBuildImage task. This could lead to error messages
from the plugins that are difficult to understand and diagnose.

This commit makes parsing of the image names more strict, based on
the grammar implemented by the Docker go library. This provides
validation of the image names before passing them to the builder,
with a more descriptive error message when parsing and validation
fails.

Fixes gh-21495
2020-06-18 15:09:57 -05:00
Andy Wilkinson 63423e7d71 Merge branch '2.2.x' into 2.3.x 2020-06-18 15:54:59 +01:00
Andy Wilkinson 67604a5416 Only process main metadata as it already includes additional metadata
Previously, the configuration property table generation was reading
both the main metadata and the additional metadata from each project.
This was unnecessary as the annotation processor will have already
merged the additional metadata into the main metadata before writing
it to disk. Processing both the main and additional metadata led to
a clash as the metadata overlapped. When the entry in the additional
metadata won the clash, the resulting entry in the configuration
property table would lose any details that aren't contained in the
additional metadata.

This commit updates the property table generation code to only use
the main metadata files.

Fixes gh-21131
2020-06-18 15:49:34 +01:00
Andy Wilkinson ce907b129c Merge branch '2.2.x' into 2.3.x
Closes gh-22010
2020-06-18 11:03:32 +01:00
Andy Wilkinson 1b62abab9a Configure context on SizeAndTimeBasedRollingPolicy
Previously, when file-based logging was enabled, Logback would output
the following during logging system initialization:

LOGBACK: No context given for c.q.l.core.rolling.SizeAndTimeBasedRollingPolicy

This commit updates the default logback configuration to set the
context on the SizeAndTimeBasedRollingPolicy that it creates.

Fixes gh-21056
2020-06-18 11:01:26 +01:00
Andy Wilkinson 8a7c32fff7 Prevent oauth2-oidc-sdk from downgrading json-smart in Maven projects
Fixes gh-21939
2020-06-18 10:34:12 +01:00
Stephane Nicoll c3678dff53 Merge pull request #21986 from dreis2211
* pr/21986:
  Use lazy lambda instead of explicit argument

Closes gh-21986
2020-06-18 11:30:07 +02:00
dreis2211 855d596c2a Use lazy lambda instead of explicit argument
See gh-21986
2020-06-18 11:29:49 +02:00
Andy Wilkinson ab51f3a0a4 Merge branch '2.2.x' into 2.3.x
Closes gh-22004
2020-06-18 10:22:57 +01:00
Andy Wilkinson 73a1047ad2 Merge branch '2.1.x' into 2.2.x
Closes gh-22005
2020-06-18 10:22:28 +01:00
Andy Wilkinson db634d762e Update CI images to use ubuntu:bionic-20200526
Closes gh-22003
2020-06-18 10:17:39 +01:00
Andy Wilkinson 8f7d71ca11 Merge branch '2.2.x' into 2.3.x 2020-06-18 09:23:21 +01:00
Andy Wilkinson 907b64a5eb Remove redundant stop() calls from LiveReloadServerTests 2020-06-18 09:23:02 +01:00
Madhura Bhave f4ad30c448 Merge branch '2.2.x' into 2.3.x
Closes gh-22006
2020-06-17 17:26:40 -07:00
Madhura Bhave 615cf63a82 Make MockBean resolve right type for abstract test class
Fixes gh-20916
2020-06-17 17:25:03 -07:00
Andy Wilkinson 2d1dffa3ad Correct additions to spring-boot-starter-parent's pom
Following the fix for gh-21989, spring-boot-starter-parent no longer
contains an <issueManagement> element. As a result the additional
content was no longer being added to the pom. This commit updates
the additions so that they are now added after the <scm> element
that is still present.

See gh-21989
2020-06-17 11:51:54 +01:00
Andy Wilkinson a6954614b2 Minimize contents of poms that are an ancestor of a user's pom
Fixes gh-21989
2020-06-17 09:54:53 +01:00
Andy Wilkinson 0de466e06e Require dependency on s-b-dependencies to use its constraints
Previously, Spring Boot's modules published Gradle Module Metadata
(GMM) the declared a platform dependency on spring-boot-dependencies.
This provided versions for each module's own dependencies but also had
they unwanted side-effect of pulling in spring-boot-dependencies
constraints which would influence the version of other dependencies
declared in the same configuration. This was undesirable as users
should be able to opt in to this level of dependency management, either
by using the dependency management plugin or by using Gradle's built-in
support via a platform dependency on spring-boot-dependencies.

This commit reworks how Spring Boot's build uses
spring-boot-dependencies and spring-boot-parent to provide its own
dependency management. Configurations that aren't seen by consumers are
configured to extend a dependencyManagement configuration that has an
enforced platform dependency on spring-boot-parent. This enforces
spring-boot-parent's version constraints on Spring Boot's build without
making them visible to consumers. To ensure that the versions that
Spring Boot has been built against are visible to consumers, the
Maven publication that produces pom files and GMM for the published
modules is configured to use the resolved versions from the module's
runtime classpath.

Fixes gh-21911
2020-06-16 08:50:21 +01:00
Stephane Nicoll e30b8bf742 Start building against Reactor Dysprosium-SR9 snapshots
See gh-21938
2020-06-16 07:58:28 +02:00
Stephane Nicoll a6beee9be3 Merge branch '2.2.x' into 2.3.x 2020-06-16 07:58:06 +02:00
Stephane Nicoll 58974ab9cf Start building against Reactor Dysprosium-SR9 snapshots
See gh-21937
2020-06-16 07:57:31 +02:00
Scott Frederick 6119d69679 Add runImage option for image building
This commit adds a runImage property to the Maven plugin build-image
goal and the Gradle bootBuildImage task. The property allows the user
to override the run image reference provided in the builder metadata
with an alternate run image. The runImage property can be specified
in the build file or on the command line.

Fixes gh-21534
2020-06-15 16:08:56 -05:00
Phillip Webb 025d7aaac8 Merge branch '2.2.x' into 2.3.x 2020-06-15 10:53:00 -07:00
Phillip Webb 550b2847c5 Merge branch '2.1.x' into 2.2.x 2020-06-15 10:52:50 -07:00
Phillip Webb b129a3f7fb Check that a distribution has been started
Update the releasescript to ensure that a distribution has been started
before starting it again. This functionality was accidentally removed
during the updates for gh-21474.

See gh-21474
2020-06-15 10:50:06 -07:00
Madhura Bhave 847d633097 Merge branch '2.2.x' into 2.3.x 2020-06-15 09:23:47 -07:00
Madhura Bhave 0395b186ad Merge branch '2.1.x' into 2.2.x 2020-06-15 09:23:26 -07:00
Madhura Bhave 9d9a90ccd4 Polish 2020-06-15 09:22:14 -07:00
Brian Clozel a480f6e2ee Polish 2020-06-15 18:21:36 +02:00
Brian Clozel af2666df79 Fix welcome page support in WebFlux
Prior to this commit, the welcome page support implemented in gh-9785
would override existing index views in both annotation and functional
variants.

This comes from the fact that the feature was implemented as a
`RouterFunction` configured in the main `RouterFunctionMapping` bean.
Due to ordering issues between mappings, this would override existing
application mappings in some cases.

This commit ensures that the welcome page `RouterFunction` is
contributed to the context in its own handler mapping, ordered after the
application ones.

Fixes gh-21909
2020-06-15 18:03:55 +02:00
Stephane Nicoll 7500f0f22d Add section about Kafka metrics support
Closes gh-21910
2020-06-15 09:18:40 +02:00
Stephane Nicoll ee250e058a Merge branch '2.2.x' into 2.3.x
Closes gh-21916
2020-06-15 08:41:44 +02:00
Stephane Nicoll 04639d3387 Merge pull request #21906 from lltx
* pr/21906:
  Update copyright year of changed files
  Fix wrong property reference to keys-to-sanitize in Javadoc

Closes gh-21906
2020-06-15 08:40:02 +02:00
Stephane Nicoll ec8c1e3860 Update copyright year of changed files
See gh-21906
2020-06-15 08:39:51 +02:00
lltx de897b9b72 Fix wrong property reference to keys-to-sanitize in Javadoc
See gh-21906
2020-06-15 08:39:51 +02:00
Stephane Nicoll 676cd10dbf Fix encoding of @Bean in reference documentation
Closes gh-21908
2020-06-15 08:32:26 +02:00
Phillip Webb 1604545727 Ensure AvailabilityChangeEvent carries generics
Update `AvailabilityChangeEvent` to be a `PayloadEvent` and ensure
that the `getResolvableType` method returns a generic compatible
result.

Prior to this commit, a ClassCastExeption would be thrown if the
following event listener was declared:

  @EventListener
  void onEvent(AvailabilityChangeEvent<ReadinessState> event) {
    ...
  }

Closes gh-21898
2020-06-12 10:50:00 -07:00
Phillip Webb a65ca7ac2f Merge branch '2.2.x' into 2.3.x 2020-06-11 23:25:16 -07:00
Phillip Webb 209c5c4013 Merge branch '2.1.x' into 2.2.x 2020-06-11 23:19:16 -07:00
Phillip Webb 6d93d732b4 Cherry-pick release script updates
Cherry-pick release script updates from 2.3.x

See gh-21474
2020-06-11 23:15:10 -07:00
Phillip Webb 1706ae29f5 Support octet-stream response from sonatype
See gh-21474
2020-06-11 22:56:43 -07:00
Phillip Webb dbda2d0b92 Improve release script logging
Improve logging and fix a few issue with the release script.

See gh-21474
2020-06-11 22:29:50 -07:00
Phillip Webb ce011ca384 Check if promotion has already occurred
Update the release tooling to check for bintray published artifacts
using SHA256 digests and to also check before attempting a promote.

See gh-21474
2020-06-11 21:08:59 -07:00
Phillip Webb d650c5fdf2 Polish 2020-06-11 21:08:52 -07:00
Spring Buildmaster e3d26b70dd Next development version (v2.3.2.BUILD-SNAPSHOT) 2020-06-11 23:15:05 +00:00
Phillip Webb 069d2769f4 Reinstate disabled Reactor Netty test
Reinstate test now that we are on a reactor-netty releases that fixes
reactor/reactor-netty issue 1093.

Closes gh-21437
2020-06-11 14:52:21 -07:00
Phillip Webb 2a37b2e258 Refine PropertiesLauncher close logic
Further attempt to fix Windows file issues.

See gh-21575
2020-06-11 13:25:56 -07:00
Phillip Webb 1e7da4d3ca Allow digest builder references
Update `BuildRequest` to also allow digest based references.

Closes gh-21879
2020-06-11 12:31:29 -07:00
Phillip Webb 8a249daf1a Refactor PropertiesLauncher so jars can be closed
Refactor the internals of `PropertiesLauncher` so that opened jar files
are tracked and can be closed after a test completes.

See gh-21575
2020-06-11 12:26:08 -07:00