Commit Graph

31939 Commits (55b9fc12c7fb18e9c966feabee5ae575cdebb53b)
 

Author SHA1 Message Date
Stephane Nicoll 55b9fc12c7 Merge branch '2.4.x'
Closes gh-26165
4 years ago
Stephane Nicoll 52543b84c1 Fix sourceType for spring.profiles.include
Closes gh-26163
4 years ago
Stephane Nicoll cf5334da35 Merge branch '2.4.x'
Closes gh-26164
4 years ago
Stephane Nicoll 2bd4ccce8a Document spring.profiles.group in configuration metadata
Closes gh-26127
4 years ago
Stephane Nicoll 6965e3db06 Merge pull request #26162 from izeye
* pr/26162:
  Fix broken assertions in tests

Closes gh-26162
4 years ago
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
4 years ago
Stephane Nicoll 57d35aba12 Merge branch '2.4.x'
Closes gh-26160
4 years ago
Stephane Nicoll 6bbd36c77a Merge branch '2.3.x' into 2.4.x
Closes gh-26159
4 years ago
Stephane Nicoll 57c199d4d1 Merge pull request #14928 from nicce
* pr/14928:
  Polish "Enhance multiple entity manager factories how-to"
  Enhance multiple entity manager factories how-to

Closes gh-14928
4 years ago
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to"
See gh-14928
4 years ago
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to
See gh-14928
4 years ago
Stephane Nicoll 531ee83c6a Merge branch '2.4.x'
Closes gh-26156
4 years ago
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
4 years ago
Andy Wilkinson 177152e007 Merge branch '2.4.x'
Closes gh-26155
4 years ago
Andy Wilkinson aa9d0bc421 Merge pull request #26149 from vsriram92
* gh-26194:
  Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
  Use ConfigDataLocationResolvers' class loader to load resolver names

Closes gh-26149
4 years ago
Andy Wilkinson 0c30a5930d Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
See gh-26149
4 years ago
Sriram 4268f8da84 Use ConfigDataLocationResolvers' class loader to load resolver names
See gh-26149
4 years ago
Stephane Nicoll 221f36ba93 Add missing value provider metadata for SQL init resources
Closes gh-26154
4 years ago
Stephane Nicoll 661ff34dcd Merge pull request #26145 from izeye
* pr/26145:
  Update copyright year of changed file
  Polish

Closes gh-26145
4 years ago
Stephane Nicoll 548baf7914 Update copyright year of changed file
See gh-26145
4 years ago
izeye 996472b42d Polish
See gh-26145
4 years ago
Stephane Nicoll fea53294e4 Merge pull request #26150 from zuisong
* pr/26150:
  Fix wrong replacements for spring.datasource.[schema|data]

Closes gh-26150
4 years ago
zuisong 95a9f36ac1 Fix wrong replacements for spring.datasource.[schema|data]
See gh-26150
4 years ago
Stephane Nicoll 086d289636 Merge branch '2.4.x' 4 years ago
Stephane Nicoll d3ca939aa8 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll a1a2f00b65 Upgrade CI to Docker 20.10.6
Closes gh-26118
4 years ago
Stephane Nicoll 23cd375e52 Upgrade CI to Docker 20.10.6
Closes gh-26119
4 years ago
Stephane Nicoll df3f026f3b Upgrade CI to Docker 20.10.6
Closes gh-26117
4 years ago
Stephane Nicoll 9f8c58b22b Merge pull request #25532 from katielevy1
* pr/25532:
  Polish contribution
  Polish KotlinConstructorParametersBinderTests

Closes gh-25532
4 years ago
Stephane Nicoll bac101647a Polish contribution
See gh-25532
4 years ago
katielevy1 bd9dd9d5eb Polish KotlinConstructorParametersBinderTests
See gh-25532
4 years ago
Phillip Webb e1ad2cdab3 Fix Windows build failures
See gh-23098
4 years ago
Phillip Webb a48c98b469 Revert "Switch default MVC path matching strategy"
This reverts commit ab8e599cfe.

See gh-24805
4 years ago
Phillip Webb beaf03a008 Update copyright year of changed files 4 years ago
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
4 years ago
Phillip Webb 96823869a9 Merge branch '2.4.x'
Closes gh-26139
4 years ago
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
4 years ago
Andy Wilkinson 5142fe9b8e Fix typo in Initialize a Database using basic SQL scripts
Closes gh-26137
4 years ago
Stephane Nicoll 182b75a1fd Merge pull request #26135 from izeye
* pr/26135:
  Polish

Closes gh-26135
4 years ago
izeye e27c85698d Polish
See gh-26135
4 years ago
Stephane Nicoll 641df02bc3 Merge pull request #26134 from izeye
* pr/26134:
  Add RepositoryMetricsAutoConfiguration to spring.factories

Closes gh-26134
4 years ago
izeye fb5a1270e8 Add RepositoryMetricsAutoConfiguration to spring.factories
See gh-26134
4 years ago
Stephane Nicoll 843a796116 Merge branch '2.4.x' 4 years ago
Spring Buildmaster 270bf0f937 Next development version (v2.4.6-SNAPSHOT) 4 years ago
Andy Wilkinson 3810b4c361 Merge branch '2.4.x' 4 years ago
Andy Wilkinson c48a48f0a2 Merge branch '2.3.x' into 2.4.x 4 years ago
Spring Buildmaster dea62c1734 Next development version (v2.3.11.BUILD-SNAPSHOT) 4 years ago
Andy Wilkinson 01fb599f6e Revert "Attempt to overcome Docker rate limiting on CI"
This reverts commit 51d57e19d0.

See gh-25838
4 years ago
Andy Wilkinson bfe8e5ac19 Revert changes to make staging run Docker
See gh-26130
4 years ago
Stephane Nicoll 39a97f7b2d Merge pull request #26129 from dreis2211
* pr/26129:
  Avoid some redirects in docs

Closes gh-26129
4 years ago