Commit Graph

15523 Commits (b73c67e53eddc6ba1157f31cbbbd2c977c08e9a7)

Author SHA1 Message Date
Stephane Nicoll 6ae5bfb728 Upgrade to MariaDB 2.7.5
Closes gh-29496
3 years ago
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb d211b0f3b3 Disable test is Docker is not available
See gh-28843
3 years ago
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated
Closes gh-29488
3 years ago
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x
Closes gh-29485
3 years ago
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java
Closes gh-29484
3 years ago
Andy Wilkinson 52f612b3eb Merge branch '2.5.x' into 2.6.x
Closes gh-29480
3 years ago
Andy Wilkinson 9cb66d55d1 Refer to Maven Resolver rather than Aether
Closes gh-29255
3 years ago
Stephane Nicoll d92939e773 Merge branch '2.5.x' into 2.6.x
Closes gh-29478
3 years ago
Stephane Nicoll 4eb458f7d8 Prevent early resolution of factory beans
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.

Closes gh-29475
3 years ago
Stephane Nicoll 124a3219e8 Upgrade to Pooled JMS 1.2.3
Closes gh-29468
3 years ago
Stephane Nicoll 60971c6fdb Upgrade to MySQL 8.0.28
Closes gh-29467
3 years ago
Stephane Nicoll aba3b1dc5f Upgrade to Spring Integration 5.5.8
Closes gh-29320
3 years ago
Stephane Nicoll cdd479556f Upgrade to Pooled JMS 1.2.3
Closes gh-29466
3 years ago
Stephane Nicoll 849fb8e435 Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29465
3 years ago
Stephane Nicoll 3a043603e8 Upgrade to MySQL 8.0.28
Closes gh-29464
3 years ago
Stephane Nicoll 2782c3b077 Upgrade to Spring Integration 5.5.8
Closes gh-29314
3 years ago
Phillip Webb 3b4409305a Merge branch '2.5.x' into 2.6.x
Closes gh-29459
3 years ago
Phillip Webb 3d46b06e8d Fix config data placeholder resolution active document logic
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.

The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.

Fixes gh-29386
3 years ago
Andy Wilkinson 4ee260aa8c Merge branch '2.5.x' into 2.6.x
Closes gh-29454
3 years ago
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context
Fixes gh-28814
3 years ago
Andy Wilkinson 27cd1c06a6 Merge branch '2.5.x' into 2.6.x
Closes gh-29322
3 years ago
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE
Closes gh-29321
3 years ago
Stephane Nicoll a9feb923d7 Update to Spring Kafka 2.8.2
Closes gh-29319
3 years ago
Stephane Nicoll 200c05ff98 Upgrade to Spring AMQP 2.4.2
Closes gh-29318
3 years ago
Stephane Nicoll e545441f01 Upgrade to Spring Kafka 2.7.10
Closes gh-29313
3 years ago
Phillip Webb 6afd9b665d Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
3 years ago
Phillip Webb 28cf6f5c59 Merge branch '2.5.x' into 2.6.x
Closes gh-29410
3 years ago
Phillip Webb 79d9549805 Fix ConfigurationPropertySources attach logic
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.

