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
Sushant Kumar Singh
088d9ccc32
Remove mockito-inline from documentation
...
See gh-37561
2023-09-25 11:58:53 +02:00
Moritz Halbritter
02f71d8e95
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37570
2023-09-25 11:39:29 +02: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
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
c838c707d8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37553
2023-09-22 17:44:44 +01: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
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
3803bd9af9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37550
2023-09-22 11:32:28 -05: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
8080bb9cfb
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37547
2023-09-22 16:30:19 +01:00
Johnny Lim
ce813346c9
Add Javadoc since for AbstractAotMojo.getSession()
...
See gh-37462
2023-09-22 16:29:49 +01:00
Andy Wilkinson
e4d8b22403
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37545
2023-09-22 16:26:31 +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
Eric Haag
a2be276dd8
Mock working directory for extract test
...
Prior to this change, this test would create files in the project
directory. This can cause issues with Gradle caching and up-to-date
checks.
To address this, the value of the working directory is mocked to a
temporary directory like all the other tests.
See gh-37395
2023-09-22 16:24:49 +01:00
Andy Wilkinson
9d185825b6
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37542
2023-09-22 16:21:50 +01:00
Andy Wilkinson
28f4d77c2a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37541
2023-09-22 16:21:41 +01:00
Andy Wilkinson
98acca9633
Add dep management for kafka-server-common with test classifier
...
Closes gh-37499
2023-09-22 16:20:53 +01:00
Andy Wilkinson
7bb40d50d4
Polish
2023-09-22 16:06:44 +01:00
Andy Wilkinson
e3c3cb4b47
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37539
2023-09-22 15:50:28 +01:00
Andy Wilkinson
18b7015552
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37538
2023-09-22 15:35:45 +01:00
Andy Wilkinson
89a86e91f5
Avoid deprecation warning with Gradle 8.4-rc-1
...
Closes gh-37493
2023-09-22 15:31:36 +01:00
Moritz Halbritter
059bb69705
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37535
2023-09-22 11:21:37 +02:00
Moritz Halbritter
c991a7b90b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37534
2023-09-22 11:21:25 +02:00
Moritz Halbritter
a3611ae9f3
Polish "Use the Maven Archiver implementation for parsing outputTimestamp"
...
See gh-37438
2023-09-22 11:13:10 +02:00
Niels Basjes
a1b08e1819
Use the Maven Archiver implementation for parsing outputTimestamp
...
See gh-37438
2023-09-22 11:12:48 +02:00
Moritz Halbritter
b5cc6f9f92
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37532
2023-09-22 09:26:17 +02:00
Moritz Halbritter
17092e124d
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37531
2023-09-22 09:26:08 +02:00
Moritz Halbritter
6be8ce948a
Document support for Java 21
...
Closes gh-37371
2023-09-22 09:22:14 +02:00
Moritz Halbritter
ddd666497d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37513
2023-09-21 16:44:14 +02:00
Moritz Halbritter
dc8e69cc8d
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37512
2023-09-21 16:44:05 +02:00
Johnny Lim
b95092c621
Fix wrong mocking
...
See gh-37492
2023-09-21 16:42:43 +02:00
Moritz Halbritter
aabd6f58d5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37510
2023-09-21 16:40:41 +02:00
Moritz Halbritter
454342acfa
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37509
2023-09-21 16:40:29 +02:00
김희망
45e08f321c
Use more idiomatic Kotlin in doc example
...
See gh-37491
2023-09-21 16:36:51 +02:00
Phillip Webb
78eb8f90d1
Merge branch '3.0.x' into 3.1.x
2023-09-20 17:12:27 -07:00
Phillip Webb
78c3512e32
Polish
2023-09-20 17:11:54 -07:00
Phillip Webb
9b5062e5bb
Merge branch '2.7.x' into 3.0.x
2023-09-20 17:06:55 -07:00
Phillip Webb
b83e7b42bb
Update copyright year of changed files
2023-09-20 16:05:44 -07:00
Phillip Webb
e10ac76761
Polish
2023-09-20 16:05:30 -07:00
Andy Wilkinson
79a73e7b5f
Upgrade to Spring Integration 6.1.3
...
Closes gh-37267
2023-09-20 11:17:11 +01:00
Andy Wilkinson
351e2590eb
Upgrade to Lombok 1.18.30
...
Closes gh-37488
2023-09-20 11:17:11 +01:00
Andy Wilkinson
09e67cda96
Upgrade to Lombok 1.18.30
...
Closes gh-37487
2023-09-20 11:09:50 +01:00
Andy Wilkinson
d28982f3bd
Upgrade to Spring Integration 5.5.19
...
Closes gh-37251
2023-09-20 11:05:55 +01:00
Andy Wilkinson
94478c2210
Upgrade to Lombok 1.18.30
...
Closes gh-37486
2023-09-20 11:05:55 +01:00
Andy Wilkinson
e10ca23b41
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37484
2023-09-20 10:56:20 +01:00