Andy Wilkinson
0e22499d20
Merge branch '2.7.x' into 3.0.x
2023-10-04 09:07:39 +01:00
Andy Wilkinson
da319841b8
Start building against Spring Data Bom 2021.2.17 snapshots
...
See gh-37677
2023-10-04 08:29:43 +01:00
Andy Wilkinson
21661c6a1a
Start building against Spring AMQP 2.4.17 snapshots
...
See gh-37676
2023-10-04 08:29:37 +01:00
Andy Wilkinson
026bc31c3e
Start building against Reactor Bom 2020.0.37 snapshots
...
See gh-37675
2023-10-04 08:29:32 +01:00
Andy Wilkinson
21a618a6c4
Start building against Micrometer 1.9.16 snapshots
...
See gh-37674
2023-10-04 08:29:27 +01:00
Andy Wilkinson
6353603d63
Avoid exposing Jetty's WebSocketUpgradeFilter as a bean
...
When the filter is exposed as a bean (directly or through a
registration bean), it's picked up by the auto-configuration of
MockMvc. This causes a problem as MockMvc does not call init on a
filter before it's used and WebSocketUpgradeFilter fails with a
NullPointerException if its doFilter method is called when its init
method has not been called.
This commit reworks the WebSocket auto-configuration to use a
ServletContextInitalizer to register WebSocketUpgradeFilter rather
than a FilterRegistrationBean. This ensure that the filter is still
registered at the required position in the chain (last filter before
the servlet) while also preventing it from being registered with the
auto-configured MockMvc in tests.
Closes gh-37660
2023-10-03 16:13:24 +01:00
Andy Wilkinson
931584f8af
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37659
2023-10-03 10:28:51 +01:00
Andy Wilkinson
26ff1e907f
Merge pull request #37655 from izeye
...
* gh-37655:
Use AssertJ's fail, not JUnit's
Closes gh-37655
2023-10-03 10:17:45 +01:00
Johnny Lim
c9932bb73a
Use AssertJ's fail, not JUnit's
...
This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.
See gh-37655
2023-10-03 10:11:12 +01:00
Phillip Webb
7bb60fc7c7
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37656
2023-10-02 22:59:45 -07:00
Phillip Webb
ed4ab667a1
Enable LoaderIntegrationTests on aarch64
...
Closes gh-37654
2023-10-02 22:42:21 -07:00
Andy Wilkinson
458418be29
Automatically register reflection hints for scanned WebListeners
...
Closes gh-36008
2023-09-29 18:09:36 +01:00
Andy Wilkinson
26b9602596
Merge branch '2.7.x' into 3.0.x
2023-09-29 15:14:09 +01:00
Andy Wilkinson
0205b875a0
Polish
2023-09-29 15:13:58 +01:00
Andy Wilkinson
04054b6670
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37631
2023-09-29 14:58:52 +01:00
Andy Wilkinson
bfd1a29e53
Exclude AbstractTransactionAspect from lazy init
...
Fixes gh-37506
2023-09-29 14:16:27 +01:00
Moritz Halbritter
d266806368
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37614
2023-09-28 08:51:12 +02:00
Moritz Halbritter
1cdb238577
Merge pull request #37606 from jbertram
...
* pr/37606:
Clarify ActiveMQ usage in JMS docs
Closes gh-37606
2023-09-28 08:48:14 +02:00
Moritz Halbritter
8a5979ee8c
Clarify ActiveMQ usage in JMS docs
...
The Apache ActiveMQ project has adopted the label "Classic" for the 5.x
broker in order to more easily compare and contrast it with the broker
code-named Artemis.
See gh-37606
2023-09-28 08:46:47 +02:00
Andy Wilkinson
c486892a9b
Fix additional metadata location for spring.webflux.multipart.streaming
...
Closes gh-37608
2023-09-27 18:09:14 +01:00
Andy Wilkinson
688a69b9b1
Prevent status messages from logging when Logback is being configured
...
There's a window where the deny-all turbo filter has been removed but
Logback has not yet been configured. If any logging that would have
reached an appender is performed in this window, unwanted status
messages will be logged. This window can be closed by ensuring that
the turbo filter is in place while Logback is being configured.
Closes gh-34505
2023-09-27 12:28:23 +01:00
Andy Wilkinson
4e40ff8341
Merge pull request #37574 from michael-simons
...
* gh-37574:
Polish "Use Neo4jManagedTypes to populate the mapping context"
Use Neo4jManagedTypes to populate the mapping context
Closes gh-37574
2023-09-27 09:47:40 +01:00
Andy Wilkinson
6b107530f5
Polish "Use Neo4jManagedTypes to populate the mapping context"
...
See gh-37574
2023-09-27 09:33:56 +01:00
Michael Simons
e0a5de01ca
Use Neo4jManagedTypes to populate the mapping context
...
See gh-37574
2023-09-27 09:33:37 +01:00
Andy Wilkinson
c6abf888cc
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37591
2023-09-27 09:18:00 +01:00
Andy Wilkinson
071a5951e9
Merge pull request #37578 from onobc
...
* gh-37578:
Use larger runner for PR workflow
Closes gh-37578
2023-09-27 09:17:33 +01:00
Chris Bono
3f1e8d65e6
Use larger runner for PR workflow
...
See gh-37578
2023-09-27 09:17:18 +01:00
Scott Frederick
e8a15327da
Fix formatting
2023-09-26 19:09:37 -05:00
Scott Frederick
7e29a3c70b
Use latest available Gradle version for Paketo system tests
...
This ensures that the tests will run with the latest Java versions.
See gh-37507
2023-09-26 18:19:25 -05:00
Scott Frederick
a03e3320a6
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37587
2023-09-26 14:06:50 -05:00
Scott Frederick
aeeb5cf1f8
Apply Gradle fileMode and dirMode consistently in jar and war archives
...
Fixes gh-37496
2023-09-26 13:49:19 -05:00
Andy Wilkinson
e74f681f23
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37581
2023-09-26 12:35:38 +01:00
Andy Wilkinson
fce64878b4
Merge pull request #37577 from dependabot[bot]
...
* gh-37577:
Bump gradle/gradle-build-action from 2.8.0 to 2.8.1
Closes gh-37577
2023-09-26 12:35:26 +01:00
dependabot[bot]
6b9a952278
Bump gradle/gradle-build-action from 2.8.0 to 2.8.1
...
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action ) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/gradle/gradle-build-action/releases )
- [Commits](ef76a971e2...b5126f31db
)
See gh-37577
2023-09-26 12:34:52 +01:00
Moritz Halbritter
b93ce92022
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37569
2023-09-25 11:39:18 +02:00
Moritz Halbritter
b266ade00c
Prevent exception when loading optional config data locations
...
Closes gh-35683
2023-09-25 11:39:04 +02:00
Moritz Halbritter
303a8f0825
Disable 'LombokGetterMayBeUsed' inspection
2023-09-25 10:53:27 +02:00
Scott Frederick
d57f9b8643
Enable Paketo Builder Tests on Java 21
...
Closes gh-37507
2023-09-22 14:23:27 -05:00
Scott Frederick
f4c161a3fa
Merge branch '2.7.x' into 3.0.x
2023-09-22 13:43:07 -05:00
Scott Frederick
c45ad6ce83
Use actual Java version in build image integration tests
...
See gh-37453
2023-09-22 13:38:37 -05:00
Andy Wilkinson
e2982a3a07
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37552
2023-09-22 17:44:30 +01:00
Andy Wilkinson
7b0885b8b2
Merge pull request #37180 from vpavic
...
* gh-37180:
Polish "Fix handling of JMS listener concurrency properties"
Fix handling of JMS listener concurrency properties
Closes gh-37180
2023-09-22 17:44:07 +01:00
Andy Wilkinson
feae7be0a1
Polish "Fix handling of JMS listener concurrency properties"
...
See gh-37180
2023-09-22 17:43:57 +01:00
Vedran Pavic
366607f517
Fix handling of JMS listener concurrency properties
...
Update JMS listener concurrency configuration to set the same minimum
and maximum number of consumers when users specify only the minimum
using `spring.jms.listener.concurrency` property.
Prior to this commit, when using `spring.jms.listener.concurrency` to
set the minimum number of consumers without also specifying
`spring.jms.listener.max-concurrency` would result in effective
concurrency where the actual minimum number of consumers is always 1,
while the maximum number of consumers is the value of
`spring.jms.listener.concurrency`.
See gh-37180
2023-09-22 17:43:56 +01:00
Scott Frederick
7322c078c4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37549
2023-09-22 11:32:07 -05:00
Scott Frederick
98bfaf0412
Remove compatibility blocks from Gradle plugin integration tests
...
Closes gh-37453
2023-09-22 11:28:12 -05:00
Andy Wilkinson
514420a4b1
Merge pull request #37462 from izeye
...
* gh-37462:
Add Javadoc since for AbstractAotMojo.getSession()
Closes gh-37462
2023-09-22 16:30:08 +01:00
Johnny Lim
ce813346c9
Add Javadoc since for AbstractAotMojo.getSession()
...
See gh-37462
2023-09-22 16:29:49 +01:00
Andy Wilkinson
333820627f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37544
2023-09-22 16:26:21 +01:00
Andy Wilkinson
6936d7e5f5
Merge pull request #37395 from erichaagdev
...
* gh-37395:
Mock working directory for extract test
Closes gh-37395
2023-09-22 16:26:12 +01:00