Commit Graph

33172 Commits

Author SHA1 Message Date
Andy Wilkinson
5a3232d681 Merge branch '2.3.x'
Closes gh-23430
2020-09-21 15:21:17 +01:00
Andy Wilkinson
13e08a4344 Merge branch '2.2.x' into 2.3.x
Closes gh-23428
2020-09-21 15:15:08 +01:00
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
2020-09-21 15:08:41 +01:00
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
2020-09-21 13:22:03 +01:00
Andy Wilkinson
9ecc548672 Merge branch '2.3.x'
Closes gh-23427
2020-09-21 12:16:28 +01:00
Andy Wilkinson
8667e9ded8 Merge branch '2.2.x' into 2.3.x
Closes gh-23426
2020-09-21 12:16:14 +01:00
Andy Wilkinson
581190d7a0 Test the Gradle plugin against 6.7-rc-1
Closes gh-23425
2020-09-21 12:14:35 +01:00
Andy Wilkinson
0f2ddd6480 Merge branch '2.3.x'
Closes gh-23423
2020-09-21 10:47:34 +01:00
Andy Wilkinson
d06af28cd8 Merge branch '2.2.x' into 2.3.x
Closes gh-23422
2020-09-21 10:47:06 +01:00
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
2020-09-21 10:46:53 +01:00
Andy Wilkinson
360e29af48 Polish "Add note about Kotlin main class name"
See gh-23418
2020-09-21 10:40:29 +01:00
Sebastiaan Fernandez
0bde5fda9b Add note about Kotlin main class name
See gh-23418
2020-09-21 10:36:16 +01:00
Andy Wilkinson
fee1e3aa2b Polish javadoc of LoggingSystemFactory
See gh-23387
2020-09-20 17:03:17 +01:00
Andy Wilkinson
387d7abbe7 Merge branch '2.3.x' 2020-09-20 17:01:04 +01:00
Andy Wilkinson
8eb7815a4d Merge branch '2.2.x' into 2.3.x 2020-09-20 17:00:46 +01:00
Andy Wilkinson
a8c179e922 Merge branch '2.1.x' into 2.2.x
Closes gh-23416
2020-09-20 16:58:40 +01:00
Andy Wilkinson
4ed7febc47 Upgrade to Gradle Enterprise Maven Extension 1.6.6
Closes gh-23415
2020-09-20 16:58:05 +01:00
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
2020-09-19 14:21:04 -07:00
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
2020-09-18 13:51:20 -05:00
Andy Wilkinson
1c6e37b2ac Merge branch '2.3.x'
Closes gh-23409
2020-09-18 13:33:18 +01:00
Andy Wilkinson
55bfef9901 Merge branch '2.2.x' into 2.3.x
Closes gh-23408
2020-09-18 13:32:46 +01:00
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
2020-09-18 13:03:24 +01:00
Andy Wilkinson
d2fae6e19e Merge branch '2.3.x'
Closes gh-23407
2020-09-18 09:09:53 +01:00
Andy Wilkinson
3861ef13fb Merge branch '2.2.x' into 2.3.x
Closes gh-23406
2020-09-18 09:09:41 +01:00
Andy Wilkinson
5ec673ff2a Add anchors to section headers in Gradle plugin docs
Fixes gh-23402
2020-09-18 09:06:54 +01:00
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
2020-09-17 12:37:19 -07:00
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
2020-09-17 11:23:59 -07:00
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
2020-09-17 16:37:12 +01:00
dreis2211
f85fe952fc Upgrade Java 15 CI image to use the Java 15 GA build
See gh-23391
2020-09-17 16:36:36 +01:00
Andy Wilkinson
46cd48737f Merge branch '2.3.x' 2020-09-17 15:17:11 +01:00
Spring Buildmaster
f466ea1f2a Next development version (v2.3.5.BUILD-SNAPSHOT) 2020-09-17 13:14:51 +00:00
Andy Wilkinson
aaf25d3aab Upgrade to SendGrid 4.6.5
Closes gh-23397
2020-09-17 13:22:11 +01:00
Andy Wilkinson
7957e246fc Upgrade to Micrometer 1.5.5
Closes gh-23396
2020-09-17 13:22:10 +01:00
Andy Wilkinson
ac9abab921 Upgrade to Flyway 6.5.6
Closes gh-23395
2020-09-17 13:22:08 +01:00
Andy Wilkinson
ab64067545 Merge branch '2.3.x'
Closes gh-23394
2020-09-17 13:02:47 +01:00
Andy Wilkinson
07dc202966 Upgrade to Micrometer 1.5.5
Closes gh-23393
2020-09-17 13:02:23 +01:00
Andy Wilkinson
e93e267679 Merge branch '2.3.x' 2020-09-17 12:52:09 +01:00
Andy Wilkinson
6e369c9505 Merge branch '2.2.x' into 2.3.x 2020-09-17 12:51:56 +01:00
Spring Buildmaster
bd8300cb6b Next development version (v2.2.11.BUILD-SNAPSHOT) 2020-09-17 11:04:48 +00:00
Andy Wilkinson
ea5c6c2923 Polish BootstrapRegistry's javadoc
See gh-23326
2020-09-17 09:55:05 +01:00
Andy Wilkinson
986a9a49a3 Merge branch '2.3.x' 2020-09-17 09:48:02 +01:00
Andy Wilkinson
16ff7022db Merge branch '2.2.x' into 2.3.x 2020-09-17 09:47:18 +01:00
Andy Wilkinson
c23e420914 Merge branch '2.1.x' into 2.2.x 2020-09-17 09:47:06 +01:00
Andy Wilkinson
dbd27839e5 Polish logging in BintrayService 2020-09-17 09:46:39 +01:00
Phillip Webb
99dc7914b2 Attempt to fix ConcurrentModificationException
Attempt to fix `ConcurrentModificationException` which occurs on
Java 11+.

See gh-23326
2020-09-17 01:41:39 -07:00
Andy Wilkinson
cad079ce7d Merge branch '2.3.x' 2020-09-17 09:36:05 +01:00
Andy Wilkinson
0fd61c1a14 Merge branch '2.2.x' into 2.3.x 2020-09-17 09:35:55 +01:00
Andy Wilkinson
71e3844460 Merge branch '2.1.x' into 2.2.x 2020-09-17 09:35:41 +01:00
Spring Buildmaster
cb4eb929f6 Next development version (v2.1.18.BUILD-SNAPSHOT) 2020-09-17 07:33:44 +00:00
Phillip Webb
c284edde67 Update copyright year of changed files 2020-09-17 00:31:01 -07:00