Commit Graph

19670 Commits

Author SHA1 Message Date
Phillip Webb 1621cfd578 Merge branch '2.7.x' 2023-01-09 15:44:44 -08:00
Phillip Webb 80cfcb71ec Update copyright year of changed files 2023-01-09 15:18:10 -08:00
Phillip Webb 232807d388 Increase block timeout 2023-01-09 15:17:47 -08:00
Phillip Webb 6a0a61f1ce Refine EndpointRequest matcher `toString` and apply to reactive variant
Refine the recently introduced `EndpointRequest` matcher `toString()`
to use lower-case item names. Also applied the same logic to the
reactive variant.

See gh-33690
2023-01-09 14:41:41 -08:00
Moritz Halbritter 5a70422d1d Add reference to Spring Authorization Server project 2023-01-09 15:26:40 +01:00
Moritz Halbritter 56b51d01a7 Clarify that AOT uses code generation 2023-01-09 15:26:20 +01:00
Moritz Halbritter 3c45a805f5 Polish documentation 2023-01-09 15:25:51 +01:00
Moritz Halbritter 648db6d1ea Remove reference to spring-cli run command from documentation 2023-01-09 15:25:27 +01:00
Moritz Halbritter 9e414fa263 Update minimum required maven version to 3.5 in documentation 2023-01-09 15:24:53 +01:00
Moritz Halbritter c0728e1288 Polish documentation 2023-01-09 15:24:26 +01:00
Moritz Halbritter 5a97c1493e Update Java 11 to Java 17 in documentation 2023-01-09 15:24:16 +01:00
Moritz Halbritter 7922ac63bc Polish documentation 2023-01-09 15:23:27 +01:00
Moritz Halbritter 1e70822adb Fix javax with jakarta references in documentation 2023-01-09 12:46:02 +01:00
Moritz Halbritter 3b6b795c9f Merge branch '2.7.x'
Closes gh-33729
2023-01-09 12:39:42 +01:00
rishal c84399e705 Add toString method for EndpointRequestMatcher
See gh-33690
2023-01-09 12:34:43 +01:00
Sanan f291695bda Remove run example from documentation
See gh-33519
2023-01-09 12:20:46 +01:00
rfigueroa 2b3a24be18 Update dockerfile samples to use Java 17
See gh-33629
2023-01-09 12:17:44 +01:00
Moritz Halbritter 6a6ecad325 Merge branch '2.7.x'
Closes gh-33728
2023-01-09 12:13:36 +01:00
Joseph Lane 54754d2c7a Fix typo in External Configuration documentation
See gh-33630
2023-01-09 12:12:50 +01:00
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2023-01-09 11:10:20 +01:00
Anugrah Singhal 3191c678c3 Remove Jetty/Netty/ApacheHttpClient checks for WebClient
See gh-33640
2023-01-09 10:43:44 +01:00
Moritz Halbritter f11de0c4cf Merge branch '2.7.x'
Closes gh-33726
2023-01-09 10:39:14 +01:00
Bart aa8a531731 Fix a type in the ExitCodeGenerator documentation
See gh-33658
2023-01-09 10:38:32 +01:00
Moritz Halbritter b641073777 Merge branch '2.7.x'
Closes gh-33725
2023-01-09 10:35:50 +01:00
Christoph Dreis 1b4ef5db0f Update copyrights to 2023
See gh-33682
2023-01-09 10:35:07 +01:00
Kaveh Shamsi 2d95e4a31e Fix JavaDoc typo in LocalServerPort
See gh-33683
2023-01-09 10:27:40 +01:00
Phillip Webb 2e90b71c30 Do not attempt constructor binding for items with an existing value
Update `DefaultBindConstructorProvider` so that it no longer detects
constructors when the `Bindable` has an existing value. This update
allows us change `ConfigurationPropertiesBindingPostProcessor` and
related classes so that all instances created from `@Bean` methods
are treated as `JAVA_BEAN` bindings and will not be accidentally
re-created using constructor binding.

