Commit Graph

11061 Commits

Author SHA1 Message Date
Phillip Webb 4945806d84 Make `StringSequence.isEmpty()` public
Make `StringSequence.isEmpty()` public for compatibility with JDK 15.

Closes gh-23440
2020-09-21 22:26:20 -07:00
Phillip Webb bd2a252101 Polish 'Add origin support for empty YAML list and map'
See gh-21704
2020-09-21 16:45:16 -07:00
heinz f18d564add Add origin support for empty YAML list and map
Update `OriginTrackedYamlLoader` to better deal with empty maps
and collections.

See gh-21704
2020-09-21 16:44:22 -07:00
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
2020-09-21 16:35:54 -07:00
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
2020-09-21 16:08:36 -07:00
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
2020-09-21 15:36:04 -07:00
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
Stephane Nicoll 9f3b3504ef Upgrade to Tomcat 9.0.38
Closes gh-23331
2020-09-16 09:56:22 +02:00
Phillip Webb 43010ebf47 Merge branch '2.3.x'
Closes gh-23329
2020-09-16 00:28:57 -07:00
Phillip Webb f590225c82 Merge branch '2.2.x' into 2.3.x
Closes gh-23328
2020-09-16 00:28:29 -07:00
Phillip Webb bd87ba33d0 Use ephemeral ports for RSocket tests
Closes gh-23325
2020-09-16 00:15:19 -07:00
Phillip Webb 5f49d4a8d7 Rename @ConfigurationPropertiesImport
Rename `@ConfigurationPropertiesImport` to
`@ImportAsConfigurationPropertiesBean` and also refine the registrar
so that it can be used with type directly annotated with
`@ConfigurationProperties`.

Closes gh-23172
2020-09-15 11:36:00 -07:00
Stephane Nicoll 7d5f33170e Upgrade to Spring Framework 5.3 RC1
Closes gh-23170
2020-09-15 17:52:31 +02:00
Phillip Webb 5b74d464a6 Merge branch '2.3.x' 2020-09-15 08:48:51 -07:00
Phillip Webb 5c1055dc22 Merge branch '2.2.x' into 2.3.x 2020-09-15 08:48:25 -07:00
Phillip Webb 195def0ec3 Merge branch '2.1.x' into 2.2.x 2020-09-15 08:48:00 -07:00
Phillip Webb e0030094e2 Fix missing jar entry certificates
Ensure that the source jar entry is closed before reading
certificates and code signers from the entry.

