Commit Graph

13256 Commits

Author SHA1 Message Date
Andy Wilkinson 6440843358 Do not wait indefinitely in initialize test if refresh fails
Closes gh-26286
2021-05-04 09:44:56 +01:00
Phillip Webb d6d1d95741 Use American English spellings 2021-05-03 22:39:45 -07:00
Phillip Webb b5583a4620 Polish doc code samples
See gh-6313
2021-05-03 22:39:44 -07:00
Phillip Webb 9aad29da0c Extract code samples from docs
See gh-6313
2021-05-03 17:46:37 -07:00
Scott Frederick 0893df4a01 Merge branch '2.4.x'
Closes gh-26346
2021-05-03 14:53:41 -05:00
Scott Frederick dbee0cf9f1 Ignore empty values in config location properties
This commit updates config data property binding to ignore empty
elements in `spring.config.location` and `spring.config.import`
property values when a value is a comma-delimited string
representing a collection.

Fixes gh-26342
2021-05-03 14:52:22 -05:00
Phillip Webb b314d848dc Polish docs code
See gh-6313
2021-04-30 18:19:52 -07:00
Phillip Webb 09e85806d6 Align docs package structure with heading IDs
See gh-6313
2021-04-30 16:34:35 -07:00
Andy Wilkinson b976483852 Merge branch '2.4.x'
Closes gh-26330
2021-04-30 16:56:46 +01:00
Andy Wilkinson c0fe23181c Merge branch '2.3.x' into 2.4.x
Closes gh-26329
2021-04-30 16:55:10 +01:00
Andy Wilkinson 94ca2d1e78 Test the Gradle plugin against Gradle 6.9-rc-1
Closes gh-26267
2021-04-30 16:52:52 +01:00
Stephane Nicoll 6df3a8291e Merge branch '2.4.x'
Closes gh-26328
2021-04-30 14:36:04 +02:00
Stephane Nicoll 01d2c70e8c Merge branch '2.3.x' into 2.4.x
Closes gh-26327
2021-04-30 14:35:52 +02:00
Stephane Nicoll 07358c6b79 Support reactive infrastructure with DataRedisTest
Previously DataRedisTest-annotated test could not use reactive
operations as RedisReactiveAutoConfiguration is not considered. This
commit includes this auto-configuration and adds a test to exercise this
scenario.

Closes gh-26319
2021-04-30 14:32:25 +02:00
Stephane Nicoll 367fd64c23 Merge branch '2.4.x'
Closes gh-26325
2021-04-30 13:40:32 +02:00
Stephane Nicoll c134c38a68 Merge branch '2.3.x' into 2.4.x
Closes gh-26324
2021-04-30 13:40:24 +02:00
Stephane Nicoll af70da0e92 Update copyright year of changed file
See gh-26321
2021-04-30 13:35:28 +02:00
Matthias Stock 6c8c735027 Fix typo in NamedContributors Javadoc
See gh-26321
2021-04-30 13:35:17 +02:00
Stephane Nicoll 3475e01cda Merge branch '2.4.x'
Closes gh-26323
2021-04-30 13:32:56 +02:00
Stephane Nicoll 4ccce2a74f Merge branch '2.3.x' into 2.4.x
Closes gh-26322
2021-04-30 13:32:40 +02:00
Stephane Nicoll a6e59b357f Polish "Improve failure analysis with a single bean cycle"
See gh-26292
2021-04-30 13:30:58 +02:00
Roman Zabaluev 044c902a8c Improve failure analysis with a single bean cycle
See gh-26292
2021-04-30 13:18:13 +02:00
Stephane Nicoll 4febe6485c Merge branch '2.4.x'
Closes gh-26318
2021-04-30 08:53:31 +02:00
Stephane Nicoll 63d486158d Merge branch '2.3.x' into 2.4.x
Closes gh-26317
2021-04-30 08:53:20 +02:00
Stephane Nicoll 3f528bb0eb Mark SpringBootConfiguration as Indexed
Previously, users of the components.index could not use the index in
scenario where Spring Boot needs to locate the SpringBootConfiguration
to use to bootstrap the test context, as AnnotatedClassFinder scans
the classpath for that stereotype specifically and that requires a
dedicated entry for it.

