Moritz Halbritter
72a4e1ebae
Honor timeout in ZipkinWebClientSender
...
Unfortunately there's no good way to configure connect and read timeout
separately, which works for all supported reactive clients. This
implementation applies a timeout through Reactor's timeout method. The
timeout from the properties is summed together and this is the applied
timeout. While not perfect, this is better than no timeout at all.
Closes gh-31496
2023-09-29 10:05:29 +02:00
Scott Frederick
619a0f3b35
Merge branch '3.1.x'
...
Closes gh-37624
2023-09-28 16:32:45 -05:00
Scott Frederick
6c16ff104e
Merge pull request #37497 from JinseongHwang
...
* pr/37497:
Use consistent capitalization in MySQL and MariaDB test names
Closes gh-37497
2023-09-28 16:31:58 -05:00
JinseongHwang
0b703f9007
Use consistent capitalization in MySQL and MariaDB test names
...
See gh-37497
2023-09-28 16:28:32 -05:00
Scott Frederick
228041666b
Merge branch '3.1.x'
...
Closes gh-37622
2023-09-28 16:11:31 -05:00
Scott Frederick
667797f2a8
Merge pull request #37619 from jonasfugedi
...
* pr/37619:
Polish "Support IPv6 addresses when configuring RabbitMQ using properties"
Support IPv6 addresses when configuring RabbitMQ using properties
Closes gh-37619
2023-09-28 16:11:12 -05:00
Scott Frederick
fad43adf14
Polish "Support IPv6 addresses when configuring RabbitMQ using properties"
...
See gh-37619
2023-09-28 16:07:25 -05:00
csk8167
c1972f6db6
Support IPv6 addresses when configuring RabbitMQ using properties
...
See gh-37619
2023-09-28 16:06:39 -05:00
Andy Wilkinson
bebca55a8f
Add testAndDevelopmentOnly configuration
...
Closes gh-35436
2023-09-28 13:24:34 +01:00
Moritz Halbritter
b52a781f7b
Merge pull request #37434 from shin-mallang
...
* pr/37434:
Remove duplicate code in NettyWebServerFactoryCustomizer
Closes gh-37434
2023-09-28 10:08:00 +02:00
shin-mallang
8eac7a91f6
Remove duplicate code in NettyWebServerFactoryCustomizer
...
Since the PropertyMapper's alwaysApplyingWhenNonNull() has already been
called, the subsequent whenNonNull() is unnecessary.
See gh-37434
2023-09-28 09:51:51 +02:00
Moritz Halbritter
578b4643ac
Merge pull request #37501 from sreekarareddy
...
* pr/37501:
Don't call setValidateConnectionOnBorrow on Oracle UCP datasource
Closes gh-37501
2023-09-28 09:20:05 +02:00
Sreekara Reddy
8fad59466c
Don't call setValidateConnectionOnBorrow on Oracle UCP datasource
...
See gh-37501
2023-09-28 09:10:59 +02:00
Moritz Halbritter
40d4c177cd
Merge branch '3.1.x'
...
Closes gh-37616
2023-09-28 08:54:22 +02:00
Moritz Halbritter
a1947d6deb
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37615
2023-09-28 08:53:12 +02: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
Phillip Webb
052757c2d8
Polish
2023-09-27 20:58:09 -07:00
Phillip Webb
3591f4d614
Restore test ensuring maxInboundMessageBodySize property matches default
...
See gh-37603
2023-09-27 18:21:24 -07:00
Andy Wilkinson
d5395c97c0
Merge pull request #37603 from garyrussell
...
* gh-37603:
Polish "Add config prop for Rabbit's max inbound message body size"
Add config prop for Rabbit's max inbound message body size
Closes gh-37603
2023-09-27 19:45:14 +01:00
Andy Wilkinson
4e5f16f2bc
Polish "Add config prop for Rabbit's max inbound message body size"
...
See gh-37603
2023-09-27 19:28:10 +01:00
Gary Russell
954f56287f
Add config prop for Rabbit's max inbound message body size
...
See gh-37603
2023-09-27 19:28:10 +01:00
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
8fec430347
Merge pull request #37473 from vpavic
...
* gh-37473:
Polish "Add config prop for JMS listener's sessionTransacted flag"
Add config prop for JMS listener's sessionTransacted flag
Closes gh-37473
2023-09-27 15:35:01 +01: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
1cb4941a16
Merge pull request #37500 from vpavic
...
* gh-37500:
Polish "Add properties for JmsTemplate session's ack mode and transacted flag"
Add properties for JmsTemplate session's ack mode and transacted flag
Closes gh-37500
2023-09-27 10:50:11 +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
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
c81b45f1a0
Merge branch '3.1.x'
...
Closes gh-37593
2023-09-27 09:18:26 +01:00
Andy Wilkinson
a57b19b2ca
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37592
2023-09-27 09:18:15 +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