gh-19041
2020-09-15 08:42:58 -07:00
Andy Wilkinson 55f939e93b Merge branch '2.3.x'
Closes gh-23321
2020-09-15 16:35:00 +01:00
Andy Wilkinson 409743eddb Merge branch '2.2.x' into 2.3.x
Closes gh-23320
2020-09-15 16:32:43 +01:00
Andy Wilkinson 5a266155b0 Disable proxyBeanMethods on Spring Session config sub-classes
Closes gh-23280
2020-09-15 16:32:15 +01:00
Stephane Nicoll 2df947cedb Upgrade to Undertow 2.1.4.Final
Closes gh-23318
2020-09-15 14:55:39 +02:00
Stephane Nicoll db3e81c5b7 Upgrade to Tomcat 9.0.38
Closes gh-23317
2020-09-15 14:55:39 +02:00
Stephane Nicoll 69576a3be2 Upgrade to R2DBC Bom Arabba-SR7
Closes gh-23316
2020-09-15 14:55:39 +02:00
Stephane Nicoll 3cb8a4fd5a Upgrade to Postgresql 42.2.16
Closes gh-23315
2020-09-15 14:55:39 +02:00
Stephane Nicoll 9bf7555dcf Upgrade to Netty tcNative 2.0.34.Final
Closes gh-23314
2020-09-15 14:55:38 +02:00
Stephane Nicoll 201bfd2b0c Upgrade to Netty 4.1.52.Final
Closes gh-23313
2020-09-15 14:55:38 +02:00
Stephane Nicoll 71607777b1 Upgrade to Neo4j OGM 3.2.16
Closes gh-23312
2020-09-15 14:25:31 +02:00
Stephane Nicoll 8738e05f59 Upgrade to Hibernate 5.4.21.Final
Closes gh-23311
2020-09-15 14:25:29 +02:00
Stephane Nicoll 9b3148ce3f Upgrade to Hazelcast 3.12.9
Closes gh-23310
2020-09-15 14:25:28 +02:00
Stephane Nicoll b1d33a3df9 Upgrade to Flatten Maven Plugin 1.2.5
Closes gh-23309
2020-09-15 14:25:27 +02:00
Stephane Nicoll c9f413edfb Upgrade to Couchbase Client 3.0.8
Closes gh-23308
2020-09-15 14:25:26 +02:00
Stephane Nicoll 94d5e11e7d Upgrade to AppEngine SDK 1.9.82
Closes gh-23307
2020-09-15 14:25:24 +02:00
Stephane Nicoll 5517cd06df Upgrade to Spring Framework 5.2.9
Closes gh-23183
2020-09-15 13:49:14 +02:00
Stephane Nicoll 95a33071ca Upgrade to Spring Framework 5.2.9
Closes gh-23182
2020-09-15 13:48:02 +02:00
Stephane Nicoll d73ee9d545 Upgrade to Spring Framework 5.1.18
Closes gh-23181
2020-09-15 13:45:51 +02:00
Andy Wilkinson 9d3c718bf3 Merge branch '2.3.x'
Closes gh-23306
2020-09-15 12:32:28 +01:00
Andy Wilkinson 53f2966b61 Merge branch '2.2.x' into 2.3.x
Closes gh-23305
2020-09-15 12:30:45 +01:00
Andy Wilkinson 5d20660c8a Disable proxyBeanMethods on all management context config classes
Fixes gh-23301
2020-09-15 12:30:32 +01:00
Stephane Nicoll 63268f33fe Upgrade to RSocket 1.1.0-M2
Closes gh-23214
2020-09-15 08:50:56 +02:00
Stephane Nicoll 688b0b7648 Upgrade to Reactor 2020.0.0-RC1
Closes gh-23065
2020-09-15 08:50:30 +02:00
Stephane Nicoll 2ee22d50b4 Upgrade to Reactor Dysprosium-SR12
Closes gh-23192
2020-09-15 08:48:35 +02:00
Stephane Nicoll bc9c6dc005 Upgrade to Reactor Dysprosium-SR12
Closes gh-23191
2020-09-15 08:46:17 +02:00
Stephane Nicoll a5905c5cb9 Upgrade to Reactor Californium-SR21
Closes gh-23190
2020-09-15 08:42:35 +02:00
Phillip Webb c857a743a0 Rename @ImportConfigurationPropertiesBean
Rename `@ImportConfigurationPropertiesBean` to
`@ConfigurationPropertiesImport`.

Closes gh-23172
2020-09-14 19:35:10 -07:00
Phillip Webb 433b357423 Merge branch '2.3.x' 2020-09-14 13:53:00 -07:00
Phillip Webb a249a1a3d1 Merge branch '2.2.x' into 2.3.x 2020-09-14 13:52:22 -07:00
Phillip Webb b8e6b2ef94 Merge branch '2.1.x' into 2.2.x 2020-09-14 13:51:24 -07:00
Phillip Webb 4138e59c33 Fix potential JarFileEntries ClassCastException
Update `JarFileEntries` so that the interface is obtained rather than
the concrete implementation. This allows `JarEntry` values to be used
without causing a ClassCastException.