This commit makes sure that a SpringBootConfiguration-annotated type has
a dedicated entry in the components index.

Closes gh-26308
2021-04-30 08:47:45 +02:00
dreis2211 ca3105920b Fix link to Webservices reference docs
See gh-26316
2021-04-30 08:27:22 +02:00
Phillip Webb 33c6c600a9 Split up adoc files
Closes gh-23254
2021-04-29 17:32:27 -07:00
Scott Frederick bb8188b681 Merge branch '2.4.x'
Closes gh-26313
2021-04-29 16:16:32 -05:00
Scott Frederick 17fa215cf5 Merge branch '2.3.x' into 2.4.x
Closes gh-26312
2021-04-29 15:33:33 -05:00
Scott Frederick c37b9b8a8e Use layout configuration in Maven build-image goal
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.

Fixes gh-26216
2021-04-29 15:03:08 -05:00
Andy Wilkinson 5d8a64e186 Validate section IDs in the reference documentation
See gh-26307
2021-04-29 15:40:54 +01:00
Andy Wilkinson fa81b41afc Merge branch '2.4.x'
Closes gh-26301
2021-04-29 11:37:13 +01:00
Andy Wilkinson 94519c33b1 Merge branch '2.3.x' into 2.4.x
Closes gh-26300
2021-04-29 11:36:15 +01:00
Andy Wilkinson ef5fbb0669 Configure bootBuildImage's targetJavaVersion using a provider
Previously, the targetJavaVersion property of bootBuildImage was set
using the project's target compatibility directly. This meant that
property's value would reflect the configured target compatibility at
the time of the task's creation and any subsequent changes to the
target compatibility would be missed.

This commit updates the registration of the bootBuildImage task to set
the value of the targetJavaVersion property using a provider. This
indirection means that the project's target compatibility isn't read
until the value of the targetJavaVersion is read, allowing any changes
to the target compatibility to be picked up even if they're made after
the bootBuildImage task has been created.

Fixes gh-26297
2021-04-29 11:36:03 +01:00
Stephane Nicoll 242f2ba6bd Merge branch '2.4.x'
Closes gh-26299
2021-04-29 12:30:09 +02:00
Stephane Nicoll f8a4aefce0 Merge branch '2.3.x' into 2.4.x
Closes gh-26298
2021-04-29 12:29:55 +02:00
Stephane Nicoll 0c09841013 Document property names to enable reactive health indicators
Closes gh-26279
2021-04-29 12:28:43 +02:00
Phillip Webb 5dce5ee595 Align adoc filename with anchors
See gh-26296
2021-04-28 22:34:16 -07:00
Phillip Webb bd3f4d74be Rationalize reference documentation anchors
Closes gh-26296
2021-04-28 21:56:51 -07:00
Stephane Nicoll 80248dcc13 Merge branch '2.4.x'
Closes gh-26283
2021-04-28 16:14:58 +02:00
Stephane Nicoll 77a231d742 Merge branch '2.3.x' into 2.4.x
Closes gh-26282
2021-04-28 16:14:46 +02:00
Stephane Nicoll e7bf0a0bd6 Fix key to datasource health indicator in reference doc
Closes gh-26268
2021-04-28 16:14:06 +02:00
Stephane Nicoll 52994027f4 Fix checkstyle violation 2021-04-28 15:14:33 +02:00
Stephane Nicoll 7465eb0f03 Merge branch '2.4.x' 2021-04-28 15:12:45 +02:00
Stephane Nicoll 85e1cc4d65 Fix checkstyle violation 2021-04-28 15:12:22 +02:00
Stephane Nicoll 09ae65e3b7 Merge branch '2.4.x'
Closes gh-26277
2021-04-28 14:13:11 +02:00
Stephane Nicoll 05b09907e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26275
2021-04-28 14:12:35 +02:00
Stephane Nicoll d610f3c2ff Polish "Fix ordering of metadata entries"
See gh-26230
2021-04-28 14:07:37 +02:00
Dmitry Pavlov 3e34b0a60a Fix ordering of metadata entries
This commit provides a consistent ordering for groups that share the
same configuration property prefix.

