Commit Graph

11179 Commits

Author SHA1 Message Date
Phillip Webb c523295694 Merge branch '2.1.x' into 2.2.x
Closes gh-23610
2020-10-07 11:04:39 -07:00
Phillip Webb 206356728c Add upgrading section to reference docs
Add a section to the reference documentation with links to the release
notes on the wiki.

Closes gh-23529
2020-10-07 11:04:20 -07:00
Stephane Nicoll b69ede4556 Polish
See gh-23480
2020-10-07 14:40:56 +02:00
Stephane Nicoll ef2fee22cb Make sure that the type used for discovery implements DataSource
See gh-23480
2020-10-07 12:00:24 +02:00
Stephane Nicoll 0106539ecb Start building against Spring Data 2020.0.0 RC2 snapshots
See gh-23594
2020-10-07 11:17:42 +02:00
Stephane Nicoll 1296b4dfe6 Revert "Support constructor binding on 3rd party classes"
This commit reverts the support of constructor binding on 3rd party
classes using @ImportConfigurationPropertiesBean

See gh-23172

Closes gh-23593
2020-10-07 10:53:01 +02:00
Phillip Webb 2595258494 Provide both properties and YAML examples in docs
Update all configuration examples in the docs to YAML and make use of
the new `configblocks` spring-asciidoctor-extensions feature to
automatically create both "Properties" and "Yaml" versions.

Closes gh-23515
2020-10-06 19:27:41 -07:00
Phillip Webb 18e4ab5042 Use title case for config props appendix
Closes gh-23603
2020-10-06 19:25:26 -07:00
Phillip Webb f369b9f58f Upgrade to spring-asciidoctor-extensions 0.5.0
Closes gh-23605
2020-10-06 19:24:58 -07:00
Phillip Webb 2c487f7cb8 Polish 2020-10-06 19:24:38 -07:00
Andy Wilkinson c82581171d Trigger configuration properties annotation processsor on `@Endpoint`
We generate metadata for `@Endpoint` annotated types so the annotation
processor need to indicate that it supports the endpoint annotation.

See gh-23580
2020-10-06 16:13:19 +01:00
Andy Wilkinson b7d020d3c2 Merge branch '2.3.x' 2020-10-06 15:58:01 +01:00
Andy Wilkinson 543763462c Update tests to look for snippets in correct location
See gh-23598
2020-10-06 15:57:25 +01:00
Andy Wilkinson 1924aad07c Limit supported annotations to `@ConfigurationProperties` and `@Configuration`
Previously, the configuration property annotation processor declared
that it supported all annotation types. This hurt performance and
prevented incremental builds with Gradle when compiling source code
containing source-retention annotations.

This commit updates its supported annotation types to be only
`@ConfigurationProperties` and `@Configuration`. The latter is declared
to allow binding third-party classes returned from a `@Bean` method.

Fixes gh-23580
2020-10-06 14:54:24 +01:00
Andy Wilkinson f44889b992 Merge branch '2.3.x'
See gh-23599
2020-10-06 14:44:50 +01:00
Andy Wilkinson 7eb92cc71a More Gradle snippets to correct location
See gh-23598
2020-10-06 14:44:26 +01:00
Andy Wilkinson 94884f201c Merge branch '2.3.x'
Closes gh-23599
2020-10-06 14:36:09 +01:00
Andy Wilkinson 2d3291fb83 Merge branch '2.2.x' into 2.3.x
Closes gh-23598
2020-10-06 14:35:49 +01:00
Andy Wilkinson 7ac14203ab Expand Gradle plugin's docs on setting bootRun's system properties
Closes gh-23578
2020-10-06 14:35:30 +01:00
Stephane Nicoll 35d41e4ae2 Remove code deprecated in Spring Boot 2.2
Closes gh-22034
2020-10-06 08:17:10 +02:00
Stephane Nicoll b08da63da5 Polish 2020-10-05 17:37:11 +02:00
Andy Wilkinson 1d610fe1c8 Add configuration properties for Flyway 7's new config options
Closes gh-23579
2020-10-05 15:26:20 +01:00
Andy Wilkinson 847aecf621 Upgrade to Flyway 7.0.0
Closes gh-23514
2020-10-05 15:26:19 +01:00
Stephane Nicoll d952a8f3a5 Avoid unnecessary reflection in builders
Closes gh-23560
2020-10-05 16:16:40 +02:00
Stephane Nicoll ebc9c575e3 Allow to customize RSocketServer's fragment size
Closes gh-23247
2020-10-05 13:58:57 +02:00
Stephane Nicoll 5feaf2bc1a Polish "Polish empty string checks"
See gh-23550
2020-10-05 10:42:19 +02:00
Santhoshkumar. P 5cb07e292d Polish empty string checks
See gh-23550
2020-10-05 10:38:47 +02:00
Stephane Nicoll 294af45bb3 Replace reflection call in HttpMessageConverters
Closes gh-23485
2020-10-05 10:26:22 +02:00
dreis2211 ecee9c0f9b Avoid unnecessary explicit initialization of Atomics
Constructor calls like new AtomicInteger(0) cause a volatile write that
can be saved in cases where the constructor parameter is the default
value.

