root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 17 Packages Projects Releases Wiki Activity
53,636 Commits 23 Branches 347 Tags 279 MiB
Commit Graph

28442 Commits

Author SHA1 Message Date
Stéphane Nicoll 2a5083c9ac Upgrade to Spring AMQP 3.1.10 
Closes gh-44738
 2025-03-17 17:39:15 +01:00
Andy Wilkinson be97e79ad6 Rationalize Groovy Template configuration properties 
Previously, spring.groovy.template.configuration properties were
bound directly to GroovyMarkupConfigurer. This meant that the
properties had no description or default values in the metadata.
It also resulted in some duplicate where a specific
spring.groovy.template property was also provided.

This commit deprecates the spring.groovy.template.configuration.*
properties in favour of specific spring.groovy.template.* properties
that are mapped to the GroovyMarkupConfigurer.

Closes gh-44722
 2025-03-17 16:03:34 +00:00
Stéphane Nicoll abc43894c7 Merge branch '3.4.x' 2025-03-17 16:06:38 +01:00
Stéphane Nicoll 0f7d46a992 Polish "Stop relying on broker's auto-configuration" 
See gh-44735
 2025-03-17 16:06:12 +01:00
Stéphane Nicoll b639f3759b Merge branch '3.4.x' 
Closes gh-44736
 2025-03-17 15:56:01 +01:00
Stéphane Nicoll aec59c7369 Merge branch '3.3.x' into 3.4.x 
Closes gh-44735
 2025-03-17 15:55:54 +01:00
Stéphane Nicoll bf4fface23 Stop relying on broker's auto-configuration 
This commit isolates JmsAutoConfiguration tests so that they do not
rely on an actual broker. Some tests that are no longer relevant have
been adapted as well.

Closes gh-44734
 2025-03-17 15:50:34 +01:00
Stéphane Nicoll d0cdae2369 Align nativeTest to native to make it multi-modules friendly
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 
This commit harmonizes the behavior of the native and nativeTest Maven
profiles. Previously, enabling the nativeTest profile would
automatically add an execution of the Spring Boot and Native Build Tools
plugins, even in a module that doesn't represent an application or a
Spring Boot-related module.

With this commit, the native testing feature is only enabled if the
plugins are defined in the project, either directly, or in a parent.

The documentation has been updated as the behavior of both profiles is
now much more consistent.

Closes gh-44696
 2025-03-17 11:32:35 +01:00
Jonatan Ivanov 97e71b7507 Add GarbageCollectorInfo to MemoryInfo 
See gh-44704
 2025-03-17 09:09:29 +01:00
Stéphane Nicoll 8daf7323c3 Merge branch '3.4.x' 
Closes gh-44730
 2025-03-17 09:02:23 +01:00
Stéphane Nicoll 0ca4be2d52 Merge branch '3.3.x' into 3.4.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 
Closes gh-44729
 2025-03-17 09:02:00 +01:00
Stéphane Nicoll 6ec6132cc2 Update copyright year of changed files 
See gh-44725
 2025-03-17 09:01:35 +01:00
Yanming Zhou fa9c1f0c41 Polish usage of @ConfigurationProperties 
See gh-44725

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-17 09:01:08 +01:00
Moritz Halbritter 6d2fb65340 Merge branch '3.4.x' 
Closes gh-44728
 2025-03-17 08:55:25 +01:00
Moritz Halbritter 01719c41fa Merge branch '3.3.x' into 3.4.x 
Closes gh-44727
 2025-03-17 08:55:16 +01:00
youngjin_dev a164dab25d Fix Integer conversion in getProgress() method 
See gh-44718

Signed-off-by: youngjin_dev <qazkyj0310@gmail.com>
 2025-03-17 08:52:15 +01:00
Phillip Webb 951e7abfbc Merge branch '3.4.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
2025-03-14 17:24:51 -07:00
Phillip Webb 14e00c0c75 Merge branch '3.3.x' into 3.4.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
2025-03-14 17:24:26 -07:00
Phillip Webb 109e4c8572 Update copyright year of changed files
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
2025-03-14 17:24:06 -07:00
Phillip Webb 2e0f6f87d8 Merge branch '3.4.x' 2025-03-14 15:44:29 -07:00
Phillip Webb 5d688502ae Polish 2025-03-14 15:44:23 -07:00
Phillip Webb a55a6be4ed Merge branch '3.4.x' 2025-03-14 15:15:33 -07:00
Phillip Webb 6eb7d3411b Merge branch '3.3.x' into 3.4.x 2025-03-14 15:14:30 -07:00
Phillip Webb 896b5767fe Polish 2025-03-14 13:36:04 -07:00
Stéphane Nicoll 611a46cd81 Upgrade to Spring Data Bom 2025.0.0-M2 
Closes gh-44592
 2025-03-14 17:06:32 +01:00