See gh-26230
2021-04-28 14:07:37 +02:00
Stephane Nicoll 9e3c3b73ac Merge branch '2.4.x' 2021-04-28 13:58:05 +02:00
Stephane Nicoll d98fe36b88 Merge branch '2.3.x' into 2.4.x 2021-04-28 13:57:45 +02:00
Stephane Nicoll 20da9826cc Disable incrementalBuildTypeRenamed test
This commit disables a test that does not test what it is supposed to
and improve the Metadata assertions to fail early if more than one
matching item by name and type is found in the metadata.

See gh-26271
2021-04-28 13:54:35 +02:00
Andy Wilkinson 6953da2013 Merge branch '2.4.x'
Closes gh-26257
2021-04-27 15:19:04 +01:00
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x
Closes gh-26256
2021-04-27 15:18:23 +01:00
Andy Wilkinson a470c1af3a Align documentation with main default branch name
Closes gh-26255
2021-04-27 15:18:00 +01:00
Andy Wilkinson 31b650093d Merge branch '2.4.x'
Closes gh-26251
2021-04-27 11:56:48 +01:00
Andy Wilkinson ffc06e1e30 Merge branch '2.3.x' into 2.4.x
Closes gh-26250
2021-04-27 11:51:29 +01:00
Andy Wilkinson 715c4febf9 Update maformed address to one that should fail on CI
Closes gh-26247
2021-04-27 11:50:52 +01:00
Andy Wilkinson 091907f762 Rename default branch to main
Closes gh-26248
2021-04-27 11:27:37 +01:00
Phillip Webb d42ad237f5 Merge branch '2.4.x'
Closes gh-26242
2021-04-26 17:44:26 -07:00
Phillip Webb 94a70d6837 Merge branch '2.3.x' into 2.4.x
Closes gh-26241
2021-04-26 17:42:00 -07:00
Phillip Webb 1e0a3a946d Fix binding random properties test
See gh-26201
2021-04-26 17:36:58 -07:00
Phillip Webb f82b33698d Add missing asciidoctor heading anchors
Closes gh-26239
2021-04-26 17:35:14 -07:00
Phillip Webb ba5b36d733 Restore support for binding random properties
Revert 0588e989af so that `@ConfigurationProperties` can again be
bound using values from the `RandomValuePropertySource`.

Fixes gh-26201
2021-04-26 15:42:15 -07:00
Phillip Webb 5e8f383947 Extract code samples from docs
See gh-6313
2021-04-26 14:01:37 -07:00
Andy Wilkinson 6de10ff791 Merge branch '2.4.x'
Closes gh-26237
2021-04-26 15:53:37 +01:00
Andy Wilkinson 11fa850b97 Merge branch '2.3.x' into 2.4.x
Closes gh-26236
2021-04-26 15:53:18 +01:00
Andy Wilkinson 4a990f3ed2 Use bean class loader when importing auto-configuration
Fixes gh-26234
2021-04-26 15:38:01 +01:00
Brian Clozel 1732d8ccf7 Merge branch '2.4.x'
Closes gh-26233
2021-04-26 11:37:20 +02:00
Brian Clozel 7be9c268b8 Fix ignored use-last-modified property in Spring MVC
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.

This is due to an invalid test that missed this unintended change. This
commit fixes both problems.