Fixes gh-33710
2023-01-06 17:23:03 -08:00
Andy Wilkinson 2d372edcfc Fix Homebrew formula's install --head support
This commit updates the Homebrew formula's install --head support to
use the main branch (rather than the default of master) and to build
the project using Gradle rather than trying to use Maven.

Closes gh-33704
2023-01-06 18:15:31 +00:00
Phillip Webb 5ec5007bf0 Merge branch '2.7.x'
Closes gh-33706
2023-01-05 17:21:34 -08:00
Phillip Webb 68af379714 Don't use repo.spring.io in released Homebrew or Scoop recipes
Update our Homebrew and Scoop recipes to use `repo1.maven.org` rather
than `repo.spring.io` for releases.

Fixes gh-33702
2023-01-05 13:56:58 -08:00
Phillip Webb f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb 0254619782 Merge branch '2.7.x' 2022-12-22 00:59:40 -08:00
Phillip Webb e4772cf3b7 Update copyright year of changed files 2022-12-22 00:59:32 -08:00
Phillip Webb 2e7ca6f82d Warning if <springProfile> is used in phase 2 model elements
Add `SpringProfileIfNestedWithinSecondPhaseElementSanityChecker` which
will provide a warning if `<springProfile>` is used within a phase 2
model element. This is similar to Logback's own `<if>` warnings.

The `LogbackLoggingSystem` has also been updated so that warning are
printed when present.

Fixes gh-33610
2022-12-22 00:57:59 -08:00
Phillip Webb 2ed512ddb5 Use model.deepMarkAsSkipped in SpringProfileModelHandler
Switch `model.markAsSkipped` to `model.deepMarkAsSkipped` in
`SpringProfileModelHandler`.

Although the current call doesn't appear to be causing issues,
it seems best to align our <springProfile> support with the way
that Logback implements its own `<if>` support.