Stéphane Nicoll e851832efe Upgrade to Spring Data Bom 2024.1.4 
Closes gh-44569
 2025-03-14 17:04:33 +01:00
Stéphane Nicoll 4c5ceb8c33 Upgrade to AspectJ 1.9.23 
Closes gh-44720
 2025-03-14 17:04:33 +01:00
Stéphane Nicoll 2d6eb6618b Upgrade to Spring Data Bom 2024.0.10
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 
Closes gh-44561
 2025-03-14 16:59:43 +01:00
Stéphane Nicoll e90e6355ed Upgrade to AspectJ 1.9.23 
Closes gh-44719
 2025-03-14 16:59:43 +01:00
Moritz Halbritter e6dd61a5a6 Merge branch '3.4.x' 
Closes gh-44717
 2025-03-14 14:53:52 +01:00
Moritz Halbritter a2a0adea8a Merge branch '3.3.x' into 3.4.x 
Closes gh-44716
 2025-03-14 14:53:40 +01:00
Moritz Halbritter 09b3461394 Remove use of self-signed.badssl.com 
Closes gh-43708
 2025-03-14 14:45:14 +01:00
Yanming Zhou 81048b42ca Introduce PollerMetadataCustomizer for Spring Integration 
See gh-44637

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-14 13:58:21 +01:00
Stéphane Nicoll a1abd69257 Upgrade to AspectJ 1.9.23 
Closes gh-44715
 2025-03-14 10:49:06 +01:00
Moritz Halbritter d005e958d9 Merge branch '3.4.x' 2025-03-13 12:11:24 +01:00
Moritz Halbritter 84612f36ce Move UseApr enum inside the Tomcat class 
See gh-44033
 2025-03-13 12:03:27 +01:00
Moritz Halbritter 3bd75f6ce5 Revert back to the custom decode method for Otel decoding 
https://github.com/spring-projects/spring-framework/issues/34570

See gh-44677
 2025-03-13 11:26:23 +01:00
Dmytro Nosan 9229cb5cd7 Polish OpenTelemetryResourceAttributes 
Update OpenTelemetryResourceAttributes to use StringUtils.uriDecode(...)
as it provides the same functionality as the custom decode(...) method.

See gh-44677

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-03-13 10:38:56 +01:00
Moritz Halbritter 79030e6b5f Polish "Introduce properties for configuring the OpenTelemetry BatchSpanProcessor" 
See gh-44655
 2025-03-13 10:21:19 +01:00
Dmytro Nosan ea4822177f Introduce properties for configuring the OpenTelemetry BatchSpanProcessor 
This commit adds the following properties to allow customization
of the BatchSpanProcessor:

- management.tracing.opentelemetry.export.include-unsampled
- management.tracing.opentelemetry.export.timeout
- management.tracing.opentelemetry.export.max-batch-size
- management.tracing.opentelemetry.export.max-queue-size
- management.tracing.opentelemetry.export.schedule-delay

Default values were taken from BatchSpanProcessorBuilder.

See gh-44655

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-03-13 10:15:58 +01:00
Moritz Halbritter a53aba6abc Merge branch '3.4.x' 
This sets the default value of 'server.tomcat.use-apr' to 'NEVER'.

Closes gh-44705
 2025-03-13 08:58:18 +01:00
Moritz Halbritter 7fcf34eaeb Add property 'server.tomcat.use-apr' to control Tomcat's APR 
The property's default depends on the Java version. On Java < 24, it defaults
to WHEN_AVAILABLE, on Java >=24 it defaults to NEVER.

Closes gh-44033
 2025-03-13 08:40:16 +01:00
Andy Wilkinson 19c386040b Merge branch '3.4.x' 
Closes gh-44698
 2025-03-12 15:49:41 +00:00
Andy Wilkinson 59ddba1063 Merge branch '3.3.x' into 3.4.x 
Closes gh-44697
 2025-03-12 15:48:36 +00:00
Andy Wilkinson 9b15b4bce9 Consolidate mock web server factories 
Closes gh-44674
 2025-03-12 15:26:47 +00:00
Andy Wilkinson b61578d183 Merge branch '3.4.x' 
Closes gh-44695
 2025-03-12 12:54:27 +00:00
Andy Wilkinson 08b358e829 Merge branch '3.3.x' into 3.4.x 
Closes gh-44694
 2025-03-12 12:50:18 +00:00