Fixes gh-26212
2021-04-26 11:34:47 +02:00
Phillip Webb 32a87fcbda Extract code samples from docs
See gh-6313
2021-04-25 16:07:26 -07:00
Phillip Webb 2f852fa256 Update copyright year of changed files 2021-04-23 23:42:14 -07:00
Phillip Webb f30d48e3b3 Extract code samples from docs
See gh-6313
2021-04-23 23:41:06 -07:00
Phillip Webb 02cc778911 Extract code samples from docs
See gh-6313
2021-04-23 19:10:09 -07:00
Phillip Webb 3075ac0f54 Formatting 2021-04-23 11:17:49 -07:00
Slawomir Jaranowski 50118f67fd Test Maven plugin against latest Maven versions
See gh-26200
2021-04-22 14:59:16 +02:00
Stephane Nicoll a7b0f90609 Merge branch '2.4.x'
Closes gh-26211
2021-04-22 14:48:30 +02:00
Stephane Nicoll e424c1c4b4 Merge branch '2.3.x' into 2.4.x
Closes gh-26210
2021-04-22 14:48:15 +02:00
Shimizu, Yuko 474e460d5e Align Maven version in system requirements with what is actually tested
See gh-26209
2021-04-22 14:47:29 +02:00
Stephane Nicoll 65a7422a45 Upgrade to Kafka 2.6.2
Closes gh-24247
2021-04-22 14:12:55 +02:00
Stephane Nicoll e3f81f0243 Merge branch '2.4.x' 2021-04-21 17:23:42 +02:00
Stephane Nicoll db7460ddd5 Polish contribution based on Andy's review
See gh-26188
2021-04-21 17:23:21 +02:00
Stephane Nicoll 3ca6ed6246 Polish
Closes gh-26190
2021-04-21 17:20:22 +02:00
izeye 4be48d0d50 Polish
See gh-26188
2021-04-21 15:20:06 +02:00
Stephane Nicoll 6c68f3652c Merge branch '2.4.x'
Closes gh-26186
2021-04-21 10:03:41 +02:00
Stephane Nicoll 8edeb2c7a9 Merge branch '2.3.x' into 2.4.x
Closes gh-26185
2021-04-21 10:03:32 +02:00
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry
Closes gh-25610
2021-04-21 10:02:57 +02:00
Stephane Nicoll d403103aac Merge branch '2.4.x'
Closes gh-26182
2021-04-20 17:58:30 +02:00
Stephane Nicoll 6fc803c5a2 Merge branch '2.3.x' into 2.4.x
Closes gh-26181
2021-04-20 17:58:14 +02:00
Stephane Nicoll 6f73fd6785 Upgrade to Testcontainers 1.15.3
Closes gh-26179
2021-04-20 17:05:58 +02:00
Andy Wilkinson b9348c6d28 Merge branch '2.4.x'
Closes gh-26169
2021-04-20 11:26:46 +01:00
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x
Closes gh-26168
2021-04-20 11:19:10 +01:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration
Closes gh-26166
2021-04-20 11:15:13 +01:00
Stephane Nicoll 55b9fc12c7 Merge branch '2.4.x'
Closes gh-26165
2021-04-20 10:23:57 +02:00
Stephane Nicoll 52543b84c1 Fix sourceType for spring.profiles.include
Closes gh-26163
2021-04-20 10:23:42 +02:00
Stephane Nicoll cf5334da35 Merge branch '2.4.x'
Closes gh-26164
2021-04-20 10:22:55 +02:00
Stephane Nicoll 2bd4ccce8a Document spring.profiles.group in configuration metadata
Closes gh-26127
2021-04-20 10:22:43 +02:00
izeye e53453c69c Fix broken assertions in tests
This commit also restores the HTTP response body
assertion that has been dropped in 5873ddd.

See gh-26162
2021-04-20 10:02:26 +02:00
Stephane Nicoll 57d35aba12 Merge branch '2.4.x'
Closes gh-26160
2021-04-19 17:09:45 +02:00
Stephane Nicoll 6bbd36c77a Merge branch '2.3.x' into 2.4.x
Closes gh-26159
2021-04-19 17:01:28 +02:00
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to"
See gh-14928
2021-04-19 16:59:31 +02:00
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to
See gh-14928
2021-04-19 16:53:50 +02:00
Stephane Nicoll 531ee83c6a Merge branch '2.4.x'
Closes gh-26156
2021-04-19 14:33:17 +02:00
Stephane Nicoll 54613c77d4 Exclude beans with scheduled methods from global lazy init
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.

