Commit Graph

16134 Commits (bf1ed5f2f867e92b62b2512be4d9d83dd7f40882)

Author SHA1 Message Date
Phillip Webb 2b40ce09d8 Update copyright year of changed files 3 years ago
Phillip Webb 5975cdc5ed Polish formatting 3 years ago
Andy Wilkinson f88b502f7e Remove support for image banners
Closes gh-28883
3 years ago
Stephane Nicoll e749f30642 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 9028ab33f2 Merge branch '2.6.x' into 2.7.x
Closes gh-29617
3 years ago
Stephane Nicoll d130819fb4 Merge branch '2.5.x' into 2.6.x
Closes gh-29616
3 years ago
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression"
See gh-29276
3 years ago
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression
See gh-29276
3 years ago
Stephane Nicoll b403877cc1 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 067af65152 Fix formatting violations 3 years ago
Brian Clozel b1c815830f Upgrade to RxJava 3.x and remove older generations
As Spring Framework removed support for RxJava 1.x and 2.x, we should do
the same and only provide dependency management for RxJava 3.x.

Closes gh-28212
3 years ago
Stephane Nicoll 41fb9cf562 Merge branch '2.7.x' 3 years ago
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x
Closes gh-29613
3 years ago
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
3 years ago
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
3 years ago
Yanming Zhou b49418aaaf Enforce use of BDDMockito
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
3 years ago
Stephane Nicoll 3a65d7b01e Merge branch '2.7.x' 3 years ago
Stephane Nicoll 19e671dd7b Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 787a2f3d9b Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll ab0b29cb53 Polish "Make classloader customization easier to discover"
See gh-29438
3 years ago
Andreas Ahlenstorf 96f48db2ab Make classloader customization easier to discover
See gh-29438
3 years ago
Stephane Nicoll e691cfdf3d Merge branch '2.7.x' 3 years ago
Stephane Nicoll 7bebfd06b8 Merge branch '2.6.x' into 2.7.x
Closes gh-29601
3 years ago
Stephane Nicoll f1dc7e7b78 Merge branch '2.5.x' into 2.6.x
Closes gh-29600
3 years ago
Stephane Nicoll 0d78ff0657 Polish "Use a timeout when joining threads in HttpTunnelServerTests"
See gh-29522
3 years ago
Leo Li 940d969c7c Use a timeout when joining threads in HttpTunnelServerTests
See gh-29522
3 years ago
Stephane Nicoll 42df01f193 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 0c0ec64ed4 Polish "Use existing constant rather than "spring.beaninfo.ignore""
See gh-29592
3 years ago
minkyu-jo 1a558292a8 Use existing constant rather than "spring.beaninfo.ignore"
See gh-29592
3 years ago
Stephane Nicoll 68bd6f91cf Merge branch '2.7.x' 3 years ago
Stephane Nicoll a94b176c39 Merge branch '2.6.x' into 2.7.x
Closes gh-29595
3 years ago
izeye 118eb5f74a Polish AbstractHealthEndpointAdditionalPathIntegrationTests
See gh-29593
3 years ago
Madhura Bhave 8125b46ed5 Merge branch '2.7.x' into main 3 years ago
Madhura Bhave 81bbd295e9 Merge branch '2.6.x' into 2.7.x
Closes gh-29584
3 years ago
Madhura Bhave 0597c6831e Configure health on additional path only when health exposed
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.

This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.

Fixes gh-29532
3 years ago
Phillip Webb c820ad01a1 Fix checkstyle error 3 years ago
Phillip Webb e19fa140e7 Fix merge conflict mistake 3 years ago
Phillip Webb 8ab87ace24 Merge branch '2.7.x' 3 years ago
Phillip Webb bb024211f6 Merge branch '2.6.x' into 2.7.x
Closes gh-29565
3 years ago
Phillip Webb df9cf6b726 Make ErrorPageSecurityFilter compatible with Servlet 3.1
Ensure that all default methods are implemented so that the
filter is compatible with Servlet 3.1 environments.