Fixes gh-29409
3 years ago
Phillip Webb 14fe9347b5 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 3f7bf7d34f Modify SpringApplication Environment rather than setting it
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
3 years ago
Andy Wilkinson d29a5a2f43 Merge branch '2.5.x' into 2.6.x
Closes gh-29401
3 years ago
Andy Wilkinson e8cbec0836 Clarify documentation of RestTemplate customization
Closes gh-29394
3 years ago
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x
Closes gh-29399
3 years ago
Andy Wilkinson d051146eb4 Use Testcontainers instead on Embedded Mongo
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
3 years ago
Stephane Nicoll 1666b1c284 Upgrade to Neo4j Java Driver 4.4.2
Closes gh-29398
3 years ago
Stephane Nicoll c2fa4ffd7e Upgrade to SLF4J 1.7.33
Closes gh-29397
3 years ago
Stephane Nicoll afcba76c3c Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29396
3 years ago
Stephane Nicoll dac4888137 Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29395
3 years ago
Stephane Nicoll af79829cab Upgrade to Spring Data 2021.1.1
Closes gh-29317
3 years ago
Stephane Nicoll 1e44e4e52e Upgrade to Spring HATEOAS 1.4.1
Closes gh-29283
3 years ago
Stephane Nicoll 5883b22e01 Upgrade to SLF4J 1.7.33
Closes gh-29392
3 years ago
Stephane Nicoll 1e22504d21 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29391
3 years ago
Stephane Nicoll 251f4e8a3f Upgrade to Spring AMQP 2.3.14
Closes gh-29312
3 years ago
Stephane Nicoll 777361421c Upgrade to Spring Data 2021.0.8
Closes gh-29311
3 years ago
Stephane Nicoll 37a44f45a0 Upgrade to Spring HATEOAS 1.3.7
Closes gh-29352
3 years ago
Omkar Shetkar c19e192acd Fix duplicate "Logging" link
See gh-29380
3 years ago
Stephane Nicoll 832d8845df Upgrade to Micrometer 1.8.2
Closes gh-29316
3 years ago
Stephane Nicoll f65d766fbe Upgrade to Spring Framework 5.3.15
Closes gh-29327
3 years ago
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8
Closes gh-29310
3 years ago
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15
Closes gh-29326
3 years ago
Stephane Nicoll 8384019a41 Merge branch '2.5.x' into 2.6.x
Closes gh-29377
3 years ago
Stephane Nicoll 5f03ace40f Update copyright year of changed file
See gh-29112
3 years ago
izeye 74c522c745 Polish SpringBootContextLoaderTests
See gh-29112
3 years ago
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 27ad0804f5 Update copyright year of changed files 3 years ago
Phillip Webb 91d2b1b988 Merge branch '2.5.x' into 2.6.x
Closes gh-29374
3 years ago
Phillip Webb eb6b48fff0 Use side-effect free environment with tests rather than converting
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
3 years ago
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
3 years ago
Phillip Webb 9cf55808fb Ensure run user actually exists
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.

Fixes gh-29370
3 years ago
Phillip Webb 3ae7c45900 Merge branch '2.5.x' into 2.6.x
Closes gh-29367
3 years ago
Phillip Webb 827309f36f Upgrade to Testcontainers 1.16.2
Closes gh-29366
3 years ago
Stephane Nicoll ee938cf822 Upgrade to Netty 4.1.73.Final
Closes gh-29351
3 years ago
Stephane Nicoll d8739c463b Upgrade to MongoDB 4.4.1
Closes gh-29350
3 years ago
Stephane Nicoll e14c13c75f Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29349
3 years ago
Stephane Nicoll 8cdccb6cb3 Upgrade to Logback 1.2.10
Closes gh-29348
3 years ago
Stephane Nicoll 61e08e3510 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29347
3 years ago
Stephane Nicoll b19593ee47 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29346
3 years ago
Stephane Nicoll 98118bc480 Upgrade to Jaybird 4.0.5.java8
Closes gh-29345
3 years ago
Stephane Nicoll 838cded308 Upgrade to Infinispan 12.1.11.Final
Closes gh-29344
3 years ago
Stephane Nicoll 4309b78f02 Upgrade to HttpCore5 5.1.3
Closes gh-29343
3 years ago
Stephane Nicoll ca39780ff3 Upgrade to Netty 4.1.73.Final
Closes gh-29341
3 years ago
Stephane Nicoll cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29340
3 years ago
Stephane Nicoll db9097b0d6 Upgrade to Logback 1.2.10
Closes gh-29339
3 years ago
Stephane Nicoll d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29338
3 years ago
Stephane Nicoll 36811f9e1e Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29337
3 years ago
Stephane Nicoll 7125bd3779 Upgrade to Jaybird 4.0.5.java8
Closes gh-29336
3 years ago
Stephane Nicoll 404fb521ec Upgrade to Infinispan 12.1.11.Final
Closes gh-29335
3 years ago
Stephane Nicoll 33da06cff0 Upgrade to HttpCore5 5.1.3
Closes gh-29334
3 years ago
Stephane Nicoll c32912f05f Start building against Spring Framework 5.3.15 snapshots
See gh-29327
3 years ago
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots
See gh-29326
3 years ago
Andy Wilkinson c211aa0ac2 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29322
3 years ago
Andy Wilkinson 27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29321
3 years ago
Stephane Nicoll b9716ca4ee Start building against Spring Integration 5.5.8 snapshots
See gh-29320
3 years ago
Stephane Nicoll 504421c4a5 Start building against Spring Kafka 2.8.2 snapshots
See gh-29319
3 years ago
Stephane Nicoll ef4915ee55 Start building against Spring AMQP 2.4.2 snapshots
See gh-29318
3 years ago
Stephane Nicoll b05f435b27 Start building against Spring Data 2021.1.1 snapshots
See gh-29317
3 years ago
Stephane Nicoll 2da271a240 Start building against Micrometer 1.8.2 snapshots
See gh-29316
3 years ago
Stephane Nicoll 17b0ac61aa Upgrade to Reactor 2020.0.15
Closes gh-29315
3 years ago
Stephane Nicoll c2925f8e84 Start building against Spring Integration 5.5.8 snapshots
See gh-29314
3 years ago
Stephane Nicoll 116427c78e Start building against Spring Kafka 2.7.10 snapshots
See gh-29313
3 years ago
Stephane Nicoll 53fcf0971e Start building against Spring AMQP 2.3.14 snapshots
See gh-29312
3 years ago
Stephane Nicoll 72e72bda67 Start building against Micrometer 1.7.8 snapshots
See gh-29310
3 years ago
Stephane Nicoll 79fd0ad30a Upgrade to Reactor 2020.0.15
Closes gh-29309
3 years ago
Andy Wilkinson a6d8ff4677 Merge branch '2.5.x' into 2.6.x
Closes gh-29268
3 years ago
Andy Wilkinson 41b01cc289 Only write parent entries when entry is new
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.