Closes gh-19041
2020-09-14 13:48:59 -07:00
Andy Wilkinson 7562c4eb6f Adapt to WebClient's new exception wrapping
See spring-projects/spring-framework#23842
See gh-23170
2020-09-14 15:08:56 +01:00
Stephane Nicoll c5532cfac0 Upgrade to Spring Security 5.2.6.RELEASE
Closes gh-23299
2020-09-14 13:38:05 +02:00
Stephane Nicoll 4da461cf85 Upgrade to Spring Amqp 2.2.10.RELEASE
Closes gh-23298
2020-09-14 13:38:05 +02:00
Stephane Nicoll 1862eb4455 Upgrade to Postgresql 42.2.16
Closes gh-23297
2020-09-14 13:38:05 +02:00
Stephane Nicoll 0edd00c9d7 Upgrade to Neo4j Ogm 3.2.15
Closes gh-23296
2020-09-14 13:38:05 +02:00
Stephane Nicoll de38777397 Upgrade to Infinispan 9.4.20.Final
Closes gh-23295
2020-09-14 13:38:04 +02:00
Stephane Nicoll bf02b86f60 Upgrade to Hibernate 5.4.21.Final
Closes gh-23294
2020-09-14 13:38:04 +02:00
Stephane Nicoll 12d0835da0 Upgrade to Elasticsearch 6.8.12
Closes gh-23293
2020-09-14 13:38:04 +02:00
Stephane Nicoll 53ba03bdec Upgrade to Jetty 9.4.31.v20200723
Closes gh-23292
2020-09-14 13:38:04 +02:00
Stephane Nicoll 4125e5fc8f Upgrade to Byte Buddy 1.10.14
Closes gh-23291
2020-09-14 13:38:04 +02:00
Stephane Nicoll 0d12683a93 Upgrade to Undertow 2.0.31.Final
Closes gh-23290
2020-09-14 13:38:04 +02:00
Stephane Nicoll 67f3c3193d Upgrade to Rsocket 1.0.2
Closes gh-23289
2020-09-14 13:38:03 +02:00
Stephane Nicoll 1a676b154e Upgrade to Netty Tcnative 2.0.34.Final
Closes gh-23288
2020-09-14 13:38:03 +02:00
Stephane Nicoll f4a84d3b63 Upgrade to Netty 4.1.52.Final
Closes gh-23287
2020-09-14 13:37:57 +02:00
Stephane Nicoll a9f1441fcc Upgrade to Micrometer 1.3.12
Closes gh-23286
2020-09-14 13:12:09 +02:00
Stephane Nicoll 87fdccf4a0 Upgrade to Dropwizard Metrics 4.1.12.1
Closes gh-23285
2020-09-14 13:12:07 +02:00
Stephane Nicoll da9505cf01 Upgrade to Hazelcast 3.12.9
Closes gh-23284
2020-09-14 13:12:05 +02:00
Stephane Nicoll 5ce3aaefb2 Upgrade to Appengine Sdk 1.9.82
Closes gh-23283
2020-09-14 13:12:03 +02:00
Stephane Nicoll 492e1a4c0f Upgrade to Netty 4.1.52.Final
Closes gh-23269
2020-09-14 11:28:55 +02:00
Stephane Nicoll 3bd4337a4e Upgrade to Spring Security 5.1.12.RELEASE
Closes gh-23278
2020-09-14 10:41:44 +02:00
Stephane Nicoll 72a5b2353d Upgrade to Postgresql 42.2.16
Closes gh-23277
2020-09-14 10:41:43 +02:00
Stephane Nicoll 5c3947c64b Upgrade to Neo4j Ogm 3.1.21
Closes gh-23276
2020-09-14 10:41:40 +02:00
Stephane Nicoll c723b4e705 Upgrade to Infinispan 9.4.20.Final
Closes gh-23275
2020-09-14 10:41:25 +02:00
Stephane Nicoll 738613b889 Upgrade to Hibernate 5.3.18.Final
Closes gh-23274
2020-09-14 10:41:25 +02:00
Stephane Nicoll c608f4425d Upgrade to Jetty 9.4.31.v20200723
Closes gh-23273
2020-09-14 10:41:25 +02:00
Stephane Nicoll 9f0befbcb8 Upgrade to Undertow 2.0.31.Final
Closes gh-23272
2020-09-14 10:41:25 +02:00
Stephane Nicoll 78c1e105ee Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-23271
2020-09-14 10:41:24 +02:00
Stephane Nicoll 6d99776d9d Upgrade to Netty Tcnative 2.0.34.Final
Closes gh-23270
2020-09-14 10:41:20 +02:00
Stephane Nicoll e5a9a7ae83 Upgrade to Micrometer 1.1.17
Closes gh-23268
2020-09-14 09:47:49 +02:00
Stephane Nicoll fb935ecb8d Upgrade to Appengine Sdk 1.9.82
Closes gh-23267
2020-09-14 09:47:48 +02:00
Stephane Nicoll 76fd9a530c Upgrade to Jackson 2.9.10.20200824
Closes gh-23266
2020-09-14 09:47:47 +02:00
Phillip Webb 3a8c15af0d Merge branch '2.3.x'
Closes gh-23265
2020-09-13 22:50:28 -07:00
Phillip Webb 45275e6586 Merge branch '2.2.x' into 2.3.x
Closes gh-23264
2020-09-13 22:49:21 -07:00
Phillip Webb a20fdf8e6a Merge branch '2.1.x' into 2.2.x
Closes gh-23263
2020-09-13 22:45:39 -07:00
Phillip Webb 895ff9c72d Merge pull request #19041 from mathieufortin01
* pr/19041:
  Polish 'Fix signed jar performance issues'
  Fix signed jar performance issues
  Ignore Visual Studio Code Files