Fixes gh-29558
3 years ago
Andy Wilkinson f2ac7d10ef Merge branch '2.7.x' 3 years ago
Andy Wilkinson 8480abca20 Merge branch '2.6.x' into 2.7.x
Closes gh-29561
3 years ago
Andy Wilkinson fe43d527b5 Merge branch '2.5.x' into 2.6.x
Closes gh-29560
3 years ago
Andy Wilkinson 3ed65f2383 Avoid running Maven plugin ITs for each s-b-dependencies change
Closes gh-28781
3 years ago
Brian Clozel 03da915f56 Merge branch '2.7.x' 3 years ago
Brian Clozel 24c5f4b7ea Merge branch '2.6.x' into 2.7.x
Closes gh-29557
3 years ago
Brian Clozel 1204c1aa32 Merge branch '2.5.x' into 2.6.x
Closes gh-29556
3 years ago
Lachlan Roberts f1bbce1aac Do not modify AliasChecks list from Jetty WebAppContext
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
3 years ago
Scott Frederick 4494d3a805 Merge branch '2.7.x' into main 3 years ago
Scott Frederick 698eb94913 Merge branch '2.6.x' into 2.7.x
Closes gh-29554
3 years ago
Scott Frederick 909ef6d635 Merge branch '2.5.x' into 2.6.x
Closes gh-29553
3 years ago
Scott Frederick 000cbfa2d9 Set file permissions on all created test files
Closes gh-29551
3 years ago
Andy Wilkinson 191333773f Restore support for REST Assured
Closes gh-29543
3 years ago
Andy Wilkinson 1d7b1e1a46 Start building against snapshots for Spring REST Docs 3.0.0-M2
See gh-29544
3 years ago
Stephane Nicoll 5c78c2288c Merge branch '2.7.x' 3 years ago
Stephane Nicoll f9029a3584 Merge branch '2.6.x' into 2.7.x
Closes gh-29540
3 years ago
Stephane Nicoll e36a56f014 Merge branch '2.5.x' into 2.6.x
Closes gh-29539
3 years ago
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain
See gh-29523
3 years ago
Stephane Nicoll 83e2ffe45c Merge branch '2.7.x' 3 years ago
Stephane Nicoll ba8c76ba08 Merge branch '2.6.x' into 2.7.x
Closes gh-29538
3 years ago
Stephane Nicoll 267cd45235 Merge branch '2.5.x' into 2.6.x
Closes gh-29537
3 years ago
Janne Valkealahti d821f86b8e Upgrade reference of gradle-git-properties to 2.3.2
See gh-29535
3 years ago
Andy Wilkinson 3c5c5d9575 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 5b95c89303 Upgrade to Solr 8.11.1
Closes gh-29517
3 years ago
Andy Wilkinson f025ab629a Switch to new coordinates for Git Commit ID Maven Plugin
Closes gh-29515
3 years ago
Andy Wilkinson 7f2c346f9d Upgrade to Yasson 2.0.4
Closes gh-29514
3 years ago
Andy Wilkinson c927105743 Upgrade to jOOQ 3.16.2
Closes gh-29512
3 years ago
Andy Wilkinson 0623d1e4d4 Upgrade to HSQLDB 2.6.1
Closes gh-29511
3 years ago
Andy Wilkinson 35650d7b59 Upgrade to HikariCP 5.0.1
Closes gh-29510
3 years ago
Andy Wilkinson 7b35fabf07 Upgrade to Derby 10.15.2.0
Closes gh-29509
3 years ago
Andy Wilkinson 75fce16633 Upgrade to Caffeine 3.0.5
Closes gh-29508
3 years ago
Andy Wilkinson 9b4edfe925 Permit dependencies that require Java 9 or later 3 years ago
Stephane Nicoll 5cbaf2ba44 Upgrade to MariaDB 2.7.5
Closes gh-29506
3 years ago
Stephane Nicoll e74eba8cea Upgrade to Hibernate 5.6.4.Final
Closes gh-29505
3 years ago
Stephane Nicoll 8d0263c329 Upgrade to Flyway 8.4.2
Closes gh-29504
3 years ago
Stephane Nicoll 1f73bff95b Merge branch '2.7.x' 3 years ago
Stephane Nicoll 6821df7c2d Upgrade to MariaDB 2.7.5
Closes gh-29506
3 years ago
Stephane Nicoll f099193776 Upgrade to Hibernate 5.6.4.Final
Closes gh-29505
3 years ago
Stephane Nicoll 0b286846fa Upgrade to Flyway 8.4.2
Closes gh-29504
3 years ago
Andy Wilkinson 35b5b5672d Merge branch '2.7.x' 3 years ago
Andy Wilkinson 2c049f2b40 Merge branch '2.6.x' into 2.7.x
Closes gh-29501
3 years ago
Madhura Bhave 3460c24a16 Ignore context path when calling privilege evaluator
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.

