Commit Graph

23100 Commits

Author SHA1 Message Date
Phillip Webb 4b495ca2a9 Change `NestedLocation` to hold a `Path` rather than a `File`
Refactor `NestedLocation` so that it holds a `Path` rather than a
`File`.

See gh-37668
2023-10-18 20:46:35 -07:00
Andy Wilkinson ec6415f04b Add SSL bundle support to Apache Kafka auto-configuration
Closes gh-37629
Co-authored-by: Scott Frederick <sfrederick@vmware.com>
2023-10-18 16:34:28 -05:00
Andy Wilkinson af2e363252 Merge branch '3.1.x'
Closes gh-37942
2023-10-18 18:50:52 +01:00
Andy Wilkinson 226221073c Merge branch '3.0.x' into 3.1.x
Closes gh-37941
2023-10-18 18:39:29 +01:00
Andy Wilkinson a25472ab5b Merge branch '2.7.x' into 3.0.x
Closes gh-37940
2023-10-18 18:39:16 +01:00
Andy Wilkinson 817debb1ee Fix constructor binding with conversion to custom collection type
Closes gh-37734
2023-10-18 17:47:26 +01:00
Andy Wilkinson 8d006f82f7 Merge branch '3.1.x'
Closes gh-37939
2023-10-18 17:46:19 +01:00
Andy Wilkinson 9219fdc638 Merge branch '3.0.x' into 3.1.x
Closes gh-37938
2023-10-18 17:44:30 +01:00
Andy Wilkinson 865203f902 Merge branch '2.7.x' into 3.0.x
Closes gh-37937
2023-10-18 17:37:37 +01:00
Andy Wilkinson 04307aa7e0 Polish "Support @Order on [CommandLine|Application]Runner @Bean definitions"
See gh-37905
2023-10-18 17:16:48 +01:00
Tadaya Tsuyukubo 8ac597c245 Support @Order on [CommandLine|Application]Runner @Bean definitions
Prior to this commit, `@Order` annotation on `@Bean` method was not
considered for `CommandLineRunner` and `ApplicationRunner`.

This commit introduces a `Runner` marker interface and uses it to
retrieve the runner beans. As a result, it enables the use of `@Order`
annotations on `@Bean` methods for both `CommandLineRunner` and
`ApplicationRunner`.

Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>

