Commit Graph

27018 Commits (d5385a7b6476337fde6189b5341d86320df1aaee)
 

Author SHA1 Message Date
Stephane Nicoll d5385a7b64 Merge branch '2.2.x' into 2.3.x
Closes gh-22023
4 years ago
Stephane Nicoll 97af782ee6 Merge pull request #22000 from mla-mpensdavila
* pr/22000:
  Polish "Document how to exclude an annotation processor with Maven"
  Document how to exclude an annotation processor with Maven

Closes gh-22000
4 years ago
Stephane Nicoll 9b803af3c3 Polish "Document how to exclude an annotation processor with Maven"
See gh-22000
4 years ago
Marco Pens 627c0b1031 Document how to exclude an annotation processor with Maven
See gh-22000
4 years ago
Andy Wilkinson 136c9b1af8 Merge branch '2.2.x' into 2.3.x
Closes gh-22020
4 years ago
Andy Wilkinson 1e97ff834e Only consider current context when finding lifecycle processor
Previously, LifecycleAutoConfiguration would check the current context
and all of its ancestors for a lifecycle processor bean, only
configuring a custom processor if one was not found. Every context
has a lifecycle processor so this check meant that lifecycle processing
timeout could not be customized in any context with a parent.

This commit updates the auto-configuration to only check the current
context.

Closes gh-22014
4 years ago
Andy Wilkinson f656083007 Merge pull request #21988 from tszmytka
* gh-21988:
  Polish "Use Awaitility instead of Thread.sleep"
  Use Awaitility instead of Thread.sleep

Closes gh-21988
4 years ago
Andy Wilkinson 41173f7c40 Polish "Use Awaitility instead of Thread.sleep"
See gh-21988
4 years ago
Tomek Szmytka c13385ea74 Use Awaitility instead of Thread.sleep
See gh-21988
4 years ago
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
4 years ago
Andy Wilkinson 63423e7d71 Merge branch '2.2.x' into 2.3.x 4 years ago
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
4 years ago
Andy Wilkinson ce907b129c Merge branch '2.2.x' into 2.3.x
Closes gh-22010
4 years ago
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
4 years ago
Andy Wilkinson 8a7c32fff7 Prevent oauth2-oidc-sdk from downgrading json-smart in Maven projects
Fixes gh-21939
4 years ago
Stephane Nicoll c3678dff53 Merge pull request #21986 from dreis2211
* pr/21986:
  Use lazy lambda instead of explicit argument

Closes gh-21986
4 years ago
dreis2211 855d596c2a Use lazy lambda instead of explicit argument
See gh-21986
4 years ago
Andy Wilkinson ab51f3a0a4 Merge branch '2.2.x' into 2.3.x
Closes gh-22004
4 years ago
Andy Wilkinson 73a1047ad2 Merge branch '2.1.x' into 2.2.x
Closes gh-22005
4 years ago
Andy Wilkinson db634d762e Update CI images to use ubuntu:bionic-20200526
Closes gh-22003
4 years ago
Andy Wilkinson 8f7d71ca11 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 907b64a5eb Remove redundant stop() calls from LiveReloadServerTests 4 years ago
Madhura Bhave f4ad30c448 Merge branch '2.2.x' into 2.3.x
Closes gh-22006
4 years ago
Madhura Bhave 615cf63a82 Make MockBean resolve right type for abstract test class
Fixes gh-20916
4 years ago
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
4 years ago
Andy Wilkinson a6954614b2 Minimize contents of poms that are an ancestor of a user's pom
Fixes gh-21989
4 years ago
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
4 years ago
Stephane Nicoll e30b8bf742 Start building against Reactor Dysprosium-SR9 snapshots
See gh-21938
4 years ago
Stephane Nicoll a6beee9be3 Merge branch '2.2.x' into 2.3.x 4 years ago
Stephane Nicoll 58974ab9cf Start building against Reactor Dysprosium-SR9 snapshots
See gh-21937
4 years ago
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
4 years ago
Phillip Webb 025d7aaac8 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 550b2847c5 Merge branch '2.1.x' into 2.2.x 4 years ago
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
4 years ago
Madhura Bhave 847d633097 Merge branch '2.2.x' into 2.3.x 4 years ago
Madhura Bhave 0395b186ad Merge branch '2.1.x' into 2.2.x 4 years ago
Madhura Bhave 9d9a90ccd4 Polish 4 years ago
Brian Clozel a480f6e2ee Polish 4 years ago
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
4 years ago
Stephane Nicoll 7500f0f22d Add section about Kafka metrics support
Closes gh-21910
4 years ago
Stephane Nicoll ee250e058a Merge branch '2.2.x' into 2.3.x
Closes gh-21916
4 years ago
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
4 years ago
Stephane Nicoll ec8c1e3860 Update copyright year of changed files
See gh-21906
4 years ago
lltx de897b9b72 Fix wrong property reference to keys-to-sanitize in Javadoc
See gh-21906
4 years ago
Stephane Nicoll 676cd10dbf Fix encoding of @Bean in reference documentation
Closes gh-21908
4 years ago
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
4 years ago
Phillip Webb a65ca7ac2f Merge branch '2.2.x' into 2.3.x 5 years ago
Phillip Webb 209c5c4013 Merge branch '2.1.x' into 2.2.x 5 years ago
Phillip Webb 6d93d732b4 Cherry-pick release script updates
Cherry-pick release script updates from 2.3.x

See gh-21474
5 years ago
Phillip Webb 1706ae29f5 Support octet-stream response from sonatype
See gh-21474
5 years ago