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

5263 Commits

Author SHA1 Message Date
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 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
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
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
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 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 6f04cf032b Adapt test to change in Neo4j driver's internals 
See gh-44690
 2025-03-12 12:02:28 +00: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
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
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
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
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 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 921b704963 Merge branch '3.4.x' 2025-03-05 14:51:57 +00:00