See gh-37905
2023-10-18 17:15:15 +01:00
Andy Wilkinson 1aa704b619 Upgrade to Spring Batch 5.1.0-RC1
Closes gh-37708
2023-10-18 15:47:27 +01:00
Andy Wilkinson 851e6def76 Fix tests on Windows
See gh-37808
2023-10-18 14:08:41 +01:00
Andy Wilkinson 1559485f56 Fix Gradle plugin test classpath after Kotlin upgrade
See gh-37926
2023-10-18 14:07:49 +01:00
Andy Wilkinson 79ab4c4fa7 Upgrade to Undertow 2.3.10.Final
Closes gh-37934
2023-10-18 12:40:39 +01:00
Andy Wilkinson 4b32f249d4 Upgrade to Undertow 2.3.10.Final
Closes gh-37933
2023-10-18 12:17:52 +01:00
Andy Wilkinson ae75877932 Upgrade to Jetty Reactive HTTPClient 3.0.9
Closes gh-37932
2023-10-18 12:17:45 +01:00
Andy Wilkinson 9c3b689f7c Upgrade to Undertow 2.3.10.Final
Closes gh-37931
2023-10-18 12:00:38 +01:00
Andy Wilkinson 08ea576c37 Upgrade to Jetty Reactive HTTPClient 3.0.9
Closes gh-37930
2023-10-18 12:00:31 +01:00
Andy Wilkinson 27f06ea1e0 Upgrade to Undertow 2.2.28.Final
Closes gh-37929
2023-10-18 11:44:00 +01:00
Andy Wilkinson afff56a5f9 Upgrade to Spring Session Bom 2021.2.3
Closes gh-37928
2023-10-18 11:43:55 +01:00
Andy Wilkinson 5244bcfb5a Upgrade to Jetty Reactive HTTPClient 1.1.15
Closes gh-37927
2023-10-18 11:43:50 +01:00
Andy Wilkinson 029c28d923 Merge branch '3.1.x'
Closes gh-37925
2023-10-18 11:30:35 +01:00
Andy Wilkinson 8f18b116de Merge branch '3.0.x' into 3.1.x
Closes gh-37924
2023-10-18 11:17:41 +01:00
Andy Wilkinson ece239f421 Merge branch '2.7.x' into 3.0.x
Closes gh-37923
2023-10-18 11:01:23 +01:00
Andy Wilkinson 4cc3aec587 Consider @ComponentScan in imports context cache key
Fixes gh-31577
2023-10-18 10:40:23 +01:00
Andy Wilkinson 9460f301b4 Merge branch '3.1.x'
Closes gh-37921
2023-10-18 10:07:14 +01:00
Andy Wilkinson 60a0b7eedb Merge branch '3.0.x' into 3.1.x
Closes gh-37920
2023-10-18 10:07:01 +01:00
Andy Wilkinson 85c186a764 Merge branch '2.7.x' into 3.0.x
Closes gh-37919
2023-10-18 10:01:49 +01:00
Andy Wilkinson 1f0e311cb8 Completely disable restart when running tests
Fixes gh-37373
2023-10-18 09:52:47 +01:00
Andy Wilkinson fa954c0c87 Upgrade to Spring Pulsar 1.0.0-RC1
Closes gh-37918
2023-10-18 07:59:28 +01:00
Andy Wilkinson 4d0e614f5f Upgrade to Spring Integration 6.2.0-RC1
Closes gh-37711
2023-10-18 07:58:38 +01:00
Andy Wilkinson 94500f41e9 Upgrade to Spring Integration 6.1.4
Closes gh-37914
2023-10-17 18:00:25 +01:00
Andy Wilkinson f645ef5fa5 Upgrade to Spring Integration 6.0.8
Closes gh-37795
2023-10-17 17:59:36 +01:00
Andy Wilkinson daa903ab31 Add filters to MockMvc with their init params and dispatcher types
Closes gh-37835
2023-10-17 17:54:36 +01:00
Andy Wilkinson 02c49b0287 When virtual threads are enabled, configure Pulsar to use them
Closes gh-36347
2023-10-17 15:59:41 +01:00
Andy Wilkinson 8b115c8ceb Upgrade to Spring Session 3.2.0-RC1
Closes gh-37716
2023-10-17 14:24:42 +01:00
Andy Wilkinson f0cdc57a2c Upgrade to Spring Authorization Server 1.2.0-RC1
Closes gh-37707
2023-10-17 14:24:42 +01:00
Andy Wilkinson 84d83c1964 Upgrade to Elasticsearch Client 8.10.4
Closes gh-37912
2023-10-17 14:24:41 +01:00
Andy Wilkinson ffeed75804 Upgrade to Spring Session 3.1.3
Closes gh-37702
2023-10-17 14:22:19 +01:00
Andy Wilkinson b10556e6ad Upgrade to Spring Session 3.0.4
Closes gh-37686
2023-10-17 14:20:36 +01:00
Andy Wilkinson de91771cb3 Upgrade to Spring Security 6.2.0-RC2
Closes gh-37715
2023-10-17 09:03:20 +01:00
Andy Wilkinson d546936d53 Upgrade to Spring Kafka 3.1.0-RC1
Closes gh-37712
2023-10-17 09:03:19 +01:00
Andy Wilkinson d5b1acc41f Upgrade to Spring AMQP 3.1.0-RC1
Closes gh-37706
2023-10-17 09:03:19 +01:00
Andy Wilkinson 4e21be9086 Upgrade to OkHttp 4.12.0
Closes gh-37908
2023-10-17 09:03:18 +01:00
Andy Wilkinson 613cc4f5b9 Upgrade to Log4j2 2.21.0
Closes gh-37907
2023-10-17 09:03:13 +01:00
Andy Wilkinson fb2ce355af Upgrade to GraphQL Java 21.2
Closes gh-37906
2023-10-17 09:03:08 +01:00
Andy Wilkinson 0c9c48d54b Upgrade to Spring Security 6.1.5
Closes gh-37701
2023-10-17 08:59:44 +01:00
Andy Wilkinson 439c2f9f84 Upgrade to Spring Kafka 3.0.12
Closes gh-37797
2023-10-17 08:59:43 +01:00
Andy Wilkinson cbb8d28e55 Upgrade to Spring Authorization Server 1.1.3
Closes gh-37697
2023-10-17 08:59:43 +01:00
Andy Wilkinson 1a2832a0b6 Upgrade to Spring AMQP 3.0.10
Closes gh-37696
2023-10-17 08:59:42 +01:00
Andy Wilkinson 517c63336a Upgrade to Spring Security 6.0.8
Closes gh-37685
2023-10-17 08:46:54 +01:00
Andy Wilkinson 2acfe9c4e1 Upgrade to Spring Kafka 3.0.12
Closes gh-37796
2023-10-17 08:46:54 +01:00
Andy Wilkinson b33d43cc43 Upgrade to Spring AMQP 3.0.10
Closes gh-37681
2023-10-17 08:46:53 +01:00
Andy Wilkinson 747cb2dac9 Upgrade to Spring AMQP 2.4.17
Closes gh-37676
2023-10-17 08:43:41 +01:00
Phillip Webb 33c5e1269a Write signature files to uber jars to for Oracle Java 17 verification
Update Gradle and Maven plugins to write an empty `META-INF/BOOT.SF`
file whenever there is a nested signed jar.

