Commit Graph

33935 Commits

Author SHA1 Message Date
Phillip Webb
de8f8c3e64 Refine LoaderIntegrationTests for CI
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.

See gh-29385
2022-01-18 18:16:47 -08:00
Phillip Webb
3d908079ef Run LoaderIntegrationTests against multiple JDKs
Update `LoaderIntegrationTests` to run against OpenJDK 8, 11 and 17 as
well as Oracle JDK 17.

Closes gh-29385
2022-01-18 17:36:48 -08:00
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
2022-01-18 16:14:52 -08:00
Andy Wilkinson
1c6471ef60 Register AprLifecycleListener with Server not Context
Fixes gh-28814
2022-01-18 20:34:08 +00:00
Andy Wilkinson
2394cbf650 Merge pull request #29444 from jprinet
* gh-29444:
  Upgrade to Gradle Enterprise Plugin 3.8.1

Closes gh-29444
2022-01-18 11:59:54 +00:00
Jerome Prinet
744d977480 Upgrade to Gradle Enterprise Plugin 3.8.1
See gh-29444
2022-01-18 11:59:36 +00:00
Andy Wilkinson
75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE
Closes gh-29321
2022-01-17 13:05:15 +00:00
Stephane Nicoll
e545441f01 Upgrade to Spring Kafka 2.7.10
Closes gh-29313
2022-01-17 08:41:47 +01:00
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
2022-01-14 22:55:26 -08:00
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
2022-01-14 20:32:34 -08:00
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
2022-01-14 13:47:22 -08:00
Andy Wilkinson
e8cbec0836 Clarify documentation of RestTemplate customization
Closes gh-29394
2022-01-14 15:51:08 +00:00
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
2022-01-14 15:48:31 +00:00
Stephane Nicoll
5883b22e01 Upgrade to SLF4J 1.7.33
Closes gh-29392
2022-01-14 12:21:04 +01:00
Stephane Nicoll
1e22504d21 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29391
2022-01-14 12:21:02 +01:00
Stephane Nicoll
251f4e8a3f Upgrade to Spring AMQP 2.3.14
Closes gh-29312
2022-01-14 12:12:00 +01:00
Stephane Nicoll
777361421c Upgrade to Spring Data 2021.0.8
Closes gh-29311
2022-01-14 12:11:30 +01:00
Stephane Nicoll
37a44f45a0 Upgrade to Spring HATEOAS 1.3.7
Closes gh-29352
2022-01-14 12:10:46 +01:00
Stephane Nicoll
aa0a788800 Upgrade to Micrometer 1.7.8
Closes gh-29310
2022-01-13 14:36:51 +01:00
Stephane Nicoll
5428106925 Upgrade to Spring Framework 5.3.15
Closes gh-29326
2022-01-13 14:36:10 +01:00
Stephane Nicoll
a96434467a Upgrade CI to Docker 20.10.12
Closes gh-29362
2022-01-13 10:06:59 +01:00
Stephane Nicoll
6695f66045 Upgrade Ubuntu version in CI images
Closes gh-29363
2022-01-13 10:06:18 +01:00
Stephane Nicoll
a6db1b71cf Merge pull request #29112 from izeye
* pr/29112:
  Update copyright year of changed file
  Polish SpringBootContextLoaderTests

Closes gh-29112
2022-01-13 08:45:29 +01:00
Stephane Nicoll
5f03ace40f Update copyright year of changed file
See gh-29112
2022-01-13 08:43:03 +01:00
izeye
74c522c745 Polish SpringBootContextLoaderTests
See gh-29112
2022-01-13 08:42:36 +01:00
Phillip Webb
27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
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
2022-01-12 14:21:52 -08:00
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
2022-01-12 14:05:30 -08:00
Phillip Webb
7c16668bf3 Log Docker output to aid debugging
Add an SLF4J logger so that we can see real time output of the
Docker container.

See gh-29370
2022-01-12 14:03:27 -08:00
Phillip Webb
827309f36f Upgrade to Testcontainers 1.16.2
Closes gh-29366
2022-01-12 13:52:43 -08:00
Stephane Nicoll
ca39780ff3 Upgrade to Netty 4.1.73.Final
Closes gh-29341
2022-01-12 13:51:24 +01:00
Stephane Nicoll
cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29340
2022-01-12 13:51:23 +01:00
Stephane Nicoll
db9097b0d6 Upgrade to Logback 1.2.10
Closes gh-29339
2022-01-12 13:51:21 +01:00
Stephane Nicoll
d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29338
2022-01-12 13:51:20 +01:00
Stephane Nicoll
36811f9e1e Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29337
2022-01-12 13:51:19 +01:00
Stephane Nicoll
7125bd3779 Upgrade to Jaybird 4.0.5.java8
Closes gh-29336
2022-01-12 13:51:18 +01:00
Stephane Nicoll
404fb521ec Upgrade to Infinispan 12.1.11.Final
Closes gh-29335
2022-01-12 13:51:17 +01:00
Stephane Nicoll
33da06cff0 Upgrade to HttpCore5 5.1.3
Closes gh-29334
2022-01-12 13:51:15 +01:00
Andy Wilkinson
ba3842b7a6 Upgrade to Gradle Enterprise plugin 3.8
Closes gh-29254
2022-01-12 09:58:57 +00:00
Andy Wilkinson
63e2ccd489 Upgrade to Gradle Enterprise Conventions 0.0.9
Closes gh-29325
2022-01-12 09:58:57 +00:00
Stephane Nicoll
b5407e6e8e Start building against Spring Framework 5.3.15 snapshots
See gh-29326
2022-01-12 09:29:36 +01:00
Andy Wilkinson
27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29321
2022-01-11 20:09:39 +00:00
Stephane Nicoll
c2925f8e84 Start building against Spring Integration 5.5.8 snapshots
See gh-29314
2022-01-11 17:22:20 +01:00
Stephane Nicoll
116427c78e Start building against Spring Kafka 2.7.10 snapshots
See gh-29313
2022-01-11 17:22:20 +01:00
Stephane Nicoll
53fcf0971e Start building against Spring AMQP 2.3.14 snapshots
See gh-29312
2022-01-11 17:22:20 +01:00
Stephane Nicoll
72e72bda67 Start building against Micrometer 1.7.8 snapshots
See gh-29310
2022-01-11 17:22:19 +01:00
Stephane Nicoll
79fd0ad30a Upgrade to Reactor 2020.0.15
Closes gh-29309
2022-01-11 17:22:18 +01:00
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
2022-01-05 11:49:48 +00:00
Phillip Webb
9a6f35cd8e Update copyright year of changed files 2022-01-04 12:23:53 -08:00
Phillip Webb
0fcdab3936 Update copyright year of changed files 2022-01-04 12:17:10 -08:00