See gh-23575
2020-10-02 16:43:34 +02:00
Stephane Nicoll 6f08e9709e Polish "Improve Cassandra health indicator with more robust mechanism"
See gh-23041
2020-10-02 16:11:31 +02:00
tomekl007 8e5a041bb4 Improve Cassandra health indicator with more robust mechanism
See gh-23041
2020-10-02 15:46:48 +02:00
dreis2211 efbbd8b367 Improve performance of DispatcherServletRegistrationCondition
See gh-23554
2020-10-02 10:47:03 +02:00
Stephane Nicoll c4e1b4f5dd Polish "Add configuration option for channelRpcTimeout"
See gh-23564
2020-10-02 10:14:05 +02:00
Jasmine Howard baa9d129f2 Add configuration option for channelRpcTimeout
This commit adds a configuration option to configure
RabbitConnectionFactory's channelRpcTimeout property.

See gh-23564
2020-10-02 10:12:39 +02:00
Stephane Nicoll 1e2ed8ab4c Update copyright of changed file
See gh-23571
2020-10-02 09:48:18 +02:00
mnhock fc89051242 Use platform-independent line separator
See gh-23571
2020-10-02 09:47:44 +02:00
Stephane Nicoll 797c12e75d Merge branch '2.3.x'
Closes gh-23573
2020-10-02 09:34:49 +02:00
Thorasine 6c3dfac1d0 Fix typos
See gh-23561
2020-10-02 09:32:26 +02:00
Madhura Bhave 351929a616 Merge branch '2.3.x'
Closes gh-23570
2020-10-01 18:20:09 -07:00
Madhura Bhave e2289e2f21 Merge branch '2.2.x' into 2.3.x
Closes gh-23569
2020-10-01 18:19:35 -07:00
Madhura Bhave c0f158dffd Polish "Do not fail if h2Console bean cannot connect to db"
See gh-23566
2020-10-01 18:16:11 -07:00
Shraddha Yeole 2d76de29ff Do not fail if h2Console bean cannot connect to db
See gh-23566
2020-10-01 18:10:48 -07:00
Madhura Bhave 9a6d52e30d Merge branch '2.2.x' into 2.3.x 2020-10-01 18:01:53 -07:00
Madhura Bhave 3118ca9313 Polish 2020-10-01 18:01:11 -07:00
Madhura Bhave ae7de284f4 Merge branch '2.3.x'
Closes gh-23568
2020-10-01 17:20:33 -07:00
Madhura Bhave 121ba2b0ab Merge branch '2.2.x' into 2.3.x
Closes gh-23567
2020-10-01 17:16:37 -07:00
ketaki-t 66aa24b5f0 Remove documentation for unsupported gradle versions
See gh-23562
2020-10-01 17:13:26 -07:00
Madhura Bhave 7c22e71753 Polish "Deprecate EmbeddedDatabaseConnection#HSQL"
See gh-23565
2020-10-01 16:56:48 -07:00
desainidhi99 d5a1421bbe Deprecate EmbeddedDatabaseConnection#HSQL in favor of HSQLDB
See gh-23565
2020-10-01 16:55:44 -07:00
Andy Wilkinson 65c7cd43db Merge branch '2.3.x'
Closes gh-23557
2020-10-01 12:38:44 +01:00
Andy Wilkinson 914dccade2 Merge branch '2.2.x' into 2.3.x
Closes gh-23555
2020-10-01 12:30:16 +01:00
Andy Wilkinson 323af718e2 Only change the method of requests that Jetty won't handle by default
Previously, JettyEmbeddedErrorHandler would change the method of every
request that is handles to GET. This was being done to work around
Jetty's error handling only dealing with GET, POST, and HEAD requests
by default. It had the unwanted side-effect of causing an error
response to a HEAD request having a body as, from the error handling's
perspective, it was a GET request.

This commit updates JettyEmbeddedErrorHandler to only set the method
on a request for which error handling is being performed if the method
isn't already one that will be handled, leaving the method of GET,
POST, and HEAD requests unchanged.