This update allows Oracle Java 17 to correctly verify the nested JARs.
The file is required because `JarVerifier` has code roughly equivalent
to:

	if (!jarManifestNameChecked && SharedSecrets
			.getJavaUtilZipFileAccess().getManifestName(jf, true) == null) {
    	throw new JarException("The JCE Provider " + jarURL.toString() +
    		" is not signed.");
	}

The `SharedSecrets.getJavaUtilZipFileAccess().getManifestName(jf, true)`
call ends up in `ZipFile.getManifestName(onlyIfSignatureRelatedFiles)`
which is a private method that we cannot override in our `NestedJarFile`
subclass. By writing an empty `.SF` file we ensure that the `Manifest`
is always returned because there are always "signature related files".

Fixes gh-28837
2023-10-16 16:19:16 -07:00
Phillip Webb fe752dedef Polish adoc formatting 2023-10-16 15:50:58 -07:00
Andy Wilkinson 9f224ff136 Narrow the scope of 0e3a196 to Resource[] for array binding
See gh-15835
2023-10-16 18:18:34 +01:00
Andy Wilkinson d6a9295c26 Allow additional build info properties to have provided values
Closes gh-37889
2023-10-16 18:15:42 +01:00
Andy Wilkinson d796087dfa Polish "Add properties for configuring EnumFeature and JsonNodeFeature"
See gh-37885
2023-10-16 15:39:25 +01:00
Eddú Meléndez 8edb4b9729 Add properties for configuring EnumFeature and JsonNodeFeature
Both `EnumFeature` and `JsonNodeFeature` implement `DataTypeFeature`
which was recently added in Spring Framework. This commits introduces
support to allow the configuration via properties.

See spring-projects/spring-framework#31380

See gh-37885
2023-10-16 15:00:32 +01:00
Andy Wilkinson 19fd88b25b Implement SSL hot reload for Netty and Tomcat
Closes gh-37808
2023-10-16 14:08:26 +01:00
Andy Wilkinson 92cd85002d Upgrade to Spring Retry 2.0.4
Closes gh-37714
2023-10-16 13:58:18 +01:00
Andy Wilkinson 52d80197fe Upgrade to Spring Retry 2.0.4
Closes gh-37700
2023-10-16 13:52:25 +01:00
Andy Wilkinson a8a19acb99 Upgrade to Spring Retry 2.0.4
Closes gh-37684
2023-10-16 13:27:37 +01:00
Andy Wilkinson 5970f29fd5 Upgrade to Spring Data Bom 2023.1.0-RC1
Closes gh-37709
2023-10-16 12:27:50 +01:00
Andy Wilkinson 204cfce04c Upgrade to Dropwizard Metrics 4.2.21
Closes gh-37899
2023-10-16 12:27:44 +01:00
Andy Wilkinson fea81fb50d Upgrade to Spring LDAP 3.1.2
Closes gh-37699
2023-10-16 11:57:25 +01:00
Andy Wilkinson 43b566b98e Upgrade to Spring Data Bom 2023.0.5
Closes gh-37698
2023-10-16 11:57:25 +01:00
Andy Wilkinson 2fabc49a1e Upgrade to Dropwizard Metrics 4.2.21
Closes gh-37897
2023-10-16 11:57:19 +01:00
Andy Wilkinson fc69d272fc Upgrade to Spring LDAP 3.0.6
Closes gh-37683
2023-10-16 11:53:58 +01:00
Andy Wilkinson 53a020fef7 Upgrade to Spring Data Bom 2022.0.11
Closes gh-37682
2023-10-16 11:53:57 +01:00
Andy Wilkinson 03209fad19 Upgrade to Dropwizard Metrics 4.2.21
Closes gh-37896
2023-10-16 11:53:57 +01:00
Andy Wilkinson 60912c41a6 Upgrade to Spring Data Bom 2021.2.17
Closes gh-37677
2023-10-16 11:32:56 +01:00
Andy Wilkinson a70afe2148 Upgrade to Pooled JMS 1.2.5
Closes gh-37894
2023-10-16 11:32:56 +01:00
Andy Wilkinson 344d1361c8 Upgrade to Dropwizard Metrics 4.2.21
Closes gh-37893
2023-10-16 11:32:51 +01:00
Andy Wilkinson 0e3a196af5 Fix binding of classpath*: to resource arrays and collections
Fixes gh-15835
2023-10-16 11:28:35 +01:00
Brian Clozel 339f75d309 Fix GraphQL WebSocket HandlerMapping bean ordering
Prior to this commit, the GraphQL WebSocket HandlerMapping bean would be
ordered at position "2", before the RouterFunction variant defined by
Spring Framework at position "3".

