Commit Graph

29093 Commits (2577c671857d5478bbfcbe7168b9f85415d56b3a)
 

Author SHA1 Message Date
Phillip Webb be00bbcf41 Merge branch '2.1.x' into 2.2.x 4 years ago
Phillip Webb 3da300fba9 Remove unused CI parameter 4 years ago
Phillip Webb de5a5abc7e Merge branch '2.3.x' 4 years ago
Phillip Webb a47bc41fe3 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb e8d24948d5 Merge branch '2.1.x' into 2.2.x 4 years ago
Phillip Webb b0cc5fba4e Use per-branch CI images
Closes gh-23439
4 years ago
Phillip Webb 5a323aba6a Merge branch '2.3.x' 4 years ago
Phillip Webb 945347c944 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 15f2186aaf Add Java 15 to download script
See gh-23433
4 years ago
Phillip Webb bd23aa0824 Merge branch '2.3.x' 4 years ago
Phillip Webb b59b28767b Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb e6ebcf1429 Upgrade Java version used in CI from 14 to 15
Closes gh-23433
4 years ago
Phillip Webb 3bcbb0e594 Merge pull request #21704 from unix1982
* pr/21704:
  Polish 'Add origin support for empty YAML list and map'
  Add origin support for empty YAML list and map

Closes gh-21704
4 years ago
Phillip Webb bd2a252101 Polish 'Add origin support for empty YAML list and map'
See gh-21704
4 years ago
heinz f18d564add Add origin support for empty YAML list and map
Update `OriginTrackedYamlLoader` to better deal with empty maps
and collections.

See gh-21704
4 years ago
Phillip Webb c885a15aea Allow binding when 'is' method also exists
Improve the `JavaBeanBinder` so that an bean that has both a `get` and
`is` method can still be bound.

Closes gh-23007
4 years ago
Phillip Webb fde2e440bb Add missing registration convenience methods
Update `BootstrapContext` with convenience methods that help if the
type has not been registered.

Closes gh-23438
4 years ago
Phillip Webb 0df37302af Make ConfigData Resolvers/Loaders public
Change the visibility of our own ConfigDataLocationResolver and
ConfigDataLoader classes so that they can be created outside of
`spring.factories`.

Closes gh-23434
4 years ago
Andy Wilkinson 3587ecb043 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 0963218be1 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 0edf7cb9b9 Polish Log4j2 XML configuration tests
See gh-22983
4 years ago
Andy Wilkinson 5a3232d681 Merge branch '2.3.x'
Closes gh-23430
4 years ago
Andy Wilkinson 13e08a4344 Merge branch '2.2.x' into 2.3.x
Closes gh-23428
4 years ago
Andy Wilkinson f6492cd0c0 Consume level and dateformat patterns as system props in Log4j config
Previously LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN were not
consumed as system properties in log4j2.xml and log4j2-file.xml. As a
result, the logging.pattern.level and logging.pattern.dateformat
configuration properties, which are translated into the
LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN system properties
respectively had no effect.

This commit updates the log4j2.xml and log4j2-file.xml config files to
consume LOG_LEVEL_PATTERN and LOG_DATEFORMAT_PATTERN as system
properties. When the system property is not set, the configuation falls
back to the default values specified in the config files. Tests for
both log4j2.xml and log4j2-file.xml to verify the behaviour have also
bean added.

Fixes gh-22983
4 years ago
Andy Wilkinson 9f21413000 Stop applying MeterFilters to auto-configured composite registry
Previously, all MeterFilter beans were applied to all MeterRegistry
beans. As a result, when a composite registry was auto-configured, both
the composite and all of its delegates would have the same MeterFilters
applied. This made it impossible for one of the delegate registries to
have a locally-configured filter that would allow a meter that would be
denied by one of the MeterFilter beans applied to the composite.

This commit update MeterRegistryConfigurer to skips the auto-configured
composite meter registry when applying MeterFilter beans to
MeterRegistry beans. As a result, the composite's filters will no
longer deny a meter before it reaches a delegate that would have
accepted it due to one of its locally-configured filters.

