Commit Graph

22710 Commits

Author SHA1 Message Date
Andy Wilkinson f9b4a1ea5b Merge branch '3.1.x' 2023-09-27 19:27:58 +01:00
Andy Wilkinson 6fb252b00c Polish 2023-09-27 19:26:18 +01:00
Andy Wilkinson 4e38469ba2 Merge branch '3.1.x'
Closes gh-37611
2023-09-27 18:16:00 +01:00
Andy Wilkinson 4a3901149b Fix additional metadata location for spring.jmx.registration-policy
Closes gh-37596
2023-09-27 18:15:05 +01:00
Andy Wilkinson 192fb346bc Merge branch '3.1.x'
Closes gh-37610
2023-09-27 18:12:33 +01:00
Andy Wilkinson 1bcd127ad0 Merge branch '3.0.x' into 3.1.x
Closes gh-37609
2023-09-27 18:10:04 +01:00
Andy Wilkinson c486892a9b Fix additional metadata location for spring.webflux.multipart.streaming
Closes gh-37608
2023-09-27 18:09:14 +01:00
Scott Frederick 3cf08e1351 Clarify default security options for image building
See gh-37479
2023-09-27 11:05:40 -05:00
Scott Frederick 9811cc030f Fix LifecycleTests for security options on Windows
Fixes gh-37598
2023-09-27 10:09:44 -05:00
Andy Wilkinson 0d2eaa716c Polish "Add config prop for JMS listener's sessionTransacted flag"
See gh-37473
2023-09-27 15:07:36 +01:00
Vedran Pavic 79e2cb3ec1 Add config prop for JMS listener's sessionTransacted flag
This commit introduces `spring.jms.listener.session-transacted` property
in order to enable explicit configuration of `sessionTransacted` on the
`DefaultMessageListenerContainer`.

Prior to this commit, `sessionTransacted` would be configured implicitly
based on presence of `JtaTransactionManager`.

See gh-37473
2023-09-27 15:06:52 +01:00
Andy Wilkinson b7facec4a1 Rename spring.jms.listener.acknowledge-mode
Closes gh-37602
2023-09-27 14:41:09 +01:00
Andy Wilkinson 145fb161a1 Merge branch '3.1.x'
Closes gh-37601
2023-09-27 12:50:58 +01:00
Andy Wilkinson 0368fc5678 Merge branch '3.0.x' into 3.1.x
Closes gh-37600
2023-09-27 12:38:21 +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 3adc70fd40 Polish "Add properties for JmsTemplate session's ack mode and transacted flag"
See gh-37500
2023-09-27 10:25:19 +01:00
Vedran Pavic 5ba4e2793d Add properties for JmsTemplate session's ack mode and transacted flag
See gh-37500
2023-09-27 10:19:45 +01:00
Andy Wilkinson b63efd17b8 Merge branch '3.1.x'
Closes gh-37595
2023-09-27 09:48:01 +01:00
Andy Wilkinson 5015327886 Merge branch '3.0.x' into 3.1.x
Closes gh-37594
2023-09-27 09:47:49 +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
Scott Frederick 7c23c0b3c2 Merge branch '3.1.x' 2023-09-26 18:51:03 -05:00
Scott Frederick 5ae4ba83a7 Merge branch '3.0.x' into 3.1.x 2023-09-26 18:19:48 -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 d37e9424a2 Merge branch '3.1.x'
Closes gh-37589
2023-09-26 14:07:16 -05:00
Scott Frederick 4f8684fd69 Merge branch '3.0.x' into 3.1.x
Closes gh-37588
2023-09-26 14:07:05 -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 ecc670772a Make user details service auto-configs back off more readily
Previously auto-configuration of a user details service (imperative
or reactive) would only back off on the presence of certain beans.
This led to situations where the im-memory service was
auto-configured and the default password was logged even though
another authentication mechanism was in use.

This commit updates the auto-configuration so that it backs off
when depending on Spring Security's OAuth2 Client and OAuth2
Resource Server modules. In the imperative case it will also back
off when depending on the SAML 2 provider.