Unfortunately, short of implementing an HTTP client, this change cannot
be tested as the Apache HttpClient, OkHttp, and the JDK's
HttpURLConnection all silently drop the body of a response to a HEAD
request, preventing a test from asserting that a body hasn't been sent.

Closes gh-23551
2020-10-01 12:29:44 +01:00
Andy Wilkinson 9e3a2bbdeb Implement BeanFactoryAware to inject BeanFactory
Closes gh-23543
2020-09-30 19:38:06 +01:00
Stephane Nicoll 9ff946bafa Remove unnecessary stubbing 2020-09-30 16:13:43 +02:00
Stephane Nicoll de32fab324 Adapt to API change in Spring Framework 5.3.0 snapshots
See gh-23534
2020-09-30 16:09:41 +02:00
Andy Wilkinson f4ce77fcae Merge branch '2.3.x'
Closes gh-23541
2020-09-30 14:58:26 +01:00
Andy Wilkinson e58a92b3d0 Introduce a dedicated @GradleCompatibility annotation
Rather than using the extension directly, introduced a dedicated
annotation will enable customization of the compatibility tests that
are run via attributes on the annotation. For example, it will allow
certain test classes to run their tests with Gradle's configuration
cache enabled while others disable it.

Closes gh-23532
2020-09-30 14:50:48 +01:00
Andy Wilkinson bd4934b0fd Fix matching of SNAPSHOT artifacts when customizing layers
Previously the artifact's version was used. In an artifact's version,
SNAPSHOT is replaced with the timestamped version number of a specific
snapshot. As a result, it no longer matches the *:*:*SNAPSHOT pattern.

This commit replaces switches to using the artifact's base version.
This preserves the SNAPSHOT in the version number. For non-snapshot
artifacts, the version and base version are identical.

Fixes gh-23533
2020-09-30 14:48:04 +01:00
Stephane Nicoll 366fec33d0 Adapt to API change in Spring Framework 5.3.0 snapshots
See gh-23534
2020-09-30 13:46:57 +02:00
Stephane Nicoll 6254ad634e Merge branch '2.3.x'
Closes gh-23535
2020-09-30 10:32:16 +02:00
Stephane Nicoll 2f6c19d618 Start building against Spring Framework 5.3.0 snapshots
See gh-23534
2020-09-30 10:31:29 +02:00
Stephane Nicoll cd15cbdc79 Do not execute datasource initialization in a separate thread
This commit makes sure that `data.sql` is performed in the same thread
as the one initializing the JPA container.

Closes gh-22852
2020-09-30 10:10:16 +02:00
Stephane Nicoll 789fafadac Start building against Spring Framework 5.3.10 snapshots
See gh-23526
2020-09-30 10:00:21 +02:00
Andy Wilkinson f5df6e463a Reduce configuration resolution when building a layered jar
Previously, BootJar would resolves all of a project's configurations
when building a layered jar. This was unnecessarily broad as it was
likely to include configurations that had contributed nothing to the
jar's classpath.

This commit replaces the configuration resolution with an afterResolve
action that populates the ResolvedDependencies in response to a
configuration being resolved. This allows the resolved dependencies to
be populated from all of the configurations that were resolved as part
of determining the jars classpath and no more.

Closes gh-23528
2020-09-29 17:51:55 +01:00
Stephane Nicoll 75554ce236 Polish "Add support for Oracle UCP"
See gh-23403
2020-09-29 16:09:55 +02:00
Fabio Grassi a21ab392b6 Add support for Oracle UCP
See gh-23403
2020-09-29 14:45:48 +02:00
Andy Wilkinson a19a565410 Stop registering the default servlet by default
Previously, the default servlet was registered automatically when using
embedded Jetty, Tomcat, or Undertow. However, it is not used by the
majority of applications where Spring MVC's DispatcherServlet will be
the only servlet that's needed. As such configuring the default servlet
was wasting CPU and memory.

This commit changes the default for registering the default servlet to
false. It can be re-enabled by setting
server.servlet.register-default-servlet=true.