Closes gh-23381
4 years ago
Andy Wilkinson 9ecc548672 Merge branch '2.3.x'
Closes gh-23427
4 years ago
Andy Wilkinson 8667e9ded8 Merge branch '2.2.x' into 2.3.x
Closes gh-23426
4 years ago
Andy Wilkinson 581190d7a0 Test the Gradle plugin against 6.7-rc-1
Closes gh-23425
4 years ago
Andy Wilkinson 0f2ddd6480 Merge branch '2.3.x'
Closes gh-23423
4 years ago
Andy Wilkinson d06af28cd8 Merge branch '2.2.x' into 2.3.x
Closes gh-23422
4 years ago
Andy Wilkinson 3a3e240924 Merge pull request #23418 from fernandezseb
* gh-23418:
  Polish "Add note about Kotlin main class name"
  Add note about Kotlin main class name

Closes gh-23418
4 years ago
Andy Wilkinson 360e29af48 Polish "Add note about Kotlin main class name"
See gh-23418
4 years ago
Sebastiaan Fernandez 0bde5fda9b Add note about Kotlin main class name
See gh-23418
4 years ago
Andy Wilkinson fee1e3aa2b Polish javadoc of LoggingSystemFactory
See gh-23387
4 years ago
Andy Wilkinson 387d7abbe7 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 8eb7815a4d Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson a8c179e922 Merge branch '2.1.x' into 2.2.x
Closes gh-23416
4 years ago
Andy Wilkinson 4ed7febc47 Upgrade to Gradle Enterprise Maven Extension 1.6.6
Closes gh-23415
4 years ago
Phillip Webb 8f5959ba1d Fix LoggingSystem package tangle
Introduce a new `LoggingSystemFactory` interface so that the
`LoggingSystem` class can find implementations without needing to
be directly tied to them.

Closes gh-23387
4 years ago
Scott Frederick 54288678d1 Configure Docker host in build plugins
This commit adds the ability to configure the Maven and Gradle
plugins to use a remote Docker daemon using build file
configuration, as an alternative to setting environment variables
to specify remote host connection details.

Fixes gh-23400
4 years ago
Andy Wilkinson 1c6e37b2ac Merge branch '2.3.x'
Closes gh-23409
4 years ago
Andy Wilkinson 55bfef9901 Merge branch '2.2.x' into 2.3.x
Closes gh-23408
4 years ago
Andy Wilkinson 95f26c6358 Configure Flyway with initSqls for any DataSource configuration
Previously, spring.flyway.init-sqls was only applied to Flyway's
configuration if Flyway was being configured to create the DataSource.
If Flyway was being configured to use an existing DataSource, init-sqls
was not applied. This is a hangover from when the init SQLs support was
introduced. At that time, Flyway only supported SQL to initialize the
connection when it was creating the DataSource. Flyway 5.2 added init
SQL support no matter how Flyway's DataSource was configured.

This commit updates FlywayAutoConfiguration to always apply the
init-sqls property to Flyway's configuration. The property's
documentation does not describe the current limitation so this change
should align the behaviour with what the documentation leads people to
expect.

Fixes gh-23392
4 years ago
Andy Wilkinson d2fae6e19e Merge branch '2.3.x'
Closes gh-23407
4 years ago
Andy Wilkinson 3861ef13fb Merge branch '2.2.x' into 2.3.x
Closes gh-23406
4 years ago
Andy Wilkinson 5ec673ff2a Add anchors to section headers in Gradle plugin docs
Fixes gh-23402
4 years ago
Phillip Webb 35673b7472 Add Binder to BootstrapContext
Update `ConfigDataEnvironment` so that it adds the initial `Binder`
to the `BootstrapContext` for `Bootstrappers` to use.

Closes gh-23401
4 years ago
Phillip Webb 8b8d5ccb10 Allow trailing whitespace document split marker
Refine `OriginTrackedPropertiesLoader` document split detection to be
more lenient if there is trailing whitespace.

Closes gh-23399
4 years ago
Andy Wilkinson 90483d343f Merge pull request #23391 from dreis2211
* gh-23391:
  Upgrade Java 15 CI image to use the Java 15 GA build

Closes gh-23391
4 years ago
dreis2211 f85fe952fc Upgrade Java 15 CI image to use the Java 15 GA build
See gh-23391
4 years ago