Phillip Webb
a2e473ec31
Merge branch '2.6.x' into 2.7.x
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
d0e7ab3b70
Merge branch '2.7.x'
...
Closes gh-29412
3 years ago
Phillip Webb
e4e16f81ec
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29411
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
0367e13d90
Merge branch '2.7.x'
3 years ago
Phillip Webb
9c481952d8
Remove deprecated convertEnvironment method
3 years ago
Phillip Webb
32e8b30c36
Merge branch '2.7.x'
...
Closes gh-29408
3 years ago
Phillip Webb
9764b3eba0
Change getEnvironment() to return null by default
...
Update the `SpringBootContextLoader.getEnvironment()` method so that it
returns `null` rather than a new `StandardEnvironment`.
Closes gh-29405
3 years ago
Phillip Webb
05a1ef233a
Merge branch '2.7.x'
...
Closes gh-29407
3 years ago
Phillip Webb
c84d3c14fb
Allow test property sources to override command line args
...
Refine `SpringBootContextLoader` logic so that inline test properties
are always added above command line arguments.
Closes gh-29404
3 years ago
Phillip Webb
cb97aff1e7
Merge branch '2.7.x'
3 years ago
Phillip Webb
9278a502c7
Merge branch '2.6.x' into 2.7.x
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
Brian Clozel
fe82098d7d
Merge branch '2.7.x'
3 years ago
Brian Clozel
cdee953252
Polish
3 years ago
Brian Clozel
68806bfef8
Fix build after Spring for GraphQL changes
...
See spring-projects/spring-graphql#244
3 years ago
Andy Wilkinson
d60da1cc59
Merge branch '2.7.x'
3 years ago
Andy Wilkinson
b67cc62c37
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29402
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
16447e1bce
Merge branch '2.7.x'
3 years ago
Andy Wilkinson
ece4c8ad93
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29400
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
Andy Wilkinson
15dafebe0d
Polish "Avoid split java.xml packages that cause JDT compile errors"
...
See gh-29389
3 years ago
Dave Syer
32a6c7df49
Avoid split java.xml packages that cause JDT compile errors
...
Without this change I get compiler errors from JDT in the IDE
(VSCode). It seems to be harmless from the point of view of the
command line build with the JDK.
See gh-29389
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
Stephane Nicoll
abb88b9aeb
Upgrade to Micrometer 2.0.0-M1
...
Closes gh-29279
3 years ago
Andy Wilkinson
a79cba129f
Remove faulty javadoc styling
...
The styling does not work with Java 17-generated javadoc. Following
Spring Framework's lead, this commit removes the custom styling.
See gh-28101
3 years ago
Stephane Nicoll
9a9cfa78c8
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
77a9d0b6f1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29381
3 years ago
Omkar Shetkar
c19e192acd
Fix duplicate "Logging" link
...
See gh-29380
3 years ago
Stephane Nicoll
5161e5a5f2
Upgrade to Spring Framework 6.0.0-M2
...
Closes gh-28642
3 years ago
Stephane Nicoll
d82fbcb43b
Upgrade to Micrometer 1.9.0-M2
...
Closes gh-29282
3 years ago
Stephane Nicoll
7a0f7c498f
Upgrade to Spring Framework 5.3.15
...
Closes gh-29328
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
4dac38cb63
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
1bf13371c4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29378
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
13f257a706
Merge branch '2.7.x'
3 years ago
Phillip Webb
8147eb6d6d
Merge branch '2.6.x' into 2.7.x
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
3d6840e715
Merge branch '2.7.x'
...
Closes gh-29376
3 years ago
Phillip Webb
fee45e056a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29375
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
1b7db2750d
Merge branch '2.7.x'
...
Closes gh-29373
3 years ago
Phillip Webb
e1c84e2972
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29372
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
ef9a258174
Merge branch '2.7.x'
...
Closes gh-29369
3 years ago
Phillip Webb
ae4d9ccb2d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29368
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
315fa45f46
Start building against Spring Security 5.7.0-M1 snapshots
...
See gh-29225
3 years ago
Stephane Nicoll
90b8d2190f
Adapt to latest change in Spring Data Elasticsearch
3 years ago
Stephane Nicoll
be55ea9c29
Start building against Spring Framework 5.3.15 snapshots
...
See gh-29328
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
2a95bfed5c
Start building against Spring REST Docs 2.0.6 snapshots
...
See gh-29323
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
fb399ec284
Merge branch '2.7.x'
3 years ago