Andy Wilkinson 3a6e4e9e58 Add checks for factories files 
META-INF/spring.factories and META-INF/spring/aot.factories in the
main source set are now checked. The checks verify that:

- Each class listed in the values exists in the source set's output
- The classes are listed alphabetically
- Nested classes are identified using their binary name

Closes gh-44676
 2025-03-12 12:44:18 +00:00
Andy Wilkinson 901feadc25 Merge branch '3.4.x' 
Closes gh-44693
 2025-03-12 12:43:25 +00:00
Andy Wilkinson b4c41c43f2 Merge branch '3.3.x' into 3.4.x 
Closes gh-44692
 2025-03-12 12:43:08 +00:00
Andy Wilkinson ad9f0a6164 Make logging system factory ordering more robust 
Closes gh-44689
 2025-03-12 12:42:28 +00:00
Andy Wilkinson 6f04cf032b Adapt test to change in Neo4j driver's internals 
See gh-44690
 2025-03-12 12:02:28 +00:00
Andy Wilkinson 8b50de8674 Upgrade to Neo4j Java Driver 5.28.3 
Closes gh-44691
 2025-03-12 11:52:44 +00:00
Andy Wilkinson a35c04aad6 Upgrade to Neo4j Java Driver 5.28.3 
Closes gh-44690
 2025-03-12 11:51:00 +00:00
Stéphane Nicoll bf54ab7756 Upgrade to Neo4j Java Driver 5.28.3 
Closes gh-44687
 2025-03-12 10:43:49 +01:00
Stéphane Nicoll 2c5672d472 Upgrade to Lettuce 6.5.5.RELEASE 
Closes gh-44686
 2025-03-12 10:43:44 +01:00
Stéphane Nicoll 73e1df24dd Prohibit upgrades to jOOQ 3.20.0 
Closes gh-44372
 2025-03-12 09:11:10 +01:00
Stéphane Nicoll 3ea9c56ea0 Merge branch '3.4.x' 
Closes gh-44685
 2025-03-12 08:59:27 +01:00
Stéphane Nicoll 322191f288 Merge branch '3.3.x' into 3.4.x 
Closes gh-44684
 2025-03-12 08:58:58 +01:00
Johnny Lim 3a5e059387 Polish 
See gh-44447

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-03-12 08:49:26 +01:00
Stéphane Nicoll 5af92d1dee Merge branch '3.4.x' 
Closes gh-44681
 2025-03-12 08:39:27 +01:00
Stéphane Nicoll 20d8e47273 Merge branch '3.3.x' into 3.4.x 
Closes gh-44680
 2025-03-12 08:38:26 +01:00
Stéphane Nicoll 0f0180d9dc Prevent upgrade to Jetty 12.0.17 
Closes gh-44611
 2025-03-12 08:38:08 +01:00
Stéphane Nicoll dba091b21b Upgrade to Reactor Bom 2024.0.4 
Closes gh-44589
 2025-03-11 17:15:26 +01:00
Stéphane Nicoll f1aa051557 Upgrade to Micrometer Tracing 1.5.0-M3 
Closes gh-44588
 2025-03-11 17:15:26 +01:00
Stéphane Nicoll 49551bf43b Upgrade to Micrometer 1.15.0-M3 
Closes gh-44587
 2025-03-11 17:15:26 +01:00
Stéphane Nicoll ddf8681bb6 Upgrade to jOOQ 3.19.21 
Closes gh-44672
 2025-03-11 17:15:25 +01:00
Stéphane Nicoll 29242bd4f3 Upgrade to Hibernate 6.6.10.Final 
Closes gh-44671
 2025-03-11 17:15:20 +01:00
Stéphane Nicoll 1f30ae8f5d Upgrade to ActiveMQ 6.1.6 
Closes gh-44670
 2025-03-11 17:15:15 +01:00
Stéphane Nicoll f1eb2da00e Upgrade to Reactor Bom 2023.0.16 
Closes gh-44560
 2025-03-11 16:59:11 +01:00
Stéphane Nicoll 3e5062591f Upgrade to Micrometer Tracing 1.3.10 
Closes gh-44559
 2025-03-11 16:59:11 +01:00
Stéphane Nicoll 7a9589cc98 Upgrade to Micrometer 1.13.12 
Closes gh-44558
 2025-03-11 16:59:11 +01:00
Stéphane Nicoll d18ccfae3d Upgrade to jOOQ 3.19.21 
Closes gh-44668
 2025-03-11 16:59:11 +01:00
Stéphane Nicoll 4efb861c52 Upgrade to ActiveMQ 6.1.6 
Closes gh-44667
 2025-03-11 16:59:04 +01:00
