Commit Graph

42858 Commits

Author SHA1 Message Date
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
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
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
259a03500f Merge branch '2.7.x' into 3.0.x 2023-09-22 16:06:54 +01:00
Andy Wilkinson
7bb40d50d4 Polish 2023-09-22 16:06:44 +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
c991a7b90b Merge branch '2.7.x' into 3.0.x
Closes gh-37534
2023-09-22 11:21:25 +02:00
Moritz Halbritter
f6230120dc Merge pull request #37438 from nielsbasjes
* pr/37438:
  Polish "Use the Maven Archiver implementation for parsing outputTimestamp"
  Use the Maven Archiver implementation for parsing outputTimestamp

Closes gh-37438
2023-09-22 11:21:13 +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
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
a8fcb18471 Merge branch '2.7.x' into 3.0.x
Closes gh-37528
2023-09-22 09:08:51 +02:00
Moritz Halbritter
3f9a04331c Remove Java 20 from CI
Closes gh-37527
2023-09-22 09:03:35 +02:00
Moritz Halbritter
9304622a34 Merge branch '2.7.x' into 3.0.x
Closes gh-37524
2023-09-22 08:54:31 +02:00
Moritz Halbritter
a0fd4fc86b Switch Java 21 CI to Bellsoft and enable update detection
Closes gh-37369
2023-09-22 08:53:42 +02:00
Moritz Halbritter
58941d85f2 Merge branch '2.7.x' into 3.0.x
Closes gh-37521
2023-09-22 08:41:58 +02:00
Moritz Halbritter
f96690348f Use Bellsoft JDK 21 in LoaderIntegrationTests
Closes gh-35900
2023-09-22 08:35:22 +02:00
Scott Frederick
e5e04d9fbc Merge branch '2.7.x' into 3.0.x
Closes gh-37517
2023-09-21 12:05:00 -05:00
Scott Frederick
bd855135b0 Use Paketo Jammy builder in Paketo system tests
Closes gh-37516
2023-09-21 11:56:35 -05:00
Moritz Halbritter
dc8e69cc8d Merge branch '2.7.x' into 3.0.x
Closes gh-37512
2023-09-21 16:44:05 +02:00
Moritz Halbritter
a3f51e0f6f Merge pull request #37492 from izeye
* pr/37492:
  Fix wrong mocking

Closes gh-37492
2023-09-21 16:43:52 +02:00
Johnny Lim
b95092c621 Fix wrong mocking
See gh-37492
2023-09-21 16:42:43 +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
Moritz Halbritter
81efbc7a7b Merge pull request #37491 from esperar
* pr/37491:
  Use more idiomatic Kotlin in doc example

Closes gh-37491
2023-09-21 16:39:55 +02:00
김희망
45e08f321c Use more idiomatic Kotlin in doc example
See gh-37491
2023-09-21 16:36:51 +02:00
Spring Builds
37adadbcad Next development version (v3.0.12-SNAPSHOT) 2023-09-21 09:12:01 +00:00
Moritz Halbritter
b88b8a9502 Merge branch '2.7.x' into 3.0.x 2023-09-21 09:50:02 +02:00
Spring Builds
f24c0e2e7d Next development version (v2.7.17-SNAPSHOT) 2023-09-21 07:21:42 +00: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