Closes gh-33618
2022-12-22 00:54:06 -08:00
Phillip Webb 532fed3147 Increase couchbase connection timeout for tests 2022-12-22 00:49:04 -08:00
Phillip Webb 6367a8c62c Merge branch '2.7.x' 2022-12-21 22:54:01 -08:00
Phillip Webb 5ba52d0000 Polish formatting 2022-12-21 22:53:54 -08:00
Phillip Webb e57824fb58 Merge branch '2.7.x'
Closes gh-33617
2022-12-21 22:52:59 -08:00
Phillip Webb a2a59dd627 Polish 'Improve gradle plugin tags documentation'
See gh-33614
2022-12-21 22:52:27 -08:00
Shekhar Aggarwal a1df607dd8 Improve gradle plugin tags documentation
See gh-33614
2022-12-21 22:50:02 -08:00
Phillip Webb 5814543bb1 Merge branch '2.7.x'
Closes gh-33616
2022-12-21 22:49:40 -08:00
Phillip Webb c205ba0694 Polish 'Improve maven plugin tags documentation'
See gh-33609
2022-12-21 22:47:28 -08:00
Shekhar Aggarwal 79557012a7 Improve maven plugin tags documentation
See gh-33609
2022-12-21 22:46:42 -08:00
Phillip Webb 94819ee313 Merge branch '2.7.x'
Closes gh-33615
2022-12-21 22:39:34 -08:00
Phillip Webb 42aa661e69 Polish 'Fix typo in LocalDevToolsAutoConfiguration logging'
See gh-33569
2022-12-21 22:35:38 -08:00
Artur 549c9e5076 Fix typo in LocalDevToolsAutoConfiguration logging
See gh-33569
2022-12-21 22:35:05 -08:00
Phillip Webb c257f2b1d2 Merge branch '2.7.x' 2022-12-21 11:37:41 -08:00
Phillip Webb bc6fc33498 Polish 2022-12-21 10:16:25 -08:00
Scott Frederick fead976952 Adapt to changes in Couchbase client
See gh-33588
2022-12-21 11:48:39 -06:00
Phillip Webb 5f30a70581 Upgrade to Undertow 2.3.2.Final
Closes gh-33608
2022-12-21 08:47:20 -08:00
Phillip Webb 41f5cd3fde Upgrade to UnboundID LDAPSDK 6.0.7
Closes gh-33607
2022-12-21 08:47:18 -08:00
Phillip Webb ed9dd0783a Upgrade to Thymeleaf Extras SpringSecurity 3.1.1.RELEASE
Closes gh-33606
2022-12-21 08:32:10 -08:00
Phillip Webb bf855cf053 Upgrade to Spring Integration 6.0.1
Closes gh-33605
2022-12-21 08:22:26 -08:00
Phillip Webb 952c439c9e Upgrade to SLF4J 2.0.6
Closes gh-33604
2022-12-21 08:22:22 -08:00
Phillip Webb cc8236f1c4 Upgrade to Netty 4.1.86.Final
Closes gh-33603
2022-12-21 08:22:20 -08:00
Phillip Webb 2a77f5fa6e Upgrade to MSSQL JDBC 11.2.2.jre17
Closes gh-33601
2022-12-21 08:22:15 -08:00
Phillip Webb 7e57a100e8 Upgrade to MongoDB 4.8.1
Closes gh-33600
2022-12-21 08:22:13 -08:00
Phillip Webb 29c0eb13d7 Upgrade to Lettuce 6.2.2.RELEASE
Closes gh-33599
2022-12-21 08:22:10 -08:00
Phillip Webb b0b20e4e42 Upgrade to jOOQ 3.17.6
Closes gh-33597
2022-12-21 08:22:05 -08:00
Phillip Webb 19f19559aa Upgrade to Jetty 11.0.13
Closes gh-33596
2022-12-21 08:22:02 -08:00
Phillip Webb c98f34ffca Upgrade to Jaybird 4.0.8.java11
Closes gh-33595
2022-12-21 08:22:00 -08:00
Phillip Webb d732eef8b6 Upgrade to Infinispan 14.0.4.Final
Closes gh-33594
2022-12-21 08:21:57 -08:00
Phillip Webb 735f422505 Upgrade to HttpCore 4.4.16
Closes gh-33593
2022-12-21 08:21:55 -08:00
Phillip Webb a6f0fcd8f2 Upgrade to HttpClient 4.5.14
Closes gh-33592
2022-12-21 08:21:52 -08:00
Phillip Webb 2eb7f643a8 Upgrade to Hibernate 6.1.6.Final
Closes gh-33591
2022-12-21 08:21:50 -08:00
Phillip Webb a4bcf1bcf0 Upgrade to Elasticsearch Client 8.5.3
Closes gh-33590
2022-12-21 08:21:47 -08:00
Phillip Webb 914fbabcda Upgrade to Dropwizard Metrics 4.2.14
Closes gh-33589
2022-12-21 08:21:45 -08:00
Phillip Webb 43d389f7e5 Upgrade to Couchbase Client 3.4.1
Closes gh-33588
2022-12-21 08:21:42 -08:00
Phillip Webb 0b3a8c51d2 Upgrade to Byte Buddy 1.12.20
Closes gh-33587
2022-12-21 08:21:40 -08:00
Phillip Webb edd6a3b271 Upgrade to AspectJ 1.9.19
Closes gh-33586
2022-12-21 08:21:37 -08:00
Phillip Webb 1939d23de3 Upgrade to Undertow 2.2.22.Final
Closes gh-33585
2022-12-21 08:04:32 -08:00
Phillip Webb 8e42dfce55 Upgrade to UnboundID LDAPSDK 6.0.7
Closes gh-33584
2022-12-21 08:04:30 -08:00
Phillip Webb bec2badec1 Upgrade to Thymeleaf Extras SpringSecurity 3.0.5.RELEASE
Closes gh-33582
2022-12-21 08:04:25 -08:00
Phillip Webb 9dcc49538e Upgrade to Spring Integration 5.5.16
Closes gh-33581
2022-12-21 08:04:22 -08:00
Phillip Webb 5e2e18d577 Upgrade to Netty 4.1.86.Final
Closes gh-33580
2022-12-21 08:04:19 -08:00
Phillip Webb 8c43c213ed Upgrade to Neo4j Java Driver 4.4.11
Closes gh-33579
2022-12-21 08:04:16 -08:00
Phillip Webb 8472d7ecff Upgrade to MSSQL JDBC 10.2.2.jre8
Closes gh-33578
2022-12-21 08:04:13 -08:00
Phillip Webb 7238dddf09 Upgrade to Jetty 9.4.50.v20221201
Closes gh-33577
2022-12-21 08:04:11 -08:00
Phillip Webb 8a376cb27e Upgrade to Jaybird 4.0.8.java8
Closes gh-33576
2022-12-21 08:04:08 -08:00
Phillip Webb 9f72be57ee Upgrade to Infinispan 13.0.14.Final
Closes gh-33575
2022-12-21 08:04:05 -08:00
Phillip Webb ec2b697684 Upgrade to HttpCore 4.4.16
Closes gh-33574
2022-12-21 08:04:02 -08:00
Phillip Webb 507cfcb4cf Upgrade to HttpClient 4.5.14
Closes gh-33573
2022-12-21 08:04:00 -08:00
Phillip Webb 07ce0c8b90 Upgrade to Elasticsearch 7.17.8
Closes gh-33572
2022-12-21 08:03:57 -08:00
Phillip Webb fb619cf76f Upgrade to Dropwizard Metrics 4.2.14
Closes gh-33571
2022-12-21 08:03:54 -08:00
Phillip Webb 60b943eeec Upgrade to Byte Buddy 1.12.20
Closes gh-33570
2022-12-21 08:03:35 -08:00
Brian Clozel 41dce327a2 Fix Spring Integration failing test
Instead of asserting that an observation registry is null, we should
ensure that it's a NOOP instance.
2022-12-21 16:38:32 +01:00
Brian Clozel 8c6526bb19 Upgrade to Reactor 2020.0.26
Closes gh-33543
2022-12-21 13:43:39 +01:00
Brian Clozel 3aca776b5d Upgrade to Spring Security 5.7.6
Closes gh-33544
2022-12-21 13:43:06 +01:00
Brian Clozel 63de8bf3ea Upgrade to Spring Kafka 3.0.1
Closes gh-33480
2022-12-20 17:17:49 +01:00
Brian Clozel 49da9b7183 Upgrade to Spring for GraphQL 1.1.1
Closes gh-33477
2022-12-20 17:17:07 +01:00
Brian Clozel 28f9f20d39 Declare order for ServerHttpObservationFilter WebFilter
This commit declares an `@Order` for the `ServerHttpObservationFilter`
bean declaration in the Observation WebFlux auto-configuration.

