Commit Graph

15810 Commits (75fce16633c03d80cb11a6a3094fd784c1c61d1a)

Author SHA1 Message Date
Phillip Webb e4b398769f Merge branch '2.7.x' 3 years ago
Phillip Webb a77411ebd8 Merge branch '2.6.x' into 2.7.x
Closes gh-29460
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 d04ece044a Merge branch '2.7.x' 3 years ago
Andy Wilkinson 654d142c95 Merge branch '2.6.x' into 2.7.x
Closes gh-29455
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 4d3af14a1a Upgrade to Spring Web Services 4.0.0-M1
Closes gh-28648
3 years ago
Andy Wilkinson 26fecbe230 Upgrade to Thymeleaf and Security Extras 3.1.0-M1
Closes gh-49452
Closes gh-49453
3 years ago
Andy Wilkinson 12cd97a20c Reinstate support for Thymeleaf 3 years ago
Stephane Nicoll 5c9e59493d Upgrade to Spring Data 2021.2.0-M2
Closes gh-29223
3 years ago
rstoyanchev 68f4938367 Update GraphQL QBE auto-config
This change is the same as 68806bfef8
for Querydsl, but applied also to the Query By Example auto config.

Closes gh-29445
3 years ago
Stephane Nicoll f08a417462 Upgrade to Spring Security 6.0.0-M1
Closes gh-28643
3 years ago
Stephane Nicoll e5f981ea5f Upgrade to Spring AMQP 3.0.0-M1
Closes gh-28646
3 years ago
Stephane Nicoll 0ec9e6e7a8 Upgrade to Spring Kafka 3.0.0-M1
Closes gh-28647
3 years ago
Andy Wilkinson 964f028f75 Upgrade to Spring REST Docs 3.0.0-M1
Closes gh-28721
3 years ago
Andy Wilkinson db6e9a7a5f Start building against Spring Batch 5.0 snapshots
This commit adapts to some changes in Spring Batch 5.0:

- A DataSource bean is now required by Batch
- A PlatformTransactionManager bean is no longer defined by Batch

See gh-29278
3 years ago
Andy Wilkinson e23aaba32b Merge branch '2.6.x' into 2.7.x
Closes gh-29323
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 3bbdbd9e5f Upgrade to Spring Security 5.7.0-M1
Closes gh-29225
3 years ago
Stephane Nicoll ce6cc77ea7 Upgrade to Spring Kafka 2.8.2
Closes gh-29224
3 years ago
Stephane Nicoll 77e9047d31 Upgrade to Spring AMQP 2.4.2
Closes gh-29284
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
Stephane Nicoll 263dcde179 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29436
3 years ago
Stephane Nicoll 6c66ee5b82 Upgrade to MongoDB 4.4.1
Closes gh-29435
3 years ago
Stephane Nicoll 60d7968780 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29434
3 years ago
Stephane Nicoll 4304a57980 Upgrade to Jedis 3.7.1
Closes gh-29433
3 years ago
Stephane Nicoll 8febc140ac Upgrade to Elasticsearch 7.16.2
Closes gh-29432
3 years ago
Stephane Nicoll 1e719c1d07 Upgrade to Couchbase Client 3.2.4
Closes gh-29431
3 years ago
Stephane Nicoll 3510796ab0 Upgrade to Spring Data 2022.0.0-M1
Closes gh-28641
3 years ago
Stephane Nicoll 4025a8cf4c Upgrade to Spring LDAP 3.0.0-M1
Closes gh-29430
3 years ago
Stephane Nicoll 4f8af5a4b0 Upgrade to Spring HATEOAS 2.0.0-M1
Closes gh-28869
3 years ago
Stephane Nicoll 2f7d62eae9 Upgrade to SLF4J 1.7.33
Closes gh-29427
3 years ago
Stephane Nicoll 781ad288b0 Upgrade to SendGrid 4.8.2
Closes gh-29426
3 years ago
Stephane Nicoll a15ff0692c Upgrade to Rabbit AMQP Client 5.14.1
Closes gh-29425
3 years ago
Stephane Nicoll 6be4146907 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29424
3 years ago
Stephane Nicoll 0cb553c0da Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29423
3 years ago
Stephane Nicoll 998c7996aa Upgrade to Netty 4.1.73.Final
Closes gh-29422
3 years ago
Stephane Nicoll 3830e7a3bb Upgrade to Neo4j Java Driver 4.4.2
Closes gh-29421
3 years ago
Stephane Nicoll 5676e796d0 Upgrade to MongoDB 4.4.1
Closes gh-29420
3 years ago
Stephane Nicoll db389d7cac Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29419
3 years ago
Stephane Nicoll da3de9684a Upgrade to Maven Compiler Plugin 3.9.0
Closes gh-29418
3 years ago
Stephane Nicoll 28ecf53762 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29417
3 years ago
Stephane Nicoll b2c92457ab Upgrade to Jedis 3.8.0
Closes gh-29416
3 years ago
Stephane Nicoll 2c403cb0e8 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29415
3 years ago
Stephane Nicoll cf3935073f Upgrade to Byte Buddy 1.12.7
Closes gh-29414
3 years ago
Stephane Nicoll 998a74bf97 Upgrade to Build Helper Maven Plugin 3.3.0
Closes gh-29413
3 years ago
Stephane Nicoll 388b12a048 Upgrade to Spring LDAP 2.4.0-M1
Closes gh-29222
3 years ago
Stephane Nicoll 7c85d2bc07 Upgrade to Spring HATEOAS 1.5.0-M1
Closes gh-29353
3 years ago
Phillip Webb 3146465d25 Merge branch '2.7.x' 3 years ago
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