Since then, the Spring Framework team changed the default order value
for this one at "-1", see spring-projects/spring-framework#30278.
This prevents the WebSocket upgrade, as the request is handled by the
RouterFunction instead of the WebSocket handler.

This commit updates the handlermapping order and introduces a test to
prevent issues in the future.

Fixes gh-37892
2023-10-16 12:11:31 +02:00
Phillip Webb 4c3a0f09d7 Support parallel initialization of Testcontainers
Add support for a `spring.testcontainers.startup` property that can
be set to "sequential" or "parallel" to change how containers are
started.

Closes gh-37073
2023-10-14 23:58:25 -07:00
Phillip Webb efd9aa9b64 Polish 2023-10-14 19:51:42 -07:00
Phillip Webb e01e4f1912 Search implemented interfaces on superclass for @ServiceConnection
Refine original fix to also search interfaces on the superclass.

Fixes gh-37671
2023-10-14 19:43:41 -07:00
Andy Wilkinson 084bd3a420 Merge branch '3.1.x' 2023-10-13 21:38:06 +01:00
Andy Wilkinson ccaa54436b Merge branch '3.0.x' into 3.1.x 2023-10-13 21:37:56 +01:00
Andy Wilkinson b1eb08faba Merge branch '2.7.x' into 3.0.x 2023-10-13 21:37:44 +01:00
Andy Wilkinson 3dba0d76d2 Polish
See gh-37878
2023-10-13 21:17:12 +01:00
Andy Wilkinson 2231244d2c Merge branch '3.1.x' 2023-10-13 20:42:15 +01:00
Andy Wilkinson e957c3087c Merge branch '3.0.x' into 3.1.x 2023-10-13 20:36:51 +01:00
Andy Wilkinson c25e532aeb Merge branch '2.7.x' into 3.0.x 2023-10-13 20:36:32 +01:00
Andy Wilkinson dbc06faed8 Polish
See gh-37878
2023-10-13 20:36:16 +01:00
Andy Wilkinson 085e12aa93 Merge branch '3.1.x'
Closes gh-37884
2023-10-13 16:39:21 +01:00
Andy Wilkinson 0c1b5d1295 Merge branch '3.0.x' into 3.1.x
Closes gh-37883
2023-10-13 16:39:02 +01:00
Andy Wilkinson e314e11985 Fix AOT processing of @MultipartConfig annotated @WebServlet
Closes gh-37637
2023-10-13 16:22:38 +01:00
Andy Wilkinson 60f05eaa94 Merge branch '3.1.x'
Closes gh-37882
2023-10-13 16:01:47 +01:00
Andy Wilkinson 5af13d191f Merge branch '3.0.x' into 3.1.x
Closes gh-37881
2023-10-13 16:01:32 +01:00
Andy Wilkinson ae2693b7f1 Merge branch '2.7.x' into 3.0.x
Closes gh-37880
2023-10-13 16:01:14 +01:00
Andy Wilkinson 42ee6b9e74 Use new permissions API with Gradle 8.3+
Closes gh-37878
2023-10-13 16:00:54 +01:00
Andy Wilkinson 932fe4fcf8 Polish "Avoid ObjectMappear creation in WebSocketMessagingAutoConfiguration"
See gh-37861
2023-10-13 10:41:07 +01:00
Johnny Lim 5397ad0822 Avoid ObjectMappear creation in WebSocketMessagingAutoConfiguration
See gh-37861
2023-10-13 10:39:51 +01:00
Andy Wilkinson e6b2e19628 Upgrade to Spring LDAP 3.2.0-RC1
Closes gh-37713
2023-10-13 10:24:30 +01:00
Andy Wilkinson c72456a27e Revert "Start building against Spring Security 6.2.0 snapshots"
This reverts commit 4e21896b0d.