This allows developers to consistently order other `WebFilter` instances
relatively to this one. Here, `@Order(Ordered.HIGHEST_PRECEDENCE + 1)`
has been chosen to align with the order of its MVC counterpart.

Fixes gh-33444
2022-12-19 18:24:36 +01:00
Brian Clozel fcf120783a Upgrade to Spring Security 6.0.1
Closes gh-33479
2022-12-19 17:13:13 +01:00
Brian Clozel 3310b59520 Polish 2022-12-19 14:50:47 +01:00
Brian Clozel 593b5311e9 Configure GraphQL web propagation for tracing
As of spring-projects/spring-graphql#547, Spring GraphQL introduced a
`PropagationWebGraphQlInterceptor` that propagates the incoming tracing
information in HTTP request headers into the GraphQL context.

This commit auto-configures the propagation interceptor if the
application exposes a GraphQL HTTP endpoint and if it is configured for
Tracing support.

Fixes gh-33542
2022-12-19 12:13:14 +01:00
Brian Clozel 5a973b9723 Upgrade to Spring Framework 6.0.3
Closes gh-33476
2022-12-18 21:15:05 +01:00
Brian Clozel 6b1aa48c35 Upgrade to Reactor 2022.0.1
Closes gh-33475
2022-12-18 21:14:30 +01:00
Moritz Halbritter b132b5c317 Polish JSON classes 2022-12-16 16:09:21 +01:00
Moritz Halbritter 08659baeba Polish away public modifier on tests 2022-12-16 16:08:44 +01:00
Moritz Halbritter 1754018a7b Polish DevToolsDataSourceAutoConfiguration 2022-12-16 15:56:45 +01:00
Moritz Halbritter f36e2ecb7b Use AutoClosables with try-with-resources
Closes gh-33538
2022-12-16 15:43:15 +01:00
Moritz Halbritter 725337f976 Make fields final
Closes gh-33537
2022-12-16 14:28:44 +01:00
Moritz Halbritter 216d15997a Merge branch '2.7.x'
Closes gh-33512
2022-12-12 11:41:09 +01:00
Aakarshit Uppal 2bb8dadeb3 Fix typo in tomcat accesslog checkExists doc
See gh-33460
2022-12-12 11:38:57 +01:00
peter-janssen 9a74c862dd Fix documented Java compiler level
See gh-33505
2022-12-12 11:34:25 +01:00
Moritz Halbritter 47eb3b11b9 Upgrade Tomcat to 10.1.4
Closes gh-33167
Closes gh-33071
2022-12-12 11:19:30 +01:00
Johnny Lim d21572a189 Resolve TODOs for observability tests
See gh-33481
2022-12-09 13:21:55 +01:00
Brian Clozel ad63cb8e62 Upgrade to Thymeleaf 3.1.1.RELEASE
Closes gh-33486
2022-12-07 18:00:40 +01:00
Brian Clozel 1751df13f1 Start building against Spring Security 6.0.1 SNAPSHOTs
See gh-33479
2022-12-07 14:48:29 +01:00
Brian Clozel 5d9e9a443a Start building against Spring Kafka 3.0.1 SNAPSHOTs
See gh-33480
2022-12-07 14:47:55 +01:00
Brian Clozel 64c9ac3aa7 Start building against Spring Integration 6.0.1 SNAPSHOTs
See gh-33478
2022-12-07 14:47:10 +01:00
Brian Clozel 9e17af5d6a Start building against Spring Framework 6.0.3 SNAPSHOTs
See gh-33476
2022-12-07 14:46:32 +01:00
Brian Clozel 928df41f61 Start building against Reactor 2022.0.1 SNAPSHOTs
See gh-33475
2022-12-07 14:45:42 +01:00
Brian Clozel ce33ec19cd Start building against Spring GraphQL 1.1.1-SNAPSHOT
See gh-33477
2022-12-07 14:43:04 +01:00
Brian Clozel 50be8cbf91 Fix IllegalArgumentException in WebClient convention adapter
Prior to this commit, the `ClientObservationConventionAdapter` would
fail with an `IllegalArgumentException` when the observation is first
started: at this point, the carrier (the request builder here) is
present, but the full request not yet fully built.