Closes gh-19041
2020-09-13 22:40:05 -07:00
Phillip Webb c6a9696dd1 Polish 'Fix signed jar performance issues'
Update the performance improvements to push certificate loading
and storage into the `JarFileEntries` class. This allows us to
keep certificates without needing to cache all entry data. We
now also keep certificates and code signers in a dedicated class
which is set whenever the full jar stream as been read, even if
the contained values are `null`. The logic that assumes META-INF
entries are not signed has been removed in favor of delegating to
the streamed entry results.

See gh-19041
2020-09-13 22:28:45 -07:00
mathieufortin01 4d053e15d8 Fix signed jar performance issues
Update Spring Boot nested JarFile support to improve the performance of
signed jars. Prior to this commit, `certificates` and `codeSigners`
were read by streaming the entire jar whenever the existing values
were `null`. Unfortunately, the contract for `getCertificates` and
get `getCodeSigners` states that `null` is a valid return value. This
meant that full jar streaming would occur whenever either method was
called on an entry that had no result. The problem was further
exacerbated by the fact that entries might not be cached.

See gh-19041
2020-09-13 22:14:03 -07:00
Phillip Webb a95dbb5d8f Merge branch '2.3.x'
Closes gh-23261
2020-09-13 11:02:54 -07:00
Phillip Webb 5294c34807 Merge branch '2.2.x' into 2.3.x
Closes gh-23260
2020-09-13 11:02:19 -07:00
Phillip Webb 326a56da01 Support validation of bound map key entries
Update `ValidationBindHandler` so that pushed fields that reference
map keys can be used. This fixes a regression that was introduced in
commit 4483f417 when we switched to a `AbstractBindingResult` that no
longer required public getters/setters.

Closes gh-20350
2020-09-13 10:54:30 -07:00
Phillip Webb 922b4c04bf Merge branch '2.3.x' 2020-09-11 19:01:44 -07:00
Phillip Webb f5ae58e8e5 Fix deprecation warning
See gh-23256
2020-09-11 19:01:22 -07:00
Phillip Webb f1d9832282 Merge branch '2.3.x'
Closes gh-23259
2020-09-11 18:45:39 -07:00
Phillip Webb 507fae5141 Merge branch '2.2.x' into 2.3.x
Closes gh-23258
2020-09-11 18:45:05 -07:00
Phillip Webb d8232b3c21 Polish 'Allow other "timestamp" types in MVC error model'
See gh-23256
2020-09-11 18:44:04 -07:00
lock14 d1d953819a Allow other "timestamp" types in MVC error model
Remove casting "timestamp" to `java.util.Date` in
`ErrorMvcAutoConfiguration` as the cast is not necessary and it
prevents other types (e.g. `java.time`) from being used.

See gh-23256
2020-09-11 18:11:47 -07:00
Stephane Nicoll f03ed3b2a7 Publish single page doc to /htmlsingle consistently
Closes gh-21585
2020-09-11 16:05:57 +02:00
Stephane Nicoll 7a8b7b9fa7 Polish "Add separate property for Redis read and connection timeout"
See gh-23137
2020-09-11 11:46:27 +02:00
anshlykov 2527fcac9c Add separate property for Redis read and connection timeout
See gh-23137
2020-09-11 11:46:27 +02:00
Brian Clozel 20eb8d0fc2 Merge branch '2.3.x'
Closes gh-23253
2020-09-11 11:45:23 +02:00
Brian Clozel 62cb87bd95 Merge branch '2.2.x' into 2.3.x
Closes gh-23252
2020-09-11 11:42:32 +02:00
David Good 775f0fa861 Improve sanitization for list of URI types
Prior to this commit, Actuator would sanitize properties values when
serializing them on the dedicated endpoint. Keys like "password" or
"secret" are entirely sanitized, but other keys like "uri" or "address"
are considered as URI types and only the password part of the user info
is sanitized.