Closes gh-25315
2021-04-19 14:04:03 +02:00
Andy Wilkinson 177152e007 Merge branch '2.4.x'
Closes gh-26155
2021-04-19 10:24:25 +01:00
Andy Wilkinson 0c30a5930d Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
See gh-26149
2021-04-19 10:23:27 +01:00
Sriram 4268f8da84 Use ConfigDataLocationResolvers' class loader to load resolver names
See gh-26149
2021-04-19 10:06:07 +01:00
Stephane Nicoll 221f36ba93 Add missing value provider metadata for SQL init resources
Closes gh-26154
2021-04-19 09:51:51 +02:00
Stephane Nicoll 548baf7914 Update copyright year of changed file
See gh-26145
2021-04-19 09:34:56 +02:00
izeye 996472b42d Polish
See gh-26145
2021-04-19 09:34:55 +02:00
zuisong 95a9f36ac1 Fix wrong replacements for spring.datasource.[schema|data]
See gh-26150
2021-04-19 09:27:24 +02:00
Stephane Nicoll bac101647a Polish contribution
See gh-25532
2021-04-16 09:29:48 +02:00
katielevy1 bd9dd9d5eb Polish KotlinConstructorParametersBinderTests
See gh-25532
2021-04-16 09:22:45 +02:00
Phillip Webb e1ad2cdab3 Fix Windows build failures
See gh-23098
2021-04-15 18:31:01 -07:00
Phillip Webb a48c98b469 Revert "Switch default MVC path matching strategy"
This reverts commit ab8e599cfe.

See gh-24805
2021-04-15 17:35:24 -07:00
Phillip Webb beaf03a008 Update copyright year of changed files 2021-04-15 12:22:48 -07:00
Phillip Webb 238d0fed71 Improve Log4J log level reset support
Update `Log4J2LoggingSystem` so that call to `setLevel` with a `null`
level with remove the logger if it was previously configured by a
`LoggingSystem` call.

To track which loggers have been configured by us, and which have been
configure directly by the user, a custom `LoggerConfig` subclass is
used. We'll only remove `LevelSetLoggerConfig` classes, for any others
we'll call `setLevel(null)` on the config.

Prior to this commit, it was impossible to set then reset a logger
level using the actuator endpoint. This is because Log4J doesn't provide
a way to get the actual configured level. If the `setLevel(null)` has
been applied, then `getLevel()` will return the value of the parent
logger or a default value of `ERROR`.

Fixes gh-24298
2021-04-15 12:22:24 -07:00
Phillip Webb 96823869a9 Merge branch '2.4.x'
Closes gh-26139
2021-04-15 12:02:01 -07:00
Phillip Webb 302d500ee9 Add StandardConfigDataResource.getProfile method
Add a `StandardConfigDataResource.getProfile()` method so that it's
possible to tell the profile used when reading a profile specific
resource.

