root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
28,930 Commits 24 Branches 372 Tags 283 MiB
Commit Graph

10905 Commits

Author SHA1 Message Date
Andy Wilkinson 3587ecb043 Merge branch '2.3.x' 2020-09-21 19:28:53 +01:00
Andy Wilkinson 0963218be1 Merge branch '2.2.x' into 2.3.x 2020-09-21 19:28:39 +01:00
Andy Wilkinson 0edf7cb9b9 Polish Log4j2 XML configuration tests 
See gh-22983
 2020-09-21 19:26:40 +01:00
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 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
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 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 07dc202966 Upgrade to Micrometer 1.5.5 
Closes gh-23393
 2020-09-17 13:02:23 +01:00
Andy Wilkinson ea5c6c2923 Polish BootstrapRegistry's javadoc 
See gh-23326
 2020-09-17 09:55:05 +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
Phillip Webb c284edde67 Update copyright year of changed files 2020-09-17 00:31:01 -07:00
Phillip Webb 1ae1436211 Refactor BootstrapRegistry support 
Refactor `BootstrapRegistry` support following initial prototype work
with the Spring Cloud team.

This update splits the `BootstrapRegistry` API into `BootstrapRegistry`,
`BootstrapContext` and  `ConfigurableBootstrapContext` interfaces and
moves it to the same package as `SpringApplication`.

A new `Bootstrapper` interface has been introduced that can be added
to the `SpringApplication` to customize the `BootstrapRegistry` before
it's used.

Closes gh-23326
 2020-09-17 00:31:00 -07:00
Phillip Webb 27095d9043 Polish 2020-09-17 00:31:00 -07:00
Phillip Webb 10ad53afbd Fix FailureAnalyzer package tangle 
Move `IncompatibleConfigurationFailureAnalyzer` to fix a package tangle.

Closes gh-23385
 2020-09-17 00:31:00 -07:00
Phillip Webb 6509310fdb Fix DefaultPropertiesPropertySource package tangle 
Relocate `DefaultPropertiesPropertySource` to fix a package tangle.

Closes gh-23383
 2020-09-17 00:31:00 -07:00
Stephane Nicoll 4d7339d189 Upgrade to Spring Session 2020.0.0-RC1 
Closes gh-23188
 2020-09-17 08:53:54 +02:00
Stephane Nicoll 3622fd5b04 Upgrade to Spring Session Dragonfruit-SR1 
Closes gh-23187
 2020-09-17 08:51:49 +02:00
Stephane Nicoll ab2115633f Upgrade to Micrometer 1.3.14 
Closes gh-23388
 2020-09-17 08:46:30 +02:00
Stephane Nicoll 35b33303d0 Upgrade to Spring Session Corn-SR4 
Closes gh-23186
 2020-09-17 08:45:52 +02:00
Stephane Nicoll 91c1d52fc1 Upgrade to Micrometer 1.1.18 
Closes gh-23384
 2020-09-17 07:40:59 +02:00
Stephane Nicoll db04672403 Upgrade to Spring Session Bean-SR12 
Closes gh-23185
 2020-09-17 07:37:14 +02:00
Stephane Nicoll f1438f3e67 Upgrade to Spring Batch 4.3.0-RC1 
Closes gh-23189
 2020-09-17 07:27:42 +02:00
Stephane Nicoll bb6d86d30b Upgrade to Spring Integration 5.4.0-M3 
Closes gh-23010
 2020-09-17 07:27:15 +02:00
Stephane Nicoll 06b842e29c Upgrade to Spring Kafka 2.6.1 
Closes gh-23382
 2020-09-17 07:26:40 +02:00
Stephane Nicoll a2be6e0817 Upgrade to Spring Kafka 2.5.6 
Closes gh-23199
 2020-09-17 07:25:09 +02:00
Stephane Nicoll e5d135c61c Upgrade to Spring Kafka 2.3.11 
Closes gh-23198
 2020-09-17 07:23:41 +02:00
Scott Frederick 86fa8144f5 Polish "Support authentication to private Docker registry" 
See gh-22972
 2020-09-16 16:04:21 -05:00
姜为 e8f555e13d Support authentication to private docker registry 
This commit adds the ability to configure Docker image registry
authentication credentials in the Maven and Gradle plugins. The
authentication credentials are passed to the Docker daemon with
all daemon API calls, and the daemon forwards the credentials to the
image registry when necessary. This makes it possible to use
builder and run images stored in a private Docker registry.