This commit fixes the sanitization process where lists of such URI types
would not match the first entries of the list since they're starting
with `'['`. This commit improves the regexp matching process to sanitize
all URIs within a collection.

The documentation is also updated to better underline the processing
difference between complete sanitization and selective sanitization for
URIs.

Fixes gh-23037
2020-09-11 11:34:38 +02:00
Stephane Nicoll 36d4e95254 Merge branch '2.3.x'
Closes gh-23251
2020-09-11 10:03:42 +02:00
Stephane Nicoll 7c13c01cb6 Fix mapping of Cassandra's idle-timeout and heartbeat-interval
Previous to this commit the connection idle timeout and heartbeat
interval were mapped to seconds whereas Cassandra expects ms for all
duration types.

This commit fixes the mapping and removes the default duration unit
since it should be considered ms like every other duration properties.

Closes gh-23249
2020-09-11 08:59:34 +02:00
Andy Wilkinson 143d19754b Exclude starter jars when running and packaging with Gradle
This commit updates the Gradle Plugin to filter dependencies based on
the Spring-Boot-Jar-Type entry in their manifest. Jars with a
Spring-Boot-Jar-Type of dependencies-starter are excluded. Unlike the
Maven plugin, jars with a type of annotation-processor are not
excluded. It is not necessary with Gradle as use of the
annotationProcessor configuration for such dependencies already ensures
that they are not included.

See gh-22036
2020-09-10 14:43:41 +01:00
Andy Wilkinson e743d5fe66 Exclude by jar type when running and packaging with Maven
This commit updates the Maven Plugin to filter dependencies based on
the Spring-Boot-Jar-Type entry in their manifest. Jars with a
Spring-Boot-Jar-Type of dependencies-starter or annotation-processor
are excluded.

See gh-22036
2020-09-10 14:38:19 +01:00
dreis2211 be56cac2bb Note starters' and annotation processors' jar type in their manifest
See gh-22203
2020-09-10 14:37:06 +01:00
Brian Clozel 0715750eb3 Polish "Add SSL support to RSocketServer"
See gh-19399
2020-09-10 15:14:55 +02:00
cbono b4810b8b91 Add SSL support to RSocketServer
See gh-19399
2020-09-10 15:14:55 +02:00
Andy Wilkinson dd024048e9 Merge branch '2.3.x'
Closes gh-23244
2020-09-10 11:18:31 +01:00
Andy Wilkinson aab4ee9aa2 Merge branch '2.2.x' into 2.3.x
Closes gh-23243
2020-09-10 11:15:03 +01:00
Andy Wilkinson e4691a4c61 Document that sliced tests don't scan @ConfigurationProperties beans
Closes gh-23210
2020-09-10 11:14:28 +01:00
Andy Wilkinson 8daf57fdeb Upgrade to Spring Security 5.4.0
The commit also includes an upgrade to Nimbus JOSE JWT 9.0. Spring
Security requires 9.0 and it is not backwards compatible with 8.19.

Closes gh-23225
Closes gh-23242
2020-09-10 11:00:54 +01:00
Andy Wilkinson 6619dfacf3 Merge branch '2.3.x'
Closes gh-23241
2020-09-10 10:03:09 +01:00
Andy Wilkinson e7e77a917f Align PropertiesLauncher's close behavior with JarLauncher
Previously, PropertiesLauncher would close each archive that it
iterated over when creating its ClassLoader. This was not aligned
with JarLauncher's behaviour and left the ClassLoader with closed
archives. The close was introduced in [1] and became more apparent
following the change to fail operations on closed archives [2].

This commit updates Launcher to remove the close() that was added in
[1]. This aligns the behavior of PropertiesLauncher with JarLauncher
and ensures that the ClassLoader does not have entries backed by
closed archives on its classpath.

Fixes gh-23165