This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.

Fixes gh-29175
3 years ago
Phillip Webb 99a683dffb Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 9a6f35cd8e Update copyright year of changed files 3 years ago
Phillip Webb 81266ca806 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 0fcdab3936 Update copyright year of changed files 3 years ago
Phillip Webb 8e583f6f73 Apply exclusion rules to child contributors
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
3 years ago
Stephane Nicoll c469c41127 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 04ce0e65cd Polish assertion 3 years ago
Stephane Nicoll f54ea67ed6 Merge branch '2.5.x' into 2.6.x
Closes gh-29198
3 years ago
dreis2211 7a87d18b12 Update copyrights to 2022
See gh-29195
3 years ago
izeye d234681348 Fix default value for management.info.env.enabled in metadata
See gh-29187
3 years ago
Stephane Nicoll b345dddec0 Upgrade to Log4j2 2.17.1
Closes gh-29184
3 years ago
Stephane Nicoll 4b6aa81687 Upgrade to Log4j2 2.17.1
Closes gh-29183
3 years ago
izeye 7fbb5749d1 Polish
See gh-29157
3 years ago
Stephane Nicoll 8ee0640cc0 Merge branch '2.5.x' into 2.6.x
Closes gh-29172
3 years ago
izeye 9a6c1c531d Test our Gradle plugin against Gradle 7.3.3
See gh-29161
3 years ago
Stephane Nicoll 61c978e835 Upgrade to Spring Integration 5.5.7
Closes gh-28975
3 years ago
Stephane Nicoll 369046c37d Upgrade to Spring Integration 5.5.7
Closes gh-28966
3 years ago
Stephane Nicoll c7487749de Upgrade to Spring Session 2021.1.1
Closes gh-28974
3 years ago
Stephane Nicoll 2e67645fd5 Upgrade to Hazelcast 4.2.4
Closes gh-29146
3 years ago
Stephane Nicoll f3621702fb Upgrade to Hazelcast 4.1.8
Closes gh-29145
3 years ago
Stephane Nicoll a6350f2307 Upgrade to Spring Session 2021.0.4
Closes gh-28965
3 years ago
Stephane Nicoll b1ab3b8898 Revert "Upgrade to Spring Kafka 2.7.10"
See gh-29114
3 years ago
Stephane Nicoll 669710efe0 Upgrade to Spring Security 5.6.1
Closes gh-28973
3 years ago
Stephane Nicoll af77ee007a Upgrade to Spring Kafka 2.8.1
Closes gh-29017
3 years ago
Stephane Nicoll 66c43685f5 Upgrade to Spring AMQP 2.4.1
Closes gh-28995
3 years ago
Stephane Nicoll 44a9145bf8 Upgrade to Spring Security 5.5.4
Closes gh-28964
3 years ago
Stephane Nicoll 6f8e1166c6 Upgrade to Spring Kafka 2.7.10
Closes gh-29114
3 years ago
Stephane Nicoll b2c2e6d0ca Upgrade to Spring AMQP 2.3.13
Closes gh-28994
3 years ago
Scott Frederick b3a304fbe7 Merge branch '2.5.x' into 2.6.x
Closes gh-29143
3 years ago
Scott Frederick e4b0575a12 Do not consider bridge methods when binding java bean properties
Fixes gh-28917
3 years ago
Madhura Bhave 84f1a6ca09 Merge branch '2.5.x' into 2.6.x
Closes gh-29138
3 years ago
Madhura Bhave 99e650bd27 Document devtools remote support not available with WebFlux
Closes gh-28955
3 years ago
Stephane Nicoll 653fdbd0a4 Configure comment prefixes
Closes gh-29095
3 years ago
Stephane Nicoll 53654a0160 Merge branch '2.5.x' into 2.6.x
Closes gh-29133
3 years ago
Pavel Anisimov b704ee0b30 Polish reference doc
See gh-29115
3 years ago
Stephane Nicoll fd32ff3a51 Upgrade to XmlUnit2 2.8.4
Closes gh-29131
3 years ago
Stephane Nicoll fbb7f12f43 Upgrade to XmlUnit2 2.8.4
Closes gh-29123
3 years ago
Stephane Nicoll 64a5415edc Upgrade to Jackson Bom 2.13.1
Closes gh-29129
3 years ago
Stephane Nicoll d9a970a8e2 Upgrade to Infinispan 12.1.10.Final
Closes gh-29128
3 years ago
Stephane Nicoll a8fc4e9351 Upgrade to Hibernate 5.6.3.Final
Closes gh-29127
3 years ago
Stephane Nicoll 07c8ab2236 Upgrade to Ehcache3 3.9.9
Closes gh-29126
3 years ago
Stephane Nicoll 9ec44d80cf Upgrade to Dropwizard Metrics 4.2.7
Closes gh-29125
3 years ago
Stephane Nicoll 177fd6c539 Upgrade to DB2 JDBC 11.5.7.0
Closes gh-29124
3 years ago
Stephane Nicoll 620c6ec275 Upgrade to Infinispan 12.1.10.Final
Closes gh-29121
3 years ago
Stephane Nicoll d0cd7dcf60 Upgrade to Hibernate 5.4.33
Closes gh-29120
3 years ago
Stephane Nicoll cb81801907 Upgrade to Ehcache3 3.9.9
Closes gh-29119
3 years ago
Stephane Nicoll d8d97df34a Upgrade to Dropwizard Metrics 4.1.29
Closes gh-29118
3 years ago
Stephane Nicoll 8306287158 Upgrade to DB2 JDBC 11.5.7.0
Closes gh-29117
3 years ago
Stephane Nicoll bb1a1a0622 Upgrade to Spring LDAP 2.3.5
Closes gh-28972
3 years ago
Stephane Nicoll f619d66244 Upgrade to Spring LDAP 2.3.5
Closes gh-28963
3 years ago
Stephane Nicoll aab30b13b3 Start building against Spring Kafka 2.7.10 snapshots
See gh-29114
3 years ago
Stephane Nicoll efa93506e6 Fix checkstyle violations 3 years ago
Stephane Nicoll 012fbdd43d Upgrade to Log4j2 2.17.0
Closes gh-28984
3 years ago