See gh-22972
 2020-09-16 16:03:40 -05:00
Andy Wilkinson d3d96f0417 Upgrade to Spring REST Docs 2.0.5.RELEASE 
Closes gh-23374
 2020-09-16 17:45:34 +01:00
Andy Wilkinson 5dbf6a3885 Merge branch '2.3.x' 
Closes gh-23377
 2020-09-16 17:39:25 +01:00
Andy Wilkinson d6586b8354 Merge branch '2.2.x' into 2.3.x 
Closes gh-23376
 2020-09-16 17:39:08 +01:00
Andy Wilkinson e87e52d035 Merge branch '2.1.x' into 2.2.x 
Closes gh-23375
 2020-09-16 17:38:02 +01:00
Andy Wilkinson 106968a115 Upgrade to Spring REST Docs 2.0.5.RELEASE 
Closes gh-23374
 2020-09-16 17:36:34 +01:00
Stephane Nicoll 32bf5b6e89 Upgrade to Spring AMQP 2.3.0-M3 
Closes gh-23011
 2020-09-16 18:27:44 +02:00
Stephane Nicoll 7a7aef80d9 Upgrade to Spring AMQP 2.2.11 
Closes gh-23373
 2020-09-16 18:24:53 +02:00
Stephane Nicoll 9ab8ad6e74 Upgrade to Spring AMQP 2.2.11 
Closes gh-23372
 2020-09-16 18:23:06 +02:00
Stephane Nicoll 9a09a3c570 Upgrade to Spring AMQP 2.1.17 
Closes gh-23371
 2020-09-16 18:20:34 +02:00
Stephane Nicoll 29c7e62137 Upgrade to Spring Data 2020.0.0-RC1 
Closes gh-23197
 2020-09-16 15:47:38 +02:00
Stephane Nicoll 68ea2ca210 Upgrade to Spring Data Neumann-SR4 
Closes gh-23196
 2020-09-16 15:45:46 +02:00
Stephane Nicoll bac5a7909e Upgrade to Spring Data Moore-SR10 
Closes gh-23195
 2020-09-16 15:44:25 +02:00
Stephane Nicoll b1e47811af Upgrade to Spring Data Lovelace-SR20 
Closes gh-23194
 2020-09-16 15:40:09 +02:00
dreis2211 5c4b4b0466 Document that Java 15 is a supported version 
See gh-22366
 2020-09-16 15:35:02 +02:00
Stephane Nicoll 474ab7f69c Adapt tests to deprecations in Spring Batch 2020-09-16 15:22:32 +02:00
Stephane Nicoll 28b0f64e9f Upgrade to Mockito 3.5.10 
Closes gh-23368
 2020-09-16 14:56:53 +02:00
Stephane Nicoll fa03f75d21 Upgrade to Undertow 2.2.0.Final 
Closes gh-23367
 2020-09-16 14:40:12 +02:00
Stephane Nicoll 777a4e988b Upgrade to Thymeleaf Layout Dialect 2.5.1 
Closes gh-23366
 2020-09-16 14:05:31 +02:00
Stephane Nicoll 25e49471a9 Upgrade to SnakeYAML 1.27 
Closes gh-23365
 2020-09-16 14:05:30 +02:00
Stephane Nicoll 5fab583220 Upgrade to Postgresql 42.2.16 
Closes gh-23364
 2020-09-16 14:05:28 +02:00
Stephane Nicoll 7ea48730d2 Upgrade to Pooled JMS 1.2.0 
Closes gh-23363
 2020-09-16 14:05:27 +02:00
Stephane Nicoll 8c17153736 Upgrade to InfluxDB Java 2.20 
Closes gh-23362
 2020-09-16 14:05:25 +02:00
Stephane Nicoll 3e736ccf9f Upgrade to Artemis 2.15.0 
Closes gh-23361
 2020-09-16 14:05:24 +02:00
Stephane Nicoll 35a2241c10 Upgrade to Lettuce 6.0.0.RC2 
Closes gh-23360
 2020-09-16 13:56:09 +02:00
Stephane Nicoll ac1165dc03 Upgrade to Tomcat 9.0.38 
Closes gh-23359
 2020-09-16 13:31:09 +02:00