Fixes gh-25940
2021-04-15 12:01:34 -07:00
Andy Wilkinson 5142fe9b8e Fix typo in Initialize a Database using basic SQL scripts
Closes gh-26137
2021-04-15 17:03:31 +01:00
izeye e27c85698d Polish
See gh-26135
2021-04-15 16:31:10 +02:00
izeye fb5a1270e8 Add RepositoryMetricsAutoConfiguration to spring.factories
See gh-26134
2021-04-15 16:27:49 +02:00
dreis2211 beb7f7b02d Avoid some redirects in docs
See gh-26129
2021-04-15 10:39:07 +02:00
Stephane Nicoll f814beacec Upgrade to Spring Session Dragonfruit-SR3
Closes gh-25907
2021-04-15 09:05:10 +02:00
Stephane Nicoll e8eb68a458 Upgrade to Spring Session Dragonfruit-SR3
Closes gh-25907
2021-04-15 09:01:55 +02:00
Stephane Nicoll f558ceda9a Upgrade to Spring WS 3.1.0-RC1
Closes gh-25933
2021-04-15 08:49:08 +02:00
Stephane Nicoll 0146ced614 Upgrade to Spring Session 2021.0.0-RC1
Closes gh-25932
2021-04-15 08:48:41 +02:00
Stephane Nicoll 28d27f5fe7 Upgrade to Spring Kafka 2.7.0
Closes gh-25930
2021-04-15 08:48:09 +02:00
Stephane Nicoll 28665ee93b Upgrade to Spring Integration 5.5.0-RC1
Closes gh-25929
2021-04-15 08:47:41 +02:00
Phillip Webb 282a8e09d0 Merge branch '2.4.x'
Closes gh-26125
2021-04-14 17:43:12 -07:00
Phillip Webb 5b836f3aee Merge branch '2.3.x' into 2.4.x
Closes gh-26124
2021-04-14 17:42:38 -07:00
Phillip Webb 61ff3c98bf Polish 'Don't detect CloudPlatform when property is set'
See gh-25455
2021-04-14 17:29:30 -07:00
nguyensach 70f44d3a56 Don't detect CloudPlatform when property is set
Update `CloudPlatform.isActive` to back-off from detection when any
`spring.main.cloud-platform` property is set.

See gh-25455
2021-04-14 17:24:37 -07:00
Phillip Webb b4c9bb0d5c Merge branch '2.4.x'
Closes gh-26122
2021-04-14 15:05:55 -07:00
Phillip Webb fb3796dae8 Merge branch '2.3.x' into 2.4.x
Closes gh-26121
2021-04-14 15:02:58 -07:00
Phillip Webb fcb2210a87 Include optional shade plugin in published pom
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
2021-04-14 15:02:42 -07:00
Scott Frederick bf8051cd47 Log ApplicationAvailability state changes
Fixes gh-23098
2021-04-14 13:54:59 -05:00
Andy Wilkinson 1f0127036c Upgrade to Spring Integration 5.4.6
Closes gh-26113
2021-04-14 17:26:54 +01:00
Andy Wilkinson e6130c6ce0 Upgrade to Spring Integration 5.3.7.RELEASE
Closes gh-26112
2021-04-14 17:24:22 +01:00
Andy Wilkinson 9d0e1a2cb3 Include SQL init auto-config in Data RDBC test slice
Closes gh-24741
2021-04-14 16:37:33 +01:00
Andy Wilkinson 05adf02a47 Include SQL init auto-config in JDBC-based test slices
Closes gh-25323
2021-04-14 15:11:28 +01:00
Stephane Nicoll e2252c7856 Merge branch '2.4.x'
Closes gh-26111
2021-04-14 15:44:10 +02:00
Stephane Nicoll 401ebc672b Merge branch '2.3.x' into 2.4.x
Closes gh-26110
2021-04-14 15:43:57 +02:00
Stephane Nicoll ab785d9417 Document limitations of using deferred JPA bootstrap
Closes gh-24027
2021-04-14 15:38:34 +02:00
Stephane Nicoll fe2e57dee8 Upgrade to Spring Data 2021.0.0
Closes gh-25928
2021-04-14 15:18:12 +02:00
Stephane Nicoll 8c15e693d3 Merge branch '2.4.x'
Closes gh-26109
2021-04-14 15:07:23 +02:00
Stephane Nicoll 0d81b4d07e Merge branch '2.3.x' into 2.4.x
Closes gh-26108
2021-04-14 15:04:28 +02:00
Stephane Nicoll 0fb482579b Harmonize Neo4jContainer startup options
Closes gh-26084
2021-04-14 14:50:04 +02:00
Stephane Nicoll c04d640452 Scan for ElasticSearch's @Document type
Closes gh-26028
2021-04-14 14:42:32 +02:00
Stephane Nicoll 517998a829 Upgrade to Infinispan 12.1.1.Final
Closes gh-26053
2021-04-14 13:47:57 +02:00