This commit ensures that the convention adapter uses the request and, if
not available, the request builder to adapt to the
`WebClientExchangeTagsProvider`.

Fixes gh-33483
2022-12-07 13:16:57 +01:00
Scott Frederick 87fd27c329 Merge branch '2.7.x' 2022-12-06 14:01:13 -06:00
Scott Frederick 3f33fa3f45 Polish documentation 2022-12-06 14:00:53 -06:00
Daniel Oh f1edd17a42 Fix a typo in docs
See gh-33453
2022-12-05 11:16:37 +01:00
Johnny Lim 78b43279a7 Polish
See gh-33455
2022-12-05 11:14:38 +01:00
Moritz Halbritter a4779b7859 Merge branch '2.7.x'
Closes gh-33433
2022-12-01 13:33:43 +01:00
Moritz Halbritter 16569099ba Polish "Fix bug in webserver start when loading PKCS#11 KeyStore"
See gh-32179
2022-12-01 12:17:34 +01:00
cdanger 716a839d54 Fix bug in webserver start when loading PKCS#11 KeyStore
See gh-32179
2022-12-01 11:53:51 +01:00
Moritz Halbritter 6edb6fa091 Polish "Add test for beforeEach of OutputExtension"
See gh-33419
2022-12-01 11:44:04 +01:00
nowjin 5f532a40f9 Add test for beforeEach of OutputExtension
See gh-33419
2022-12-01 11:41:28 +01:00
Moritz Halbritter c1bd9310ea Polish "Add test for beforeEach of OutputExtension"
See gh-33419
2022-12-01 11:37:18 +01:00
nowjin 94193c9df2 Add test for beforeEach of OutputExtension
See gh-33419
2022-12-01 11:35:53 +01:00
Johnny Lim 90589fd6d4 Polish
See gh-33384
2022-12-01 11:32:39 +01:00
Craig Andrews 703935612f Update instead of replace environment in bootBuildImage documentation
Closes gh-32886
See gh-33424
2022-12-01 11:25:53 +01:00
lishangbu f5d0171fcc Avoid NPE when @SpringBootConfiguration not found in test
See gh-33371
2022-12-01 11:19:59 +01:00
Phillip Webb 93f8dc76ab Fix Neo4jReactiveHealthIndicator NoSuchElementException
Update `Neo4jReactiveHealthIndicator` to ensure that `result.records()`
is called before `result.consume()`. Prior to this commit, the indicator
used `zipWith` to merge records with a summary. This worked with the
previous RxJava based driver, but fails with the Reactor based driver
due to a `NoSuchElementException: Source was empty` error.