[1] ad72f86bdb
[2] ed7a5db174
2020-09-10 09:40:44 +01:00
Phillip Webb f260c77fe3 Add @ImportConfigurationPropertiesBean support
Add repeatable `@ImportConfigurationPropertiesBean` annotation that can
be used to import types and treat them as `@ConfigurationProperties`
beans. This annotation is specifically designed to support third-party
classes that can't contain any Spring annotations.

Closes gh-23172
2020-09-09 22:05:49 -07:00
Brian Clozel d2e67ab84d Align WebClient uri metric tag with RestTemplate
Prior to this commit, the `WebClientExchangeTags`, when given a request
without a string template, would only get the request path to create the
"uri" tag for metrics. This is inconsistent with the
`RestTemplateExchangeTags`, which are taking the full request URI minus
the protocol+host+port.

This commit aligns the `WebClientExchangeTags` behavior in this case.

Closes gh-22832
2020-09-09 13:33:48 +02:00
Andy Wilkinson 9c408babfa Upgrade to Spring Kafka 2.6.0
Closes gh-23012
2020-09-09 09:04:57 +01:00
Phillip Webb df944c6354 Polish 2020-09-08 11:19:33 -07:00
dreis2211 79ec1401a5 Enable Spring Integration RSocket test again
See gh-23229
2020-09-08 16:25:23 +01:00
Brian Clozel 9e0fd01aae Deprecate resource "app-cache" configuration support
This commit deprecates the
`"spring.resources.chain.html-application-cache"` configuration property
and its support, since the feature has been deprecated in Spring
Framework.

The app-cache manifest feature is being removed from browsers in favor
of web workers.

Closes gh-23228
2020-09-08 16:34:25 +02:00
Stephane Nicoll b9b7393053 Deprecate Cassandra health indicators that rely on Spring Data
With the introduction of health indicators that only require the
CqlSession, this commit deprecates the health indicators that require
Spring Data since the latter build on top of the former.

Closes gh-23226
2020-09-08 14:39:37 +02:00
Andy Wilkinson b1a843279a Merge branch '2.3.x'
Closes gh-23224
2020-09-08 11:39:52 +01:00
Andy Wilkinson 3e0096e9b1 Use classpath normalizer on antlib's integration test classpath input
Closes gh-23223
2020-09-08 11:38:31 +01:00
Stephane Nicoll a73b7bb7dd Polish
This commit makes sure that no high-level client is auto-configured if
a low-level client is registered as a bean.

See gh-22358
2020-09-08 12:17:58 +02:00
Andy Wilkinson aa3c93078e Adapt to deprecation of ReactiveDataAccessStrategy
ReactiveDataAccessStrategy has been deprecated in Spring Data R2BC in
favor of R2dbcConverter (and StatementMapper and UpdateMapper). When
not using Boot, an R2dbcConverter bean is now defined by
AbstractR2dbcConfiguration. This commit updates
R2dbcDataAutoConfiguration to replace the definition of a
ReactiveDataAccessStrategy bean with the definition of an
R2dbcConverter bean.

See gh-23197
2020-09-08 10:36:00 +01:00
Brian Clozel 8d27cac43e Polish
See gh-22358
2020-09-08 10:35:50 +02:00
Brian Clozel 1d73d4eda7 Remove Elasticsearch RestClient auto-configuration
Prior to this commit, Spring Boot would auto-configure both
Elasticsearch variants: `RestClient` ("Low Level" client) and
`RestHighLevelClient` ("High Level" client).
Since one can be derived from the other, this would create complex and
unclear situations depending on what developers provided with their
configuration.

`RestHighLevelClient` is mostly for actual use of the Elasticsearch API,
with support for specific methods and (de)serialization. On the other
hand, `RestClient` is merely wrapping the Apache HTTP client for
load-balancing support and low level HTTP features.

This commit completely removes the support for `RestClient` in Spring
Boot and now requires the presence of the
`org.elasticsearch.client:elasticsearch-rest-high-level-client`
dependency for REST client support with Elasticsearch.