Closes gh-35338
2023-09-26 16:47:19 +01:00
Andy Wilkinson ab06d10d64 Fix checkpoint-restore with replaced or wrapped HikariDataSource
Closes gh-37580
2023-09-26 12:31:12 +01:00
Andy Wilkinson ee9c74556d Make reactive security back off without authentication manager
If there's no authentication manager bean or no bean from which
one can be created, Spring Security's reactive support may fail to
bootstrap due to a null authentication manager.

This commit causes the auto-configuration that enables WebFlux
security to back off in the absence of an AuthenticationManager bean
and a ReactiveUserDetailsService (from which Spring Security can
create an AuthenticationManager) bean. Other reactive security
auto-configuration that can configure things such that WebFlux security
can be bootstrapped without an AuthenticationManager has been updated
to enable WebFlux security rather than relying on another
auto-configuration class to do so.

Fixes gh-37504
2023-09-25 15:31:45 +01:00
Moritz Halbritter 1d60e42a73 Merge branch '3.1.x'
Closes gh-37572
2023-09-25 12:02:34 +02:00
Sushant Kumar Singh 088d9ccc32 Remove mockito-inline from documentation
See gh-37561
2023-09-25 11:58:53 +02:00
Moritz Halbritter 11ec9f95f6 Merge branch '3.1.x'
Closes gh-37571
2023-09-25 11:40:16 +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 a7666ba8a5 Merge branch '3.1.x'
Closes gh-37554
2023-09-22 17:49:23 +01: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 e80f743648 Merge branch '3.1.x'
Closes gh-37551
2023-09-22 11:37:00 -05: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 fb15125d01 Merge branch '3.1.x'
Closes gh-37548
2023-09-22 16:30:36 +01: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 af495b2dc0 Merge branch '3.1.x'
Closes gh-37546
2023-09-22 16:26:48 +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 ece9f510ae Merge branch '3.1.x'
Closes gh-37543
2023-09-22 16:22:01 +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 1b6f29a1da Merge branch '3.1.x'
Closes gh-37540
2023-09-22 15:51:49 +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 ec9ac05d3d Merge branch '3.1.x'
Closes gh-37536
2023-09-22 11:21:53 +02: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 1f137af90f Merge branch '3.1.x'
Closes gh-37533
2023-09-22 09:26:27 +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 279f1e2d0f Merge branch '3.1.x'
Closes gh-37514
2023-09-21 16:44:22 +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 ae7a3410ad Merge branch '3.1.x'
Closes gh-37511
2023-09-21 16:40:51 +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
Vedran Pavic 433bd337f4 Rename JMS listener minimum concurrency property
This commit renames `spring.jms.listener.concurrency` property to
`spring.jms.listener.min-concurrency` in order to better align it with
`spring.jms.listener.max-concurrency`.

See gh-37451
2023-09-21 16:17:39 +02:00
Phillip Webb f55184a998 Update copyright year of changed files 2023-09-20 17:16:31 -07:00
Phillip Webb 2075f6c685 Merge branch '3.1.x' 2023-09-20 17:16:13 -07: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
Scott Frederick 7de770f6a1 Add support for security options in CNB builder container config
Closes gh-37479
2023-09-20 13:43:36 -05:00
Scott Frederick 4433fcd1f2 Add support for build workspace option when building images
Closes gh-37478
2023-09-20 13:43:35 -05:00
Andy Wilkinson d8576f319e Upgrade to Versions Maven Plugin 2.16.1
Closes gh-37490
2023-09-20 11:24:11 +01:00
Andy Wilkinson 7a803471b5 Upgrade to Spring Integration 6.2.0-M3
Closes gh-37233
2023-09-20 11:24:06 +01:00
Andy Wilkinson f60510c173 Upgrade to Spring Batch 5.1.0-M3
Closes gh-37230
2023-09-20 11:24:05 +01:00
Andy Wilkinson 787cfac788 Upgrade to Lombok 1.18.30
Closes gh-37489
2023-09-20 11:24:05 +01: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 b87e47e90c Merge branch '3.1.x'
Closes gh-37485
2023-09-20 10:56:35 +01:00