Phillip Webb
5df63ca85f
Merge branch '3.0.x'
...
Closes gh-34056
2023-02-02 15:53:27 -08:00
Phillip Webb
09b83c972a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34055
2023-02-02 15:52:58 -08:00
Phillip Webb
86fc39261e
Upgrade CI to springio/artifactory-resource 0.0.18
...
Closes gh-34054
2023-02-02 15:52:21 -08:00
Andy Wilkinson
26e39b26f5
Merge branch '3.0.x'
...
Closes gh-34045
2023-02-01 17:32:58 +00:00
Andy Wilkinson
118f736260
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34044
2023-02-01 17:32:39 +00:00
Andy Wilkinson
9940fcfe77
Reset mocks produced by FactoryBeans
...
An unwanted side-effect of the changes made in c6bdd136 to fix
gh-7271 is that a mock produced by a factory bean is not reset. To
allow such a mock to be reset without regressing the fix we now call
getBean(…) as we did before c6bdd136 , however the call is now
performed in a defensive manner falling back to getSingleton(…) when
it fails.
Closes gh-33830
2023-02-01 17:22:36 +00:00
Andy Wilkinson
2f2738e5ea
Merge branch '3.0.x'
...
Closes gh-34042
2023-02-01 15:49:31 +00:00
Andy Wilkinson
0184548be1
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34041
2023-02-01 15:47:13 +00:00
Andy Wilkinson
4aa82a3dc0
Merge pull request #33965 from marcel-wollschlaeger
...
* gh-33965:
Polish "Add Redis application properties example"
Add Redis application properties example
Closes gh-33965
2023-02-01 15:44:57 +00:00
Andy Wilkinson
2bf780237a
Polish "Add Redis application properties example"
...
See gh-33965
2023-02-01 15:44:42 +00:00
Marcel Wollschläger
b6f900dd98
Add Redis application properties example
...
For the `Connect to Redis` section in the documentation also mention how
to configure the Redis connection via application properties similar
to the other connectors (Mongodb, Elasticsearch, Neo4j, ...).
See gh-33965
2023-02-01 15:44:41 +00:00
Andy Wilkinson
636b70a77d
Merge branch '3.0.x'
...
Closes gh-34040
2023-02-01 15:19:56 +00:00
Andy Wilkinson
f2361dd9b1
Merge pull request #33979 from ath0s
...
* gh-33979:
Polish "Configure jOOQ with TransactionProvider bean when available"
Configure jOOQ with TransactionProvider bean when available
Closes gh-33979
2023-02-01 15:19:41 +00:00
Andy Wilkinson
56a1551c2d
Polish "Configure jOOQ with TransactionProvider bean when available"
...
See gh-33979
2023-02-01 15:19:16 +00:00
ath0s
b2a8c8be1c
Configure jOOQ with TransactionProvider bean when available
...
See gh-33979
2023-02-01 14:53:55 +00:00
Moritz Halbritter
0440e23233
Merge branch '3.0.x'
...
Closes gh-34038
2023-02-01 10:34:29 +01:00
Moritz Halbritter
b28369d511
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34036
2023-02-01 09:44:30 +01:00
Moritz Halbritter
66e1905d17
Merge pull request #33855 from mhalbritter
...
* pr/33855:
Set Reactor Netty's shutdownQuietPeriod to 0 when using devtools
Closes gh-33855
2023-02-01 09:34:39 +01:00
Moritz Halbritter
2a843d1853
Set Reactor Netty's shutdownQuietPeriod to 0 when using devtools
...
See gh-33855
2023-02-01 09:31:41 +01:00
Moritz Halbritter
1b634ea7c4
Merge pull request #32076 from Dieken
...
* pr/32076:
Allow different log level for FILE and CONSOLE appender
Closes gh-32076
2023-01-31 14:32:27 +01:00
Yubao Liu
6ba5329a79
Allow different log level for FILE and CONSOLE appender
...
- java.util.logging isn't supported yet
See gh-32076
2023-01-31 14:31:51 +01:00
Moritz Halbritter
e34d5812ba
Merge pull request #32573 from mdeinum
...
* pr/32573:
Allow JMX Registration Policy to be set
Closes gh-32573
2023-01-31 14:30:48 +01:00
Marten Deinum
f2950f2d09
Allow JMX Registration Policy to be set
...
See gh-32573
2023-01-31 14:30:36 +01:00
Moritz Halbritter
a5d1b672d3
Merge pull request #32880 from lukahartwig
...
* pr/32880:
Add Nomad to cloud platforms
Closes gh-32880
2023-01-31 14:11:31 +01:00
Luka Hartwig
6d05cf3efb
Add Nomad to cloud platforms
...
See gh-32880
2023-01-31 14:11:08 +01:00
Moritz Halbritter
3882656d1d
Merge pull request #32951 from ThomasKasene
...
* pr/32951:
Auto-configure BatchInterceptor on ConcurrentKafkaListenerContainerFactory
Closes gh-32951
2023-01-31 13:59:44 +01:00
Thomas Kåsene
d1a089ba71
Auto-configure BatchInterceptor on ConcurrentKafkaListenerContainerFactory
...
See gh-32951
2023-01-31 13:59:02 +01:00
Moritz Halbritter
73d2bb5063
Merge pull request #33082 from frosiere
...
* pr/33082:
Add configuration property to control auto-startup of listener container
Closes gh-33082
2023-01-31 13:46:10 +01:00
Francois Rosiere
eaa7cdf910
Add configuration property to control auto-startup of listener container
...
See gh-33082
2023-01-31 13:45:33 +01:00
Moritz Halbritter
cde0d5a625
Merge pull request #33288 from terminux
...
* pr/33288:
Support setting more properties of KafkaAdmin
Closes gh-33288
2023-01-31 13:32:32 +01:00
Guirong Hu
6e064ed5e0
Support setting more properties of KafkaAdmin
...
See gh-33288
2023-01-31 13:30:30 +01:00
Moritz Halbritter
db80fc1734
Merge pull request #33350 from StitzL
...
* pr/33350:
Improve log message when repackaging by specifying the involved files
Closes gh-33350
2023-01-31 13:29:19 +01:00
lars-christian stitz
a186055c51
Improve log message when repackaging by specifying the involved files
...
See gh-33350
2023-01-31 13:16:56 +01:00
Moritz Halbritter
93a4e303be
Fix flaky SampleJettyApplicationTests
...
See gh-33553
2023-01-31 12:22:01 +01:00
Moritz Halbritter
de699b4d11
Fix HazelcastAutoConfigurationServerTests
...
See gh-33687
2023-01-31 12:05:04 +01:00
Moritz Halbritter
64c2320ce1
Polish "Merge pull request #33553 from michaelweidmann"
...
See gh-33553
2023-01-31 11:43:33 +01:00
Michael Weidmann
93d46d11e9
Add max http response header size configuration for tomcat and jetty
...
See gh-33553
2023-01-31 11:43:33 +01:00
Andy Wilkinson
ace31cd5b2
Merge branch '3.0.x'
...
Closes gh-34022
2023-01-31 10:18:48 +00:00
Andy Wilkinson
fd1b596937
Remove MySQL module that is no longer published
...
Closes gh-34021
2023-01-31 10:18:03 +00:00
Moritz Halbritter
25e8f2d575
Merge pull request #33643 from libetl
...
* pr/33643:
Allow JoranConfigurators to be passed ahead of time in logback
Closes gh-33643
2023-01-31 11:15:51 +01:00
lionel benychou
4f17a9cc9d
Allow JoranConfigurators to be passed ahead of time in logback
...
See gh-33643
2023-01-31 11:13:21 +01:00
Moritz Halbritter
e5bc9a2fcb
Merge branch '3.0.x'
...
Closes gh-34020
2023-01-31 11:11:39 +01:00
Moritz Halbritter
48bc12da12
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34019
2023-01-31 11:11:30 +01:00
Moritz Halbritter
53f0840818
Merge pull request #33941 from sannanansari
...
* pr/33941:
Complete dependency management for Mongo's Java Driver
Closes gh-33941
2023-01-31 11:11:22 +01:00
Sanan
09d9d601e7
Complete dependency management for Mongo's Java Driver
...
See gh-33941
2023-01-31 11:10:49 +01:00
Moritz Halbritter
e955fb5cb6
Polish "Merge pull request #33687 from luben93"
...
See gh-33687
2023-01-31 11:05:47 +01:00
Moritz Halbritter
3f4bb4eacc
Merge pull request #33687 from luben93
...
* pr/33687:
Use hazelcast's Config.loadFromStream()
Closes gh-33687
2023-01-31 11:03:25 +01:00
lucas persson
275f15b8d3
Use hazelcast's Config.loadFromStream()
...
To allow the private function Config.applyEnvAndSystemVariableOverrides()
to override with environment variables
See gh-33687
2023-01-31 11:03:09 +01:00
Moritz Halbritter
48db5ff35c
Merge branch '3.0.x'
...
Closes gh-34018
2023-01-31 10:51:45 +01:00
Moritz Halbritter
0a080736d8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34017
2023-01-31 10:50:30 +01:00