Closes gh-22915
2020-09-29 11:52:19 +01:00
Stephane Nicoll 2852ea0808 Remove useless version override for MongoDBContainer
Closes gh-23520
2020-09-29 10:50:30 +02:00
Stephane Nicoll 137f4ec980 Merge branch '2.3.x'
Closes gh-23522
2020-09-29 10:46:36 +02:00
Stephane Nicoll 466c1012d6 Merge branch '2.2.x' into 2.3.x
Closes gh-23521
2020-09-29 10:44:30 +02:00
Stephane Nicoll fd3683646a Migrate SessionAutoConfigurationMongoTests to Testcontainers
Closes gh-23512
2020-09-29 10:34:59 +02:00
Stephane Nicoll cc1f7402a7 Associate ResourceLoader with RabbitConnectionFactoryBean
Closes gh-22332
2020-09-29 10:14:34 +02:00
Stephane Nicoll 36382e599c Add support for Redis 6 authentication with username
Closes gh-22702
2020-09-29 10:01:11 +02:00
Stephane Nicoll a5c20a5132 Polish 2020-09-28 14:56:44 +02:00
Lukas Cardot e95bcfac34 Configure the bootBuildInfo task lazily
Prior to this commit, the bootBuildInfo was configured eagerly.
Configuring it lazily prevent this task from being configured when not
explicitly needed. Also, the 'classes' and 'bootJar' tasks are now
lazily configured, as the bootBuildInfo task was causing them to be
configured eagerly.

See gh-23435
2020-09-28 11:19:26 +01:00
Andy Wilkinson ad6de10f14 Remove use of deprecated SDR API when describing request mappings
Closes gh-22654
2020-09-28 11:08:24 +01:00
Stephane Nicoll 57bc23284e Apply DataSource aliases only when necessary
This commit makes sure that aliases are only applied when they match
the DataSource being bound. This prevent an alias targetted to a
DataSource to accidently match an unexpected property of another
DataSource.

Closes gh-23480
2020-09-28 10:17:13 +02:00
Stephane Nicoll d9b4d7b594 Merge branch '2.3.x'
Closes gh-23509
2020-09-28 09:22:19 +02:00
Stephane Nicoll 2c1634e6ed Merge branch '2.2.x' into 2.3.x
Closes gh-23508
2020-09-28 09:21:51 +02:00
Rujun Chen 8330752b11 Add mising entry for Netty tcnative dependency management
See gh-23502
2020-09-28 09:18:44 +02:00
Stephane Nicoll 77e27eaeb1 Polish "Add reference to desensitization spring boot starter"
See gh-23507
2020-09-28 09:14:23 +02:00
zyc 1d0b085b5c Add reference to desensitization spring boot starter
See gh-23507
2020-09-28 09:14:09 +02:00
Andy Wilkinson 558c2b4591 Merge branch '2.3.x'
Closes gh-23501
2020-09-26 09:17:08 +01:00
Andy Wilkinson 9bd040cb0f Merge branch '2.2.x' into 2.3.x
Closes gh-23500
2020-09-26 09:16:46 +01:00
Andy Wilkinson e74f777971 Remove use of spring-core's Assert from PropertiesLauncher
Fixes gh-23474
2020-09-26 09:11:05 +01:00
Andy Wilkinson ab8d33aa72 Merge branch '2.3.x'
Closes gh-23482
2020-09-24 19:04:33 +01:00
Andy Wilkinson df5cd21ca5 Merge branch '2.2.x' into 2.3.x
Closes gh-23481
2020-09-24 19:04:17 +01:00
Andy Wilkinson 6dc8e6815d Align default tldScanPatterns with Tomcat's
Previously, we configured embedded Tomcat in such a way that no TLD
scan patterns were configured. This differed from a standalone
Tomcat installation where 4 patterns are configured that take
precedence over some of the skip patterns. The missing scan patterns
resulted in the skip patterns preventing the discovery of Log4j2's
TLDs.

This commit updates TomcatServletWebServerFactory to configure the
same four scan patterns as standalone Tomcat configures by default.

Fixes gh-23302
2020-09-24 17:51:38 +01:00
Andy Wilkinson b662f1e06e Remove UnresolvedDependenciesAnalyzer from the Gradle plugin
Closes gh-23479
2020-09-24 15:16:29 +01:00
Stephane Nicoll 4d33062d30 Upgrade to Hazelcast Hibernate5 2.1.1
Closes gh-23476
2020-09-24 15:57:07 +02:00
Stephane Nicoll 4009acf025 Add support for Hazelcast
This commit upgrades to Hazelcast 4.0.3, yet keeping compatibility with
Hazelcast 3.x.

Closes gh-20856
Closes gh-23475
2020-09-24 15:57:07 +02:00
Andy Wilkinson 7b183ef99d Merge branch '2.3.x'
Closes gh-23478
2020-09-24 14:46:42 +01:00
Andy Wilkinson e626f7f47e Merge branch '2.2.x' into 2.3.x
Closes gh-23477
2020-09-24 14:45:55 +01:00
Andy Wilkinson bf9d23e55a Consider SpringBootTest's web environment in context cache key
Previously, the web environment configured on `@SpringBootTest` was not
part of the context cache key. As a result, two test classes that has
identical configuration other than one using a MOCK web environment and
the other using a DEFINED_PORT web environment would share a context
when they should not do so. Classes that use MOCK and RANDOM_PORT were
not affected as the use of RANDOM_PORT results in a property for the
port being added to the environment.