Fixes gh-33428
2022-11-30 21:03:49 -08:00
Phillip Webb 8849f72ac5 Merge branch '2.7.x' 2022-11-30 21:01:25 -08:00
Phillip Webb 06c6dafee2 Add Neo4jReactiveHealthIndicatorIntegrationTests
Add a full integration test for `Neo4jReactiveHealthIndicator`
to ensure that it works against a real server.

See gh-33428
2022-11-30 21:01:12 -08:00
Phillip Webb 8481004420 Polish 2022-11-30 21:01:12 -08:00
Scott Frederick 9ed8b25e6b Make AOT goals release option mutually exclusive with source and target
Fixes gh-33382
2022-11-30 17:18:02 -06:00
Moritz Halbritter 351084ea06 Document that native-maven-plugin is required for native images
Closes gh-33422
2022-11-30 15:03:10 +01:00
Moritz Halbritter c6536c54d8 Write native-image argfile only if there are excludes
Refactors duplicate logic in BootZipCopyAction and Packager into
separate classes.

Closes gh-33363

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2022-11-30 14:29:35 +01:00
Andy Wilkinson 276b288891 Prevent repeat configuration of DB init bean dependencies
Fixes gh-33374
2022-11-30 12:36:24 +00:00
Phillip Webb e1efdadfe3 Merge branch '2.7.x'
Closes gh-33416
2022-11-29 14:09:57 -08:00
Phillip Webb 711e2528fb Polish 'Improve test coverage for OutputCaptureRule'
See gh-33405
2022-11-29 14:09:26 -08:00
nowjin af7a03b4c9 Improve test coverage for OutputCaptureRule
See gh-33405
2022-11-29 14:09:05 -08:00
Moritz Halbritter 8626bdc05b Merge branch '2.7.x' 2022-11-29 16:27:45 +01:00
Moritz Halbritter e755f5107e Fix formatting 2022-11-29 16:27:26 +01:00
Moritz Halbritter 41f6d54020 Merge branch '2.7.x'
Closes gh-33410
2022-11-29 16:22:57 +01:00
Moritz Halbritter 20d51a128b Clarify that shutdown endpoint only works in jar packaging
Closes gh-17398
2022-11-29 16:21:24 +01:00
Brian Clozel d48ab37505 Reinstate GraphQL testing documentation
Closes gh-33407
2022-11-29 14:15:36 +01:00
Moritz Halbritter cfaade95df Add test to verify ZipkinRestTemplateBuilderCustomizer
See gh-33399
2022-11-29 11:55:27 +01:00
Moritz Halbritter b3878e84ae Fix bug where using a YAML with anchors couldn't be loaded
Closes gh-33404
2022-11-29 11:21:24 +01:00
Moritz Halbritter 2ceee789ce Fix bug where ZipkinRestTemplateBuilderCustomizer had no effect
Closes gh-33399
2022-11-29 10:39:19 +01:00
Andy Wilkinson d88f968d22 Merge branch '2.7.x'
Closes gh-33403
2022-11-28 20:20:24 +00:00
Andy Wilkinson 2da8bc1f3b Reduce Gradle versions used for compatibility testing
Closes gh-33401
2022-11-28 19:14:41 +00:00