Stéphane Nicoll 7dcacf2a40 Upgrade to Reactor Bom 2024.0.4 
Closes gh-44567
 2025-03-11 16:58:39 +01:00
Stéphane Nicoll b391945b33 Upgrade to Micrometer Tracing 1.4.4 
Closes gh-44566
 2025-03-11 16:58:39 +01:00
Stéphane Nicoll 7d06639a68 Upgrade to Micrometer 1.14.5 
Closes gh-44565
 2025-03-11 16:58:39 +01:00
Stéphane Nicoll a9499a2cc4 Upgrade to jOOQ 3.19.21 
Closes gh-44665
 2025-03-11 16:58:38 +01:00
Stéphane Nicoll ae16d8ac5e Upgrade to Hibernate 6.6.10.Final 
Closes gh-44664
 2025-03-11 16:58:34 +01:00
Stéphane Nicoll 466d15c7c5 Upgrade to ActiveMQ 6.1.6 
Closes gh-44663
 2025-03-11 16:58:28 +01:00
Moritz Halbritter d0a93dd7cd Merge branch '3.4.x' 2025-03-11 14:01:11 +01:00
Moritz Halbritter e7f8b22479 Enable platform mismatch test again 
We now try to pull linux/arm64. The image only exists for linux/amd64, which should
throw the platform mismatch exception.

See gh-44059
 2025-03-11 13:32:15 +01:00
Stéphane Nicoll f6d8ee166d Start building against Spring WS 4.1.0-M1 snapshots 
See gh-44599
 2025-03-11 07:51:22 +01:00
Andy Wilkinson b6bccc1378 Support DataSource auto-configuration without spring-jdbc 
Prior to these changes, auto-configured a DataSource required
spring-jdbc to be on the classpath even if the app made no use of any
of its features.

The changes largely remove the use of spring-jdbc during DataSoruce
auto-configure or disable some support (configuring an unpooled,
embedded database) in its absense. The extra unwrapping in
DataSourceBuilder has been removed as it appears to be redundant.
The existing test for deriving from an embedded database continues
to work without it.

Closes gh-43786
 2025-03-10 17:54:34 +00:00
Moritz Halbritter 58fab66163 Merge branch '3.4.x' 2025-03-10 16:15:48 +01:00
Moritz Halbritter 8fca1dbb6f Disable test until further investigation 
See gh-44059
 2025-03-10 16:12:33 +01:00
Moritz Halbritter 1aa1bab0a8 Merge branch '3.4.x' 2025-03-10 11:28:03 +01:00
Moritz Halbritter 24854f469c Use single-arch image to test platform mismatch detection 
See gh-44059
 2025-03-10 11:00:55 +01:00
Andy Wilkinson 207c8f54ab Merge branch '3.4.x' 2025-03-07 17:02:36 +00:00
Andy Wilkinson 92a063faca Merge branch '3.3.x' into 3.4.x 2025-03-07 17:02:22 +00:00
Andy Wilkinson e30ae372e3 Move resources into same packages as documentation tests 
See gh-44639
 2025-03-07 17:01:58 +00:00
Andy Wilkinson ea7caf9b8f Merge branch '3.4.x' 
Closes gh-44642
 2025-03-07 10:38:59 +00:00
Andy Wilkinson ec985d260e Merge branch '3.3.x' into 3.4.x 
Closes gh-44641
 2025-03-07 10:37:19 +00:00
Andy Wilkinson edf3cb1421 Position endpoint documentation tests alongside endpoint's auto-config 
Closes gh-44639
 2025-03-07 10:28:04 +00:00
Moritz Halbritter 12c9bfff2f Merge branch '3.4.x' 
Closes gh-44640
 2025-03-07 11:03:41 +01:00
Stéphane Nicoll 0e09a2d25f Polish "Add additional configuration properties for JdbcTemplate" 
See gh-44470
 2025-03-07 10:33:59 +01:00
Yanming Zhou baa89c5ce8 Add additional configuration properties for JdbcTemplate. 
This commit adds configuration properties for additional settings of
the auto-configured JdbcTemplate:

* ignore-warnings
* skip-results-processing
* skip-undeclared-results
* results-map-case-insensitive

See gh-44470

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-07 10:33:59 +01:00
Dmytro Nosan b3f90337ec Polish OpenTelemetryResourceAttributesTests 
See gh-44636

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-03-07 10:08:23 +01:00
Moritz Halbritter d93f4f5554 Throw exception if pulled image platform doesn't match the requested platform 
Closes gh-44059
 2025-03-07 09:28:17 +01:00
Moritz Halbritter 6f464e71da Merge branch '3.4.x' 2025-03-07 08:21:32 +01:00