This commit adds a new ContextCustomizer, SpringBootTestWebEnvironment,
that is used to capture the `webEnvironment` from `@SpringBootTest`
and use it in its hashCode and equals implementations. This fixes the
problem as all context customizers are evaluated when determing the
equality of two context cache keys.

Fixes gh-23085
2020-09-24 14:43:51 +01:00
thorasine 2d74aef6ef Fix typos
See gh-23465
2020-09-24 11:42:05 +02:00
Stephane Nicoll c44e1ec0ad Merge branch '2.3.x'
Closes gh-23462
2020-09-23 14:36:59 +02:00
Stephane Nicoll b3c5588c86 Merge branch '2.2.x' into 2.3.x
Closes gh-23461
2020-09-23 14:36:41 +02:00
Pavel Gordon 62eb835a4e Fix link to Log4j's JDK Logging Adapter in reference documentation
See gh-23459
2020-09-23 14:36:00 +02:00
thorasine 9955dac316 Fix typo
See gh-23456
2020-09-23 14:20:51 +02:00
Stephane Nicoll 4d10fbfd52 Rewrite JobLauncherApplicationRunnerTests
This commit rewrites the test to use an in-memory database rather than
the deprecated Map-based arrangement.

Closes gh-23369
2020-09-23 14:11:01 +02:00
Andy Wilkinson 17d5e17069 Merge branch '2.3.x' 2020-09-22 16:26:58 +01:00
Andy Wilkinson 232c310df2 Merge branch '2.2.x' into 2.3.x 2020-09-22 16:26:39 +01:00
Andy Wilkinson 24102656f2 Fix Log4j2 XML configuration tests on Windows
See gh-22983
2020-09-22 16:03:58 +01:00
Stephane Nicoll 7d984d7f89 Merge branch '2.3.x'
Closes gh-23453
2020-09-22 16:45:32 +02:00
Stephane Nicoll 3adf06df17 Merge branch '2.2.x' into 2.3.x
Closes gh-23452
2020-09-22 16:45:08 +02:00
Stephane Nicoll 2999f09a40 Rework tip on templates location in the IDE
This commit rework the tip on locating templates when running the app
in the IDE. Using classpath* should not change anything as this won't
make a difference without a pattern in the path.

Closes gh-23068
2020-09-22 16:44:16 +02:00
Stephane Nicoll 1258bce57a Add bomr exclusion for Apache Solr 8.6+
Closes gh-23370
2020-09-22 15:42:14 +02:00
Andy Wilkinson 659b459fab Make the auto-configured LocaleContextResolver conditional on missing bean
Closes gh-23419
2020-09-22 14:35:05 +01:00
Stephane Nicoll 531690b8e1 Merge branch '2.2.x' into 2.3.x
Closes gh-23448
2020-09-22 15:21:04 +02:00
Stephane Nicoll 7f84a92ef1 Document that Java 15 is supported
Closes gh-23447
2020-09-22 15:19:47 +02:00
Stephane Nicoll 1631ae23f5 Allow RestTemplateBuilder to be further customized
Closes gh-23389
2020-09-22 14:07:43 +02:00
Stephane Nicoll 37ded9f6d3 Merge branch '2.2.x' into 2.3.x
Closes gh-23446
2020-09-22 10:10:24 +02:00
dreis2211 fba1fb23e4 Fix multi-release JAR test on JDK 15
Backport of 54f93e9

See gh-23445
2020-09-22 10:09:18 +02:00
Andy Wilkinson 6d2deb89dd Polish 2020-09-22 09:05:34 +01:00
Phillip Webb 363d35a0ac Merge branch '2.2.x' into 2.3.x
Closes gh-23444
2020-09-21 23:20:10 -07:00
Phillip Webb b443d22c59 Merge branch '2.1.x' into 2.2.x
Closes gh-23443
2020-09-21 23:19:41 -07:00
Phillip Webb cc442c5c0d Make HandlerFunctionDescription JDK 15 compatible
Update `HandlerFunctionDescription` so that it will work with JDK 15.

Closes gh-23442
2020-09-21 23:18:02 -07:00
Phillip Webb 3fca8c6b4e Merge branch '2.2.x' into 2.3.x
Closes gh-23441
2020-09-21 22:27:45 -07:00
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