This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.

Closes gh-29299

Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
3 years ago
Stephane Nicoll c488be5adc Upgrade to MariaDB 2.7.5
Closes gh-29498
3 years ago
Stephane Nicoll 5dbde1b294 Upgrade to Hibernate 5.6.4.Final
Closes gh-29497
3 years ago
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 a3bfc67249 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 1e4b786ff9 Merge branch '2.6.x' into 2.7.x
Closes gh-29489
3 years ago
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated
Closes gh-29488
3 years ago
Andy Wilkinson 92fa8ae9b7 Upgrade to Spring Session 2022.0.0-M1
Closes gh-28871
3 years ago
Andy Wilkinson 5d11c90e6d Upgrade to Spring Batch 5.0.0-M1
Closes gh-29278
3 years ago
Andy Wilkinson 0829dcd572 Merge branch '2.6.x' into 2.7.x
Closes gh-29486
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 de3b9a4910 Remove code deprecated for removal in 2.x
Closes gh-29482
3 years ago
Brian Clozel cbcc49408c Upgrade to Spring Session 2021.2.0-M1
Closes gh-29226
3 years ago
Brian Clozel 1e4e4f168d Upgrade to Spring for GraphQL 1.0.0-M5
Closes gh-29285
3 years ago
Andy Wilkinson 91060a94d4 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 6fa4b942ee Merge branch '2.6.x' into 2.7.x
Closes gh-29481
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 0d2e3bc4c9 Merge branch '2.7.x' 3 years ago
Stephane Nicoll f510805f00 Merge branch '2.6.x' into 2.7.x
Closes gh-29479
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 4d03f89a55 Harmonize dependency upgrades with Spring Boot 2.7.0-M1
Closes gh-29476
3 years ago
Stephane Nicoll d433f18922 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 4166429fd0 Add missing dependency management for Flyway
Closes gh-29474
3 years ago
Stephane Nicoll 6a70daa361 Upgrade to Pooled JMS 1.2.3
Closes gh-29473
3 years ago
Stephane Nicoll 92f1e119b4 Upgrade to MySQL 8.0.28
Closes gh-29472
3 years ago
Stephane Nicoll 23d3b0f8ea Upgrade to Liquibase 4.7.0
Closes gh-29471
3 years ago
Stephane Nicoll 801e7c4c03 Upgrade to Flyway 8.4.1
Closes gh-29470
3 years ago
Stephane Nicoll dad1e0b18d Upgrade to Embedded Mongo 3.2.8
Closes gh-29469
3 years ago
Stephane Nicoll 7de3b6e6cd Switch bomr to "any" policy 3 years ago
Stephane Nicoll 507abe88f3 Upgrade to Spring Integration 6.0.0-M1
Closes gh-28649
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 c2f8823e4e Upgrade to Spring Integration 5.5.8
Closes gh-29286
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 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
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
Stephane Nicoll 34576f07d8 Upgrade to Reactor 2020.0.15
Closes gh-29280
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
Stephane Nicoll 1c9e7d7c8e Start building against Spring Session 2021.2.0-M1 snapshots
See gh-29226
3 years ago
Stephane Nicoll 88049ff11a Merge branch '2.7.x' 3 years ago
Stephane Nicoll ca432309aa Polish "Add option to allow Spring Batch custom isolation levels"
See gh-28859
3 years ago
stibi a8d1d3104e Add option to allow Spring Batch custom isolation levels
See gh-28859
3 years ago
Brian Clozel fc794f17e1 Update GraphiQlHandler configuration
This commit updates the `GraphiQlHandler` auto-configuration after a
constructor change was done in Spring GraphQL for WebSocket support in
GraphiQL.
3 years ago
Stephane Nicoll 2078a7f3e1 Merge branch '2.7.x' 3 years ago
Stephane Nicoll e92e35d56f Polish "Stop configuring a default user with SAML 2.0 Login"
See gh-29263
3 years ago
Guirong Hu ab49acc782 Stop configuring a default user with SAML 2.0 Login
See gh-29263
3 years ago
Brian Clozel b7de02d908 Fix build after Spring GraphQL changes
See pring-projects/spring-graphql#229
3 years ago
Stephane Nicoll 8ec8268a77 Merge branch '2.7.x' 3 years ago