Stephane Nicoll 7b8c19fceb Upgrade to Spring WS 3.0.10.RELEASE 
Closes gh-23358
 2020-09-16 13:31:07 +02:00
Stephane Nicoll 86df27c844 Upgrade to SendGrid 4.6.4 
Closes gh-23357
 2020-09-16 13:31:06 +02:00
Stephane Nicoll e451c1fbf5 Upgrade to R2DBC Bom Arabba-SR7 
Closes gh-23356
 2020-09-16 13:31:04 +02:00
Stephane Nicoll a44424b881 Upgrade to Nimbus JOSE JWT 9.0.1 
Closes gh-23355
 2020-09-16 13:31:03 +02:00
Stephane Nicoll 6a808ee813 Upgrade to OAuth2 OIDC SDK 8.19.2 
Closes gh-23354
 2020-09-16 13:28:32 +02:00
Stephane Nicoll 21fd33b945 Upgrade to Netty tcNative 2.0.34.Final 
Closes gh-23353
 2020-09-16 13:28:32 +02:00
Stephane Nicoll 2c6da2364b Upgrade to Netty 4.1.52.Final 
Closes gh-23352
 2020-09-16 13:28:32 +02:00
Stephane Nicoll 91cc283c39 Upgrade to JUnit Jupiter 5.7.0 
Closes gh-23351
 2020-09-16 13:28:31 +02:00
Stephane Nicoll f3087d09e5 Upgrade to Hibernate 5.4.21.Final 
Closes gh-23350
 2020-09-16 11:53:46 +02:00
Stephane Nicoll 2cb5966d00 Upgrade to Hazelcast 3.12.9 
Closes gh-23349
 2020-09-16 11:53:44 +02:00
Stephane Nicoll f00183281b Upgrade to Flyway 6.5.5 
Closes gh-23348
 2020-09-16 11:53:43 +02:00
Stephane Nicoll d1147207c6 Upgrade to Elasticsearch 7.9.1 
Closes gh-23347
 2020-09-16 11:53:40 +02:00
Stephane Nicoll 04c5a3f166 Upgrade to Ehcache3 3.9.0 
Closes gh-23346
 2020-09-16 11:53:39 +02:00
Stephane Nicoll 73b3cede6d Upgrade to Couchbase Client 3.0.8 
Closes gh-23345
 2020-09-16 11:53:37 +02:00
Stephane Nicoll 72bdcf63b8 Upgrade to Commons Codec 1.15 
Closes gh-23344
 2020-09-16 11:53:36 +02:00
Stephane Nicoll 149942dac0 Upgrade to Cassandra Driver 4.9.0 
Closes gh-23343
 2020-09-16 11:53:34 +02:00
Stephane Nicoll 6a12dcdd20 Upgrade to AppEngine SDK 1.9.82 
Closes gh-23342
 2020-09-16 11:53:32 +02:00
Stephane Nicoll 8faa08f585 Merge branch '2.2.x' into 2.3.x 
Closes gh-23341
 2020-09-16 11:43:43 +02:00
Stephane Nicoll 15dd780eb4 Upgrade to Spring WS 3.0.10.RELEASE 
Closes gh-23339
 2020-09-16 10:10:17 +02:00
Stephane Nicoll e5af0d51aa Upgrade to Spring HATEOAS 1.1.2.RELEASE 
Closes gh-23338
 2020-09-16 10:10:15 +02:00
Stephane Nicoll 83d9385946 Upgrade to Lettuce 5.3.4.RELEASE 
Closes gh-23337
 2020-09-16 10:10:14 +02:00
Stephane Nicoll d7a5d44a75 Upgrade to Spring Ws 3.0.10.RELEASE 
Closes gh-23336
 2020-09-16 10:02:17 +02:00
Stephane Nicoll d5aeb828e6 Upgrade to Neo4j Ogm 3.2.16 
Closes gh-23335
 2020-09-16 10:02:15 +02:00
Stephane Nicoll 3f520f18d7 Upgrade to Tomcat 9.0.38 
Closes gh-23334
 2020-09-16 10:02:14 +02:00
Stephane Nicoll 297735a7e7 Upgrade to Spring Ws 3.0.10.RELEASE 
Closes gh-23333
 2020-09-16 09:56:25 +02:00
Stephane Nicoll b37d79a07e Upgrade to Neo4j Ogm 3.1.22 
Closes gh-23332
 2020-09-16 09:56:24 +02:00