Commit Graph

13047 Commits

Author SHA1 Message Date
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
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
Stephane Nicoll
0cedbf6e06 Upgrade to Spring Data 2020.0.8
Closes gh-25910
2021-04-14 13:37:24 +02:00
Stephane Nicoll
1de2dd9ecb Upgrade to Spring Data Neumann-SR9
Closes gh-25905
2021-04-14 13:31:16 +02:00
Stephane Nicoll
62a70475c2 Fix class condition on deprecated class
Closes gh-26107
2021-04-14 13:30:20 +02:00
Stephane Nicoll
c5214b3c84 Merge branch '2.4.x'
Closes gh-26105
2021-04-14 10:06:39 +02:00
Stephane Nicoll
1855f96d07 Polish "Document spring.config.additional-location should be used early"
See gh-26085
2021-04-14 10:06:06 +02:00
Shannon Carey
b0b1c04fc4 Document spring.config.additional-location should be used early
See gh-26085
2021-04-14 10:03:56 +02:00
Stephane Nicoll
90fccd7097 Upgrade to SAAJ Impl 1.5.3
Closes gh-26104
2021-04-14 08:47:27 +02:00
Stephane Nicoll
54d23bac9d Upgrade to Micrometer 1.6.6
Closes gh-26103
2021-04-14 08:47:26 +02:00
Stephane Nicoll
3a8736a112 Upgrade to Lettuce 6.0.4.RELEASE
Closes gh-26102
2021-04-14 08:47:25 +02:00