Closes gh-22358
2020-09-08 10:17:27 +02:00
Andy Wilkinson 016c46c6b3 Temporarily disable Spring Integration RSocket test
See gh-23214
See gh-23010
2020-09-08 09:00:19 +01:00
Stephane Nicoll 7bf6edf661 Upgrade to OAuth2 OIDC SDK 8.19.1
Closes gh-22951
2020-09-08 09:18:16 +02:00
Spencer Gibb 27136cda44 Fix typo
See gh-23215
2020-09-08 08:36:12 +02:00
Brian Clozel 1152a39caa Polish 2020-09-07 20:34:23 +02:00
Brian Clozel 8dcb3312f2 Switch startup actuator endpoint to using HTTP POST
Closes gh-23213
2020-09-07 20:32:26 +02:00
Brian Clozel 29e8f1d980 Switch to RSocket SNAPSHOTs for 1.1.0-M2 upgrade
See gh-23214
2020-09-07 18:22:30 +02:00
Brian Clozel 676e1809fb Add startup Actuator endpoint
This commit builds on top of gh-22603 and exposes data collected by the
`BufferingApplicationStartup` on a dedicated `"/startup"` Actuator
endpoint.

Closes gh-23213
2020-09-07 18:04:48 +02:00
Brian Clozel 6be4409fde Add mainApplicationClass tag to startup step
This commit adds a new tag to the `"spring.boot.application.starting"`
startup step.

Closes gh-23162
2020-09-07 18:04:42 +02:00
Brian Clozel fdf21da7ba Add buffering ApplicationStartup variant
As of spring-projects/spring-framework#24878, Spring Framework provides
an `ApplicationStartup` infrastructure that applications can use to
collect and track events during the application startup phase.

This commit adds a new `BufferingApplicationStartup` implementation that
buffer `StartupStep`s and tracks their execution time. Once buffered,
these steps can be pushed to an external metrics system or drained
through a web endpoint, to a file...

Closes gh-22603
2020-09-07 18:04:31 +02:00
Stephane Nicoll 268dfceffd Start building against Spring Session 2020.0.0-RC1 snapshots
See gh-23188
2020-09-07 16:40:25 +02:00
Stephane Nicoll 25f7403a2b Start building against Spring Batch 4.3.0-RC1 snapshots
See gh-23189
2020-09-07 16:39:36 +02:00
Stephane Nicoll b633928d2f Start building against Spring Data 2020.0.0-RC1 snapshots
See gh-23197
2020-09-07 16:21:57 +02:00
Stephane Nicoll 52859303fe Start building against Spring Kafka 2.5.6 snapshots
See gh-23199
2020-09-07 15:55:27 +02:00
Stephane Nicoll c909b2b4a0 Start building against Spring Session Dragonfruit-SR1 snapshots
See gh-23187
2020-09-07 15:54:49 +02:00
Stephane Nicoll 72c34c8bfd Start building against Spring Data Neumann-SR4 snapshots
See gh-23196
2020-09-07 15:54:08 +02:00
Stephane Nicoll c352528aa5 Start building against Reactor Dysprosium-SR12 snapshots
See gh-23192
2020-09-07 15:53:27 +02:00
Stephane Nicoll ba7a103588 Start building against Spring Kafka 2.3.11 snapshots
See gh-23198
2020-09-07 15:24:02 +02:00
Stephane Nicoll 3b4f541b44 Start building against Spring Session Corn-SR4 snapshots
See gh-23186
2020-09-07 15:23:21 +02:00
Stephane Nicoll a8c36b7659 Start building against Spring Data Moore-SR10 snapshots
See gh-23195
2020-09-07 15:22:43 +02:00
Stephane Nicoll e3635c4848 Start building against Reactor Dysprosium-SR11 snapshots
See gh-23191
2020-09-07 15:21:51 +02:00
Andy Wilkinson b2cc442539 Merge branch '2.3.x'
See gh-23204
2020-09-07 14:17:11 +01:00
Andy Wilkinson 86fc4dea2a Merge branch '2.2.x' into 2.3.x
See gh-23203
2020-09-07 14:16:37 +01:00
Andy Wilkinson 5f00d91176 Restore identifying org.hsqldb.jdbcDriver as embedded
See gh-23036
2020-09-07 14:03:10 +01:00
Stephane Nicoll b3960cae86 Start building against Spring Data Bean-SR12 snapshots
See gh-23185
2020-09-07 14:38:50 +02:00
Stephane Nicoll d2a6035914 Start building against Spring Data Lovelace-SR20 snapshots
See gh-23194
2020-09-07 14:38:25 +02:00