See gh-37715
2023-10-13 09:51:01 +01:00
Andy Wilkinson 726cbd50b3 Upgrade to SQLite JDBC 3.43.2.0
Closes gh-37877
2023-10-13 09:14:18 +01:00
Andy Wilkinson c88fe3b3ef Upgrade to Spring HATEOAS 2.2.0-RC1
Closes gh-37876
2023-10-13 09:14:18 +01:00
Andy Wilkinson 1fa0835cf5 Upgrade to Selenium 4.14.1
Closes gh-37875
2023-10-13 09:14:18 +01:00
Andy Wilkinson db50de3c1d Upgrade to MongoDB 4.11.0
Closes gh-37874
2023-10-13 09:14:17 +01:00
Moritz Halbritter fcf77ed65d Add property to stop the JVM from exiting
spring.main.keep-alive=true will spawn a non-daemon thread which stops
if the context is closed

Closes gh-37736
2023-10-12 17:02:47 +02:00
Andy Wilkinson 6880fb0fc8 Upgrade to Undertow 2.3.9.Final
Closes gh-37870
2023-10-12 15:27:56 +01:00
Andy Wilkinson 73674af547 Upgrade to Selenium 4.14.0
Closes gh-37869
2023-10-12 15:27:50 +01:00
Andy Wilkinson 712e7690cf Upgrade to Reactor Bom 2023.0.0-RC1
Closes gh-37705
2023-10-12 15:27:43 +01:00
Andy Wilkinson b0c66c07e2 Upgrade to R2DBC MySQL 1.0.5
Closes gh-37868
2023-10-12 15:27:43 +01:00
Andy Wilkinson d42512cf26 Upgrade to Netty 4.1.100.Final
Closes gh-37867
2023-10-12 15:27:37 +01:00
Andy Wilkinson e7d12e4599 Upgrade to Micrometer Tracing 1.2.0-RC1
Closes gh-37704
2023-10-12 15:27:30 +01:00
Andy Wilkinson 61fb23a7fe Upgrade to Micrometer 1.12.0-RC1
Closes gh-37703
2023-10-12 15:27:30 +01:00
Andy Wilkinson 72f4fcc860 Upgrade to jOOQ 3.18.7
Closes gh-37866
2023-10-12 15:27:29 +01:00
Andy Wilkinson c3a779c642 Upgrade to Infinispan 14.0.19.Final
Closes gh-37865
2023-10-12 15:27:29 +01:00
Andy Wilkinson 6656379f35 Upgrade to Flyway 9.22.3
Closes gh-37864
2023-10-12 15:27:28 +01:00
Andy Wilkinson 003eefee6c Upgrade to Elasticsearch Client 8.10.3
Closes gh-37863
2023-10-12 15:27:27 +01:00
Andy Wilkinson 7b5126e009 Upgrade to Classmate 1.6.0
Closes gh-37862
2023-10-12 15:27:26 +01:00
Andy Wilkinson be082cad7d Upgrade to Undertow 2.3.9.Final
Closes gh-37860
2023-10-12 14:47:20 +01:00
Andy Wilkinson a291e2e2f0 Upgrade to Reactor Bom 2022.0.12
Closes gh-37695
2023-10-12 14:47:14 +01:00
Andy Wilkinson af6a65c824 Upgrade to R2DBC MySQL 1.0.5
Closes gh-37859
2023-10-12 14:47:14 +01:00
Andy Wilkinson 4a5e002b22 Upgrade to Netty 4.1.100.Final
Closes gh-37858
2023-10-12 14:47:08 +01:00
Andy Wilkinson a46fb519b0 Upgrade to Micrometer Tracing 1.1.6
Closes gh-37694
2023-10-12 14:47:01 +01:00
Andy Wilkinson e4e59e7ea7 Upgrade to Micrometer 1.11.5
Closes gh-37693
2023-10-12 14:47:01 +01:00
Andy Wilkinson eff7819df7 Upgrade to jOOQ 3.18.7
Closes gh-37857
2023-10-12 14:47:00 +01:00
Andy Wilkinson 8468a2cbf9 Upgrade to Jetty 11.0.17
Closes gh-37856
2023-10-12 14:46:55 +01:00
Andy Wilkinson d1a94a13ef Upgrade to Infinispan 14.0.19.Final
Closes gh-37855
2023-10-12 14:46:50 +01:00
Andy Wilkinson 42f6e2ba65 Upgrade to Hibernate 6.2.13.Final
Closes gh-37854
2023-10-12 14:46:46 +01:00
Andy Wilkinson 6511b4b3cf Upgrade to Byte Buddy 1.14.9
Closes gh-37853
2023-10-12 14:46:39 +01:00
Andy Wilkinson 6a7fc6bee8 Upgrade to Undertow 2.3.9.Final
Closes gh-37850
2023-10-12 13:33:41 +01:00
Andy Wilkinson 9612a24ff3 Upgrade to Reactor Bom 2022.0.12
Closes gh-37680
2023-10-12 13:33:36 +01:00
Andy Wilkinson cabb20fad3 Upgrade to Netty 4.1.100.Final
Closes gh-37849
2023-10-12 13:33:35 +01:00
Andy Wilkinson 9dfc512bd4 Upgrade to Micrometer Tracing 1.0.11
Closes gh-37679
2023-10-12 13:33:29 +01:00
Andy Wilkinson 3e5cfce17d Upgrade to Micrometer 1.10.12
Closes gh-37678
2023-10-12 13:33:28 +01:00
Andy Wilkinson 9fb3f8bed6 Upgrade to jOOQ 3.17.16
Closes gh-37848
2023-10-12 13:33:28 +01:00
Andy Wilkinson 811f4a1ec7 Upgrade to Jetty 11.0.17
Closes gh-37847
2023-10-12 13:33:23 +01:00
Andy Wilkinson 3f7847aec3 Upgrade to Infinispan 14.0.19.Final
Closes gh-37846
2023-10-12 13:33:18 +01:00
Johnny Lim 446677375e Polish gh-35082
See gh-37831
2023-10-12 14:17:02 +02:00
Andy Wilkinson c0eb2cb4ae Prohibit upgrades to Undertow 2.2.27.Final
Closes gh-37844
2023-10-12 12:21:10 +01:00
Andy Wilkinson e9f543c6ba Upgrade to Reactor Bom 2020.0.37
Closes gh-37675
2023-10-12 12:21:09 +01:00
Andy Wilkinson de6e87acf0 Upgrade to Netty 4.1.100.Final
Closes gh-37843
2023-10-12 12:21:09 +01:00
Andy Wilkinson ecc017000d Upgrade to Micrometer 1.9.16
Closes gh-37674
2023-10-12 12:21:09 +01:00
Andy Wilkinson 5ce281c982 Upgrade to Jetty 9.4.53.v20231009
Closes gh-37842
2023-10-12 12:21:08 +01:00
Andy Wilkinson c6c6167fa0 Upgrade to Infinispan 13.0.20.Final
Closes gh-37841
2023-10-12 12:21:08 +01:00
Andy Wilkinson 8832b6788d Upgrade to Elasticsearch 7.17.14
Closes gh-37840
2023-10-12 11:44:17 +01:00
Andy Wilkinson 81cbf05b41 Merge branch '3.1.x'
Closes gh-37839
2023-10-12 11:39:19 +01:00
Andy Wilkinson 19b877fc14 Merge branch '3.0.x' into 3.1.x
Closes gh-37838
2023-10-12 11:39:06 +01:00
Andy Wilkinson f780cc6d03 Merge branch '2.7.x' into 3.0.x
Closes gh-37837
2023-10-12 11:38:32 +01:00
Andy Wilkinson 11311dbf6d Register task executor metrics when using lazy init
Fixes gh-37832
2023-10-12 11:19:33 +01:00
Andy Wilkinson 6fbc328b4c Polish "Add support for configuring non-standard JMS acknowledge modes"
See gh-37576
2023-10-12 10:56:43 +01:00
Vedran Pavic d72fb8e127 Add support for configuring non-standard JMS acknowledge modes
Prior to this commit, `spring.jms.listener.session.acknowledge-mode`
and `spring.jms.template.session.acknowledge-mode` accepted only a
predefined set of values representing standard JMS acknowledge modes.

This commit adds support for also using arbitrary integer values to
these configuration properties, which allows vendor-specific JMS
acknowledge modes to be configured.

See gh-37576
2023-10-12 08:36:30 +01:00