Moritz Halbritter
282571ae1e
Merge branch '3.3.x' into 3.4.x
2025-03-07 08:21:13 +01:00
Moritz Halbritter
5ec099756f
Fix potential NPE when passing 'null' as params
2025-03-07 08:17:37 +01:00
Andy Wilkinson
da5796f70c
Merge branch '3.4.x'
...
Closes gh-44635
2025-03-06 18:35:16 +00:00
Andy Wilkinson
ab66034e1b
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44634
2025-03-06 18:34:54 +00:00
Andy Wilkinson
67b0a26474
Improve structure of test resources in Actuator modules
...
Closes gh-44632
2025-03-06 18:31:35 +00:00
Moritz Halbritter
dde9bfbeaa
Merge branch '3.4.x'
...
Closes gh-44631
2025-03-06 17:41:08 +01:00
Moritz Halbritter
2e74ce8bf2
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44630
2025-03-06 17:39:26 +01:00
Moritz Halbritter
a807a07a59
Always try to deserialize message in case of Docker transport errors
...
Before this commit, if the status code was 4xx or 500, we tried to read the errors
object, consuming the http entity. When we tried to deserialize the message,
the http entity was already consumed, an IOException has been thrown and null
is returned for the message.
Now, we read the content in a byte[] and deserialize the errors and the message
from that. This ensures that we can read both the errors and the message.
Closes gh-44628
2025-03-06 17:27:00 +01:00
Stéphane Nicoll
e0e1f2aeb3
Upgrade to Testcontainers 1.20.6
...
Closes gh-44625
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
a72fedec8f
Upgrade to SLF4J 2.0.17
...
Closes gh-44624
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
a88d4bf93b
Upgrade to Selenium HtmlUnit 4.29.0
...
Closes gh-44623
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
38eadf608f
Upgrade to Selenium 4.29.0
...
Closes gh-44622
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
132fb6e18f
Upgrade to R2DBC MySQL 1.4.0
...
Closes gh-44621
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
ee5ebeacc8
Upgrade to Pulsar 4.0.3
...
Closes gh-44620
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
21569a03ff
Upgrade to Netty 4.1.119.Final
...
Closes gh-44619
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
e47ddaf5ed
Upgrade to Maven Install Plugin 3.1.4
...
Closes gh-44617
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
46ec9ec5c9
Upgrade to Maven Deploy Plugin 3.1.4
...
Closes gh-44616
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
3ba8dec983
Upgrade to Maven Compiler Plugin 3.14.0
...
Closes gh-44615
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
daa0c3001e
Upgrade to Logback 1.5.17
...
Closes gh-44614
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
e25d715ede
Upgrade to jOOQ 3.19.20
...
Closes gh-44612
2025-03-06 16:11:26 +01:00
Stéphane Nicoll
bf8f8a4e23
Upgrade to Jetty Reactive HTTPClient 4.0.9
...
Closes gh-44610
2025-03-06 15:35:14 +01:00
Stéphane Nicoll
9c83f36bef
Upgrade to Infinispan 15.1.7.Final
...
Closes gh-44608
2025-03-06 15:35:14 +01:00
Stéphane Nicoll
f33087e3b7
Upgrade to HtmlUnit 4.10.0
...
Closes gh-44607
2025-03-06 15:35:14 +01:00
Stéphane Nicoll
443edcdcaf
Upgrade to Hibernate 6.6.9.Final
...
Closes gh-44606
2025-03-06 15:35:14 +01:00
Stéphane Nicoll
0ce71e2c06
Upgrade to Groovy 4.0.26
...
Closes gh-44605
2025-03-06 15:35:14 +01:00
Stéphane Nicoll
92c198e536
Upgrade to Flyway 11.3.4
...
Closes gh-44604
2025-03-06 15:35:14 +01:00
Stéphane Nicoll
163e03b3c6
Upgrade to Byte Buddy 1.17.2
...
Closes gh-44603
2025-03-06 15:35:14 +01:00
Stéphane Nicoll
013633cc48
Upgrade to Awaitility 4.3.0
...
Closes gh-44602
2025-03-06 15:35:13 +01:00
Stéphane Nicoll
0a84ebf9f1
Merge branch '3.4.x'
...
Closes gh-44626
2025-03-06 15:34:11 +01:00
Stéphane Nicoll
e06244d007
Adapt EntityManagerFactoryBuilder to work with multiple data sources
...
This commit allows EntityManagerFactoryBuilder to provide the JPA
properties to use according to the DataSource used to build the
EntityManagerFactory. Previously the JPA properties were computed only
once based on the primary data source, which was a problem since its
default DDL setting may be different.
EntityManagerFactoryBuilder takes a function that provides the JPA
properties based on a data source, rather than the properties
themselves. Constructors with the previous variant have been deprecated
as a result.
Closes gh-44516
2025-03-06 15:33:53 +01:00
Andy Wilkinson
3fff2c8072
Merge branch '3.4.x'
2025-03-06 13:25:33 +00:00
Andy Wilkinson
d097870de5
Update CouchbaseAutoConfigurationsTests to use own resources
...
See gh-44576
2025-03-06 13:24:39 +00:00
Moritz Halbritter
3fc07644ee
Make auto-configured BatchSpanProcessor back off when the user defines their own
...
Closes gh-44601
2025-03-06 13:34:08 +01:00
Andy Wilkinson
00b2fe7d95
Merge branch '3.4.x'
2025-03-06 11:22:52 +00:00
Andy Wilkinson
272c905510
Merge branch '3.3.x' into 3.4.x
2025-03-06 11:22:39 +00:00
Andy Wilkinson
c849cafc1b
Further improve independence of core auto-configuration tests
...
See gh-44513
2025-03-06 11:12:49 +00:00
Stéphane Nicoll
2f407550e3
Adapt to deprecation in Spring Security snapshots
...
See gh-44598
2025-03-06 10:37:38 +01:00
Stéphane Nicoll
48466968e1
Upgrade to Neo4j Java Driver 5.28.2
...
Closes gh-44600
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
4270cf562b
Start building against Spring WS 4.0.12 snapshots
...
See gh-44599
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
7cb0ccf89f
Start building against Spring Security 6.5.0-M3 snapshots
...
See gh-44598
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
84a89a3993
Start building against Spring Pulsar 1.2.4 snapshots
...
See gh-44597
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
0835878f9d
Start building against Spring LDAP 3.3.0-M3 snapshots
...
See gh-44596
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
6301bbdfbb
Start building against Spring Kafka 3.3.4 snapshots
...
See gh-44595
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
1b07abfde7
Start building against Spring Integration 6.5.0-M3 snapshots
...
See gh-44594
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
59c87e4f3f
Start building against Spring GraphQL 1.4.0-M1 snapshots
...
See gh-44593
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
6652b84a23
Start building against Spring Data Bom 2025.0.0-M2 snapshots
...
See gh-44592
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
6e4a39ed56
Start building against Spring Batch 5.2.2 snapshots
...
See gh-44591
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
082814862a
Start building against Spring Authorization Server 1.5.0-M2 snapshots
...
See gh-44590
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
086d6a16b5
Start building against Reactor Bom 2024.0.4 snapshots
...
See gh-44589
2025-03-06 10:05:32 +01:00
Stéphane Nicoll
72ea4a630a
Start building against Micrometer Tracing 1.5.0-M3 snapshots
...
See gh-44588
2025-03-06 10:05:31 +01:00
Stéphane Nicoll
89612f22f9
Start building against Micrometer 1.15.0-M3 snapshots
...
See gh-44587
2025-03-06 10:05:31 +01:00
Moritz Halbritter
7fd29cf7c6
Polish "Add support for OpenTelemetry's service.namespace"
...
See gh-44499
2025-03-06 09:56:09 +01:00
Vanio Begic
cf2353bdb3
Add support for OpenTelemetry's service.namespace
...
See gh-44499
Signed-off-by: Vanio Begic <vanio.begic123@gmail.com>
2025-03-06 09:46:11 +01:00
Moritz Halbritter
4dabf16a06
Polish "Remove default value for OtlpMetricsProperties.url"
...
See gh-44493
2025-03-06 09:36:33 +01:00
Johnny Lim
75f72b6ee7
Remove default value for OtlpMetricsProperties.url
...
See gh-44493
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-03-06 09:32:14 +01:00
Moritz Halbritter
ea87b9114d
Polish "Remove support for URLConnectionSender"
...
See gh-44500
2025-03-06 09:17:23 +01:00
Vanio Begic
336fdff9df
Remove support for URLConnectionSender
...
See gh-44500
Signed-off-by: Vanio Begic <vanio.begic123@gmail.com>
2025-03-06 09:00:16 +01:00
Stéphane Nicoll
af8defde54
Merge branch '3.4.x'
...
Closes gh-44586
2025-03-06 08:56:52 +01:00
Stéphane Nicoll
6fb44d83b4
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44585
2025-03-06 08:56:39 +01:00
Stéphane Nicoll
6cf81e2f1b
Deprecate setObservationRegistry
...
This commit deprecates setObservationRegistry on
DefaultJmsListenerContainerFactoryConfigurer as it should not have been
made public in the first place. We want to make sure users don't
accidentally use it, and move it back to a package private method once
the deprecation period has run its course.
Closes gh-44466
2025-03-06 08:56:12 +01:00
Andy Wilkinson
2f73406dff
Merge branch '3.4.x'
2025-03-05 20:08:09 +00:00
Andy Wilkinson
e7bc267ef8
Merge branch '3.3.x' into 3.4.x
2025-03-05 20:08:02 +00:00
Andy Wilkinson
60624e8a56
Avoid problems with platform-specific line endings
...
See gh-44512
2025-03-05 20:07:43 +00:00
Andy Wilkinson
46b4d45983
Merge branch '3.4.x'
...
Closes gh-44580
2025-03-05 18:06:23 +00:00
Andy Wilkinson
dafcef3d7a
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44579
2025-03-05 17:22:27 +00:00
Andy Wilkinson
55c410abec
Improve autoconfigure's use of test resources
...
Closes gh-44512
2025-03-05 16:40:26 +00:00
Andy Wilkinson
162be9670d
Merge branch '3.4.x'
2025-03-05 15:43:14 +00:00
Andy Wilkinson
1eef4385ec
Merge branch '3.3.x' into 3.4.x
2025-03-05 15:43:00 +00:00
Andy Wilkinson
1f5b9de302
Normalize the separator in resource names
...
See gh-44444
2025-03-05 15:42:41 +00:00
Andy Wilkinson
921b704963
Merge branch '3.4.x'
2025-03-05 14:51:57 +00:00
Andy Wilkinson
4043286f59
Merge branch '3.3.x' into 3.4.x
2025-03-05 14:51:50 +00:00
Andy Wilkinson
8e49a4e49a
Increase independence of core auto-configuration tests
...
Remove some more references to Thymeleaf and FreeMarker
auto-configuration that were missed in 85ffbbc
.
See gh-44513
2025-03-05 14:49:58 +00:00
Andy Wilkinson
8cf5584257
Merge branch '3.4.x'
...
Closes gh-44577
2025-03-05 14:35:06 +00:00
Andy Wilkinson
0fb1d2bed7
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44576
2025-03-05 14:34:50 +00:00
Andy Wilkinson
b89cca355e
Merge branch '3.4.x'
2025-03-05 14:34:29 +00:00
Andy Wilkinson
bfd4e7b4ee
Merge branch '3.3.x' into 3.4.x
2025-03-05 14:34:11 +00:00
Andy Wilkinson
85ffbbc384
Make core auto-configuration tests more independent
...
Closes gh-44513
2025-03-05 14:33:57 +00:00
Andy Wilkinson
5683d39fd6
Allow resources to hide existing resources with the same name
...
See gh-44444
2025-03-05 14:33:57 +00:00
Stéphane Nicoll
7912a03536
Upgrade to Neo4j Java Driver 5.28.2
...
Closes gh-44574
2025-03-05 15:17:38 +01:00
Stéphane Nicoll
b077329bb4
Start building against Spring WS 4.0.12 snapshots
...
See gh-44573
2025-03-05 15:12:43 +01:00
Stéphane Nicoll
4e4f2ea9a3
Start building against Spring Security 6.4.4 snapshots
...
See gh-44572
2025-03-05 15:12:39 +01:00
Stéphane Nicoll
ceffb0e24e
Start building against Spring Pulsar 1.2.4 snapshots
...
See gh-44571
2025-03-05 15:12:35 +01:00
Stéphane Nicoll
3361f91d6b
Start building against Spring Kafka 3.3.4 snapshots
...
See gh-44570
2025-03-05 15:12:31 +01:00
Stéphane Nicoll
3b1d3ee412
Start building against Spring Data Bom 2024.1.4 snapshots
...
See gh-44569
2025-03-05 15:12:27 +01:00
Stéphane Nicoll
18ec4ff1f4
Start building against Spring Batch 5.2.2 snapshots
...
See gh-44568
2025-03-05 15:12:23 +01:00
Stéphane Nicoll
a205981299
Start building against Reactor Bom 2024.0.4 snapshots
...
See gh-44567
2025-03-05 15:12:19 +01:00
Stéphane Nicoll
dc6822e7dd
Start building against Micrometer Tracing 1.4.4 snapshots
...
See gh-44566
2025-03-05 15:12:15 +01:00
Stéphane Nicoll
6514ce0815
Start building against Micrometer 1.14.5 snapshots
...
See gh-44565
2025-03-05 15:12:11 +01:00
Stéphane Nicoll
d5d27462ab
Start building against Spring WS 4.0.12 snapshots
...
See gh-44564
2025-03-05 14:53:18 +01:00
Stéphane Nicoll
a0f3850a7f
Start building against Spring Security 6.3.8 snapshots
...
See gh-44563
2025-03-05 14:53:14 +01:00
Stéphane Nicoll
57e17adde0
Start building against Spring Pulsar 1.1.10 snapshots
...
See gh-44562
2025-03-05 14:53:11 +01:00
Stéphane Nicoll
08e9e4949b
Start building against Spring Data Bom 2024.0.10 snapshots
...
See gh-44561
2025-03-05 14:53:07 +01:00
Stéphane Nicoll
057c30c561
Start building against Reactor Bom 2023.0.16 snapshots
...
See gh-44560
2025-03-05 14:53:03 +01:00
Stéphane Nicoll
37c4ea5c09
Start building against Micrometer Tracing 1.3.10 snapshots
...
See gh-44559
2025-03-05 14:52:59 +01:00
Stéphane Nicoll
8b1240331f
Start building against Micrometer 1.13.12 snapshots
...
See gh-44558
2025-03-05 14:52:55 +01:00
Stéphane Nicoll
9a8d18c1ec
Upgrade to Testcontainers 1.20.6
...
Closes gh-44557
2025-03-05 12:58:09 +01:00
Stéphane Nicoll
4dd58aaf96
Upgrade to SLF4J 2.0.17
...
Closes gh-44556
2025-03-05 12:58:05 +01:00
Stéphane Nicoll
e104ad0a0c
Upgrade to Pulsar 3.3.5
...
Closes gh-44555
2025-03-05 12:58:01 +01:00
Stéphane Nicoll
2476b9af0e
Upgrade to Netty 4.1.119.Final
...
Closes gh-44554
2025-03-05 12:57:57 +01:00
Stéphane Nicoll
4d8ff528f1
Upgrade to Maven Install Plugin 3.1.4
...
Closes gh-44553
2025-03-05 12:57:53 +01:00
Stéphane Nicoll
1a11de9cf6
Upgrade to Maven Deploy Plugin 3.1.4
...
Closes gh-44552
2025-03-05 12:57:49 +01:00
Stéphane Nicoll
ad5e56d3ce
Upgrade to Logback 1.5.17
...
Closes gh-44551
2025-03-05 12:57:45 +01:00
Stéphane Nicoll
f30c338a90
Upgrade to jOOQ 3.19.20
...
Closes gh-44550
2025-03-05 12:57:41 +01:00
Stéphane Nicoll
3e6a4a421e
Upgrade to Infinispan 15.0.14.Final
...
Closes gh-44548
2025-03-05 12:57:33 +01:00
Stéphane Nicoll
26fcd2dcc3
Upgrade to Hibernate 6.6.9.Final
...
Closes gh-44547
2025-03-05 12:57:29 +01:00
Stéphane Nicoll
33e7238f26
Upgrade to Groovy 4.0.26
...
Closes gh-44546
2025-03-05 12:57:25 +01:00
Stéphane Nicoll
497aef8668
Upgrade to SLF4J 2.0.17
...
Closes gh-44545
2025-03-05 12:52:11 +01:00
Stéphane Nicoll
b199fabfd2
Upgrade to Netty 4.1.119.Final
...
Closes gh-44544
2025-03-05 12:52:07 +01:00
Stéphane Nicoll
dacc4915cb
Upgrade to Maven Install Plugin 3.1.4
...
Closes gh-44543
2025-03-05 12:52:03 +01:00
Stéphane Nicoll
4fb21b34cf
Upgrade to Maven Deploy Plugin 3.1.4
...
Closes gh-44542
2025-03-05 12:51:59 +01:00
Stéphane Nicoll
cc6cfea102
Upgrade to Logback 1.5.17
...
Closes gh-44541
2025-03-05 12:51:55 +01:00
Stéphane Nicoll
f0e006e86d
Upgrade to jOOQ 3.19.20
...
Closes gh-44540
2025-03-05 12:51:51 +01:00
Stéphane Nicoll
23787db03a
Upgrade to Infinispan 15.0.14.Final
...
Closes gh-44539
2025-03-05 12:51:48 +01:00
Stéphane Nicoll
b28794e331
Upgrade to Groovy 4.0.26
...
Closes gh-44538
2025-03-05 12:51:43 +01:00
Moritz Halbritter
0852243fc6
Merge branch '3.4.x'
...
Closes gh-44537
2025-03-05 11:56:32 +01:00
Moritz Halbritter
d453a59724
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44536
2025-03-05 11:56:21 +01:00
Tran Ngoc Nhan
701f73fcd7
Fix JavaExec javadoc link
...
See gh-44526
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-03-05 11:55:29 +01:00
Andy Wilkinson
a3093a50cb
Merge branch '3.4.x'
...
Closes gh-44531
2025-03-04 18:03:17 +00:00
Andy Wilkinson
d92551f15a
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44530
2025-03-04 18:03:07 +00:00
Andy Wilkinson
dc41feff1f
Merge branch '3.4.x'
...
Closes gh-44529
2025-03-04 18:02:54 +00:00
Andy Wilkinson
3715eb8df2
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44528
2025-03-04 18:02:23 +00:00
Andy Wilkinson
27779bec0a
Remove AutoConfigurationReproTests
...
Removed in favor of WebServerFactoryCustomizerBeanPostProcessorTests
which, through the expectations that it sets up on the mock bean
factory, already checks that early initialization will not be
triggered.
Closes gh-44511
2025-03-04 17:50:19 +00:00
Andy Wilkinson
c9f3688df9
Remove redundant tests
...
Closes gh-44520
2025-03-04 17:45:23 +00:00
Stéphane Nicoll
2b31250689
Merge branch '3.4.x'
...
Closes gh-44524
2025-03-04 15:31:03 +01:00
Stéphane Nicoll
c1f58d1f80
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44523
2025-03-04 15:30:53 +01:00
Matthias Streidel
474dafae28
Fix typo
...
See gh-44514
Signed-off-by: Matthias Streidel <github@metters.slmail.me>
2025-03-04 15:30:27 +01:00
Stéphane Nicoll
2911d1a22a
Start building against Spring Framework 6.2.4 snapshots
...
See gh-44517
2025-03-04 13:05:20 +01:00
Stéphane Nicoll
39bc496a8e
Merge branch '3.4.x'
2025-03-04 12:21:51 +01:00
Stéphane Nicoll
d49617063a
Adapt to change in Spring Framework
...
See https://github.com/spring-projects/spring-framework/issues/34513
See gh-44481
2025-03-04 12:18:01 +01:00
Moritz Halbritter
272939e45e
Polish "Refine the handling of OpenTelemetry resource attributes"
...
See gh-44494
2025-03-03 09:35:56 +01:00
Dmytro Nosan
e62d78ab11
Refine the handling of OpenTelemetry resource attributes
...
See gh-44494
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-03 09:28:46 +01:00
Brian Clozel
83f678a8b1
Separate transports in GraphQL auto-configurations
...
This commit revisits the existing GraphQL configuration properties to
better reflect which ones belong to specific transports.
This also relaxes the Web auto-configurations to only require the
`ExecutionGraphQlService` as a bean. The `GraphQlSource` is now an
optional bean dependency.
Closes gh-44495
2025-02-28 18:12:31 +01:00
Moritz Halbritter
8f4e0518f3
Polish "Add support for OTel-specific environment variables"
...
See gh-44394
2025-02-28 14:52:10 +01:00
Dmytro Nosan
bf015bfeb9
Add support for OTel-specific environment variables
...
This commit introduces the OpenTelementryAttributes class that fetches
OTEL_RESOURCE_ATTRIBUTES and OTEL_SERVICE_NAME environment variables
and merges it with user-defined resource attributes.
Besides that, this commit includes spec-compliant proper handling of
OTEL_RESOURCE_ATTRIBUTES in OtlpMetricsPropertiesConfigAdapter and
OpenTelemetryAutoConfiguration.
See gh-44394
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 14:52:10 +01:00
Stéphane Nicoll
e69683769e
Start building against Spring Framework 6.1.18 snapshots
...
See gh-44491
2025-02-28 14:42:46 +01:00
Andy Wilkinson
b22ad76f21
Polish
2025-02-28 13:10:12 +00:00
Johnny Lim
3bc8727848
Add Javadoc since for new methods in LoggingSystemProperties
...
See gh-44489
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-28 14:08:17 +01:00
Eddú Meléndez
261ea64e39
Add ServiceConnection support for LLdapContainer (Testcontainers)
...
See gh-44389
Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-02-28 13:54:55 +01:00
Eddú Meléndez
5fac1011d6
Add ServiceConnection support for lldap/lldap (Compose)
...
See gh-44389
Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-02-28 13:54:55 +01:00
Andy Wilkinson
f715a3676f
Merge branch '3.4.x'
2025-02-28 12:26:04 +00:00
Andy Wilkinson
be6eb5875e
Merge branch '3.3.x' into 3.4.x
2025-02-28 12:25:32 +00:00
Andy Wilkinson
7d01c941b9
Use WithPackageResources on shouldUpdateSslWhenReloadingSslBundles
...
See gh-44397
2025-02-28 12:23:17 +00:00
Moritz Halbritter
d89b679ecd
Merge branch '3.4.x'
...
Closes gh-44485
2025-02-28 11:50:36 +01:00
Tran Ngoc Nhan
0f4e361a95
Fix typo in javadoc
...
See gh-44469
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-28 11:48:47 +01:00
Dmytro Nosan
b140fd1c4c
Update LogbackLoggingSystemTests to use Console.charset() when available
...
See gh-44477
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 11:44:23 +01:00
Moritz Halbritter
f01199341b
Merge branch '3.4.x'
...
Closes gh-44484
2025-02-28 11:28:47 +01:00
Moritz Halbritter
f6f1a9ffac
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44483
2025-02-28 11:20:37 +01:00
Benjamin König
23fd79f425
Remove obsolete hints for Flyway Teams features
...
See gh-44460
Signed-off-by: Benjamin König <koenig87@googlemail.com>
2025-02-28 11:18:41 +01:00
Stéphane Nicoll
77d8b8e2b0
Merge branch '3.4.x'
...
Closes gh-44482
2025-02-28 11:10:39 +01:00
Stéphane Nicoll
d03847c2c7
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44481
2025-02-28 11:10:31 +01:00
Stéphane Nicoll
e1f45c50ee
Generate reflection hints for main methods
...
This commit makes sure to register the necessary hints to invoke the
main method of any bean available in the context. This is necessary
for tests that use the UseMainMethod feature.
This generates more hints than strictly necessary as there isn't a
way to contribute hints based on a ContextLoader, see
https://github.com/spring-projects/spring-framework/issues/34513 for
more details.
Closes gh-44461
2025-02-28 11:08:23 +01:00
Moritz Halbritter
c91c8e202a
Fix tests
2025-02-28 10:53:54 +01:00
Moritz Halbritter
98e60b5607
Merge branch '3.4.x'
...
Closes gh-44479
2025-02-28 10:36:57 +01:00
Moritz Halbritter
d2d8978170
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44478
2025-02-28 10:36:39 +01:00
Dmitry Sulman
7276be825a
Update version of Neo4j test container image
...
See gh-44463
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:35:55 +01:00
Moritz Halbritter
b9bf4a557e
Merge branch '3.4.x'
...
Closes gh-44476
2025-02-28 10:32:48 +01:00
Moritz Halbritter
da361efd3f
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44475
2025-02-28 10:32:20 +01:00
Dmitry Sulman
c98f9ac126
Update version of Elasticsearch test container image
...
See gh-44459
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:31:07 +01:00
Moritz Halbritter
19ba2ec0e9
Merge pull request #44467 from nosan
...
* pr/44467:
Close InputStream when loading Log4j2 Configuration from a Resource
Closes gh-44467
2025-02-28 10:30:57 +01:00
Moritz Halbritter
92e18df7f0
Merge branch '3.4.x'
...
Closes gh-44474
2025-02-28 10:23:00 +01:00
Moritz Halbritter
589bf2cafc
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44473
2025-02-28 10:13:59 +01:00
Dmytro Nosan
be7e952e91
Close InputStream when loading Log4j2 Configuration from a Resource
...
See gh-44467
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 09:57:09 +01:00
Moritz Halbritter
b2d7a13b9d
Polish "Use Console charset for console logging when available"
...
See gh-44353
2025-02-28 09:26:23 +01:00
Dmytro Nosan
a250bbb7e4
Use Console charset for console logging when available
...
Prior to this commit, LogbackLoggingSystemProperties
doesn't respect Console.charset(). It used Charset.getDefaultCharset()
for logback and UTF-8 for log42j as defaults.
This commit changes the behaviour of LogbackLoggingSystemProperties to use
Console.charset() when available. If no console is present, the default
charset is used instead.
These changes bring consistency across logging implementations.
See gh-43118
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 08:27:40 +01:00
Andy Wilkinson
93648792b1
Switch to management.opentelemetry.resource-attributes in tests
...
See gh-44468
2025-02-27 20:21:47 +00:00
Andy Wilkinson
51885c9d38
Remove deprecated management.otlp.metrics.export.resource-attributes
...
It was deprecated in 3.2 and should have been removed in 3.4 so its
removal is overdue.
Closes gh-44468
2025-02-27 19:01:10 +00:00
Andy Wilkinson
8eb8d3f281
Merge branch '3.4.x'
...
See gh-44449
2025-02-27 10:51:06 +00:00
Andy Wilkinson
cbf9cb04b4
Merge branch '3.3.x' into 3.4.x
...
See gh-44448
2025-02-27 10:50:42 +00:00
Andy Wilkinson
21a5319362
Revert "Use Framework's default class loader as default in ImportCandidates"
...
This reverts commit 56c955158d
.
See gh-44401
2025-02-27 10:50:17 +00:00
Stéphane Nicoll
facda3dca9
Adapt to change in exception hierarchy
...
See gh-44442
2025-02-27 09:38:26 +01:00
Andy Wilkinson
f45a3d7180
Merge branch '3.4.x'
...
Closes gh-44457
2025-02-26 18:47:19 +00:00
Andy Wilkinson
608b6c4852
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44456
2025-02-26 18:29:37 +00:00
Andy Wilkinson
3de189a1df
Minimize test resources and move remainder to appropriate packages
...
Closes gh-44397
2025-02-26 15:49:42 +00:00
Andy Wilkinson
2dac97a8bc
Merge branch '3.4.x'
...
Closes gh-44455
2025-02-26 15:46:01 +00:00
Andy Wilkinson
4d137d4456
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44454
2025-02-26 15:45:47 +00:00
Andy Wilkinson
8577718b22
Close InputStream when loading PEM content from a resource
...
Fixes gh-44443
2025-02-26 15:45:24 +00:00
Andy Wilkinson
3d81a8d848
Merge branch '3.4.x'
...
Closes gh-44453
2025-02-26 15:44:16 +00:00
Andy Wilkinson
9c189a0550
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44452
2025-02-26 15:44:03 +00:00
Andy Wilkinson
88745820d3
Close InputStream after reading banner resource
...
Fixes gh-44441
2025-02-26 15:43:42 +00:00
Andy Wilkinson
4ffb29a924
Merge branch '3.4.x'
...
Closes gh-44451
2025-02-26 15:42:58 +00:00
Andy Wilkinson
0e066ac9b4
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44450
2025-02-26 15:42:46 +00:00
Andy Wilkinson
5be5eaf7f2
Use ClassLoader from ResourceLoader to load PropertySourceLoaders
...
Fixes gh-44427
2025-02-26 15:42:12 +00:00
Andy Wilkinson
65dbff1729
Merge branch '3.4.x'
...
Closes gh-44449
2025-02-26 15:39:57 +00:00
Andy Wilkinson
4f0dd516b4
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44448
2025-02-26 15:39:26 +00:00
Andy Wilkinson
56c955158d
Use Framework's default class loader as default in ImportCandidates
...
Closes gh-44401
2025-02-26 15:32:50 +00:00
Andy Wilkinson
a5ff2a94f0
Merge branch '3.4.x'
...
Closes gh-44446
2025-02-26 15:31:17 +00:00
Andy Wilkinson
23b89c8cb3
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44445
2025-02-26 15:31:04 +00:00
Andy Wilkinson
3acea583ad
Add support for working with resources in tests
...
Closes gh-44444
2025-02-26 15:29:20 +00:00
Stéphane Nicoll
026c0b2a64
Merge branch '3.4.x'
2025-02-26 15:27:15 +01:00
Stéphane Nicoll
d04620d5b3
Polish test
...
Include at least a bean declaration to make sure the cglib proxy is
created
2025-02-26 15:15:30 +01:00
Moritz Halbritter
79ec0ea182
Merge branch '3.4.x'
...
Closes gh-44440
2025-02-26 11:50:57 +01:00
Moritz Halbritter
8705ed0ecc
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44436
2025-02-26 11:49:59 +01:00
Moritz Halbritter
abf320d273
Register reflection hints for SslBundleSslEngineFactory
...
Closes gh-44435
2025-02-26 11:46:55 +01:00
Moritz Halbritter
e7d9f195d2
Merge branch '3.4.x'
...
Closes gh-44438
2025-02-26 11:35:08 +01:00
Moritz Halbritter
ea25734599
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44437
2025-02-26 11:28:49 +01:00
Moritz Halbritter
453002b77b
Add class of SslBundleSslEngineFactory to Kafka config map
...
Closes gh-44414
2025-02-26 10:46:12 +01:00
Tyler Gregory
9199fecae3
Ensure StandardStackTracePrinter respects stacktrace.root configuration property
...
See gh-44398
Signed-off-by: Tyler Gregory <tyler.w.gregory@gmail.com>
2025-02-25 14:27:28 +01:00
Dmytro Nosan
35db02bf48
Add spring.data.mongodb.protocol property
...
This commit allows configuring the MongoDB connection
protocol using the 'spring.data.mongodb.protocol' property.
See gh-44366
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 14:02:29 +01:00
Moritz Halbritter
3be5e6cc3e
Polish "Improve logging in DockerApi"
...
See gh-44412
2025-02-25 13:14:38 +01:00
Dmytro Nosan
9a940702bc
Improve logging in DockerApi
...
This commit introduces a new constructor in `DockerApi`
that accepts `DockerLogger` as a parameter.
The `DockerLogger` is a pretty simple callback interface used to
provide DockerApi output logging.
See gh-44412
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 13:07:23 +01:00