Commit Graph

40787 Commits

Author SHA1 Message Date
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
Moritz Halbritter
76858aebc2 Merge pull request #33460 from aksh1618
* pr-33460:
  Fix typo in tomcat accesslog checkExists doc

Closes gh-33460
2022-12-12 11:39:40 +01:00
Aakarshit Uppal
2bb8dadeb3 Fix typo in tomcat accesslog checkExists doc
See gh-33460
2022-12-12 11:38:57 +01:00
Moritz Halbritter
ecbc768aa9 Merge pull request #33505 from peter-janssen
* pr-33505:
  Fix documented Java compiler level

Closes gh-33505
2022-12-12 11:35:34 +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
Moritz Halbritter
ed5fe2d26e Merge pull request #33481 from izeye
* gh-33481:
  Resolve TODOs for observability tests

Closes gh-33481
2022-12-09 13:22:12 +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
Moritz Halbritter
e6bcd98e0c Merge pull request #33453 from ohdaeho
* 33453:
  Fix a typo in docs

Closes gh-33453
2022-12-05 11:16:53 +01:00
Daniel Oh
f1edd17a42 Fix a typo in docs
See gh-33453
2022-12-05 11:16:37 +01:00
Moritz Halbritter
b56906a27f Merge pull request #33455 from izeye
* 33455:
  Polish

Closes gh-33455
2022-12-05 11:14:56 +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
ad2b130dcd Merge pull request #32179 from cdanger
* 32179:
  Polish "Fix bug in webserver start when loading PKCS#11 KeyStore"
  Fix bug in webserver start when loading PKCS#11 KeyStore

Closes gh-32179
2022-12-01 12:18:10 +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
bf2bc441d2 Merge branch '2.7.x'
Closes gh-33431
2022-12-01 11:44:33 +01:00
Moritz Halbritter
5b2b122398 Merge pull request #33419 from currenjin
* 33419:
  Polish "Add test for beforeEach of OutputExtension"
  Add test for beforeEach of OutputExtension

Closes gh-33419
2022-12-01 11:44:14 +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
012255232c Merge pull request #33419 from currenjin
* add-test-on-output-extension:
  Polish "Add test for beforeEach of OutputExtension"
  Add test for beforeEach of OutputExtension

Closes gh-33419
2022-12-01 11:37:40 +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
Moritz Halbritter
aa6e2398da Merge pull request #33384 from izeye
* 33384:
  Polish

Closes gh-33384
2022-12-01 11:33:34 +01:00
Johnny Lim
90589fd6d4 Polish
See gh-33384
2022-12-01 11:32:39 +01:00
Moritz Halbritter
39a026ed65 Merge pull request #33424 from candrews
* 33424:
  Update instead of replace environment in bootBuildImage documentation

Closes gh-33424
2022-12-01 11:30:34 +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
Moritz Halbritter
c8d2200fc8 Merge pull request #33371 from lishangbu
* 33371:
  Avoid NPE when @SpringBootConfiguration not found in test

Closes gh-33371
2022-12-01 11:23:07 +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
e56156c350 Merge pull request #33405 from currenjin
* pr/33405:
  Polish 'Improve test coverage for OutputCaptureRule'
  Improve test coverage for OutputCaptureRule

Closes gh-33405
2022-11-29 14:09:52 -08:00