spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity
46,343 Commits 24 Branches 394 Tags
c76329cb436a4ff2e11bd89726c6ddcfc3abbd90
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb c76329cb43 Upgrade to JUnit Jupiter 5.10.1 
Closes gh-38412
 2023-11-20 17:48:10 -08:00
Phillip Webb 67c4a989fb Upgrade to Infinispan 14.0.21.Final 
Closes gh-38411
 2023-11-20 17:48:06 -08:00
Phillip Webb 4f285b40bf Upgrade to Hazelcast 5.3.6 
Closes gh-38410
 2023-11-20 17:48:01 -08:00
Phillip Webb 593b9f7c2b Upgrade to Dropwizard Metrics 4.2.22 
Closes gh-38409
 2023-11-20 17:47:56 -08:00
Phillip Webb 5141ad568c Upgrade to DB2 JDBC 11.5.9.0 
Closes gh-38408
 2023-11-20 17:47:52 -08:00
Phillip Webb cd0894edee Upgrade to Byte Buddy 1.14.10 
Closes gh-38407
 2023-11-20 17:47:48 -08:00
Phillip Webb 3a32e4e913 Merge branch '3.1.x' 
Closes gh-38405
 2023-11-20 16:27:46 -08:00
Phillip Webb f68df82b30 Support lenient ContainerConnectionDetailsFactory hint registration 
Update `ContainerConnectionDetailsFactory` hint registration logic
so that types are optional on the classpath.

See gh-36606
Fixes gh-38392
 2023-11-20 16:26:22 -08:00
Phillip Webb 0ef87f5102 Merge branch '3.1.x' 2023-11-13 10:42:56 -08:00
Phillip Webb b902bf6aca Merge branch '3.0.x' into 3.1.x 2023-11-13 10:42:32 -08:00
Phillip Webb 09e5a2f24a Update copyright year of changed files 2023-11-13 10:42:26 -08:00
Phillip Webb 80210e93d3 Make LogCorrelationPropertySource an EnumerablePropertySource 
Change `LogCorrelationPropertySource` to an `EnumerablePropertySource`
to reduce the likelihood of `Binder` errors.

Closes gh-38349
 2023-11-13 10:40:24 -08:00
Phillip Webb ba56953ea5 Skip ValueObjectBinder if parameter names cannot be discovered 
Update `ValueObjectBinder` so that it is skipped if parameter names
cannot be discovered. This is much more likely as of Since Spring
Framework 6.1 as it no longer performs ASM parsing to discover names.

Fixes gh-38201
 2023-11-13 10:24:06 -08:00
Phillip Webb 1a487d5cad Merge branch '3.1.x' 2023-11-13 09:27:56 -08:00
Phillip Webb 211e8c004a Merge branch '3.0.x' into 3.1.x 2023-11-13 09:27:45 -08:00
Phillip Webb 2cabcbc8fa Polish adoc formatting 2023-11-13 09:27:15 -08:00
Phillip Webb e1203e7a77 Merge pull request #38274 from EvaristeGalois11 
* pr/38274:
  Add Liquibase `show-summary` and `show-summary-output` properties
  Remove Liquibase javax.activation excludes

Closes gh-38274
 2023-11-09 12:22:10 -08:00
Phillip Webb 897ba513fe Merge branch '3.1.x' 
Closes gh-38272
 2023-11-08 12:54:46 -08:00
Phillip Webb 445d0a22db Merge branch '3.0.x' into 3.1.x 
Closes gh-38271
 2023-11-08 12:54:38 -08:00
Phillip Webb 45e9804495 Merge branch '2.7.x' into 3.0.x 
Closes gh-38270
 2023-11-08 12:54:28 -08:00
Phillip Webb 61dbf45628 Fix package declaration of sample in reference docs 
Update the "Developing Your First Spring Boot Application" sample so
that the package is not removed.

Closes gh-34513
 2023-11-08 12:53:23 -08:00
Phillip Webb dbbde18d41 Attempt to fix Windows build failure due to open files 
See gh-38204
 2023-11-08 07:04:46 -08:00
Phillip Webb 690cfa220a Provide a way to create custom ApplicationContextFactory 
Update `SpringBootContextLoader` so that `getApplicationContextFactory`
is now a protected that may be overridden to provide a custom
`ApplicationContextFactory` instance.

Closes gh-38205
 2023-11-07 11:53:10 -08:00
Phillip Webb 4bc63b579a Merge branch '3.1.x' 
Closes gh-38215
 2023-11-05 13:37:02 -08:00
Phillip Webb f6910bae16 Document that PEM content can be used directly in application.yaml 
Closes gh-38210
 2023-11-05 13:36:38 -08:00
Phillip Webb 06e196c4a6 Merge branch '3.1.x' 
Closes gh-38214
 2023-11-05 13:34:21 -08:00
Phillip Webb 4aba45d9fb Merge branch '3.0.x' into 3.1.x 
Closes gh-38213
 2023-11-05 13:33:59 -08:00
Phillip Webb 7f90364c78 Merge branch '2.7.x' into 3.0.x 
Closes gh-38212
 2023-11-05 13:33:44 -08:00
Phillip Webb 06434f050a Upgrade to Spring Asciidoctor Extensions 0.6.3 
Closes gh-38211
 2023-11-05 13:33:02 -08:00
Phillip Webb f69ea372ea Merge branch '3.1.x' 2023-11-05 11:19:26 -08:00
Phillip Webb 0ea75f0f65 Polish 2023-11-05 10:53:25 -08:00
Phillip Webb c0f8b90d31 Return getLastModified result from JarUrlConnection 
Update `JarUrlConnection` and `NestedUrlConnection` so that calls
to `getLastModified()` and `getHeaderFieldDate("last-modified", 0)`
always return a result.

Fixes gh-38204
 2023-11-04 19:43:54 -07:00
Phillip Webb 9ba46f538b Polish 2023-11-02 14:24:05 -07:00
Phillip Webb cc4ef32efe Merge branch '3.1.x' 2023-11-02 14:19:12 -07:00
Phillip Webb 47c1088111 Polish 2023-11-02 14:19:07 -07:00
Phillip Webb 77218a644e Merge branch '3.1.x' 2023-11-02 14:16:37 -07:00
Phillip Webb afa4d274c2 Merge branch '3.0.x' into 3.1.x 2023-11-02 14:14:19 -07:00
Phillip Webb 8d53caa1c6 Merge branch '2.7.x' into 3.0.x 2023-11-02 14:13:47 -07:00
Phillip Webb 54313d1962 Update copyright year of changed files 2023-11-02 14:13:38 -07:00
Phillip Webb e891a3e24c Polish adoc formatting 2023-11-02 14:12:56 -07:00
Phillip Webb a35fb7505f Merge branch '3.1.x' 
Closes gh-38179
 2023-11-01 18:22:39 -07:00
Phillip Webb 683d791104 Merge branch '3.0.x' into 3.1.x 
Closes gh-38178
 2023-11-01 18:22:28 -07:00
Phillip Webb e5c8723dda Merge branch '2.7.x' into 3.0.x 
Closes gh-38177
 2023-11-01 18:22:06 -07:00
Phillip Webb eecb15d1ba Rename startDaemonAwaitThread() inside TomcatWebServer to match intent 
Closes gh-38155
 2023-11-01 18:21:36 -07:00
Phillip Webb 663243e60c Fix open telemetry container lifecycle issues 
Mark test as `@DirtiesContext` so that the context is closed before
the container.

Closes gh-38176
 2023-11-01 18:16:38 -07:00
Phillip Webb 9b71ef4114 Polish and refactor some SSL internals 
Polish and refactor some of the internal SSL code to make it easier to
add additional functionality in the future.
 2023-11-01 16:14:59 -07:00
Phillip Webb 30a7426e86 Apply key property to the keystore and not to the truststore 
Update `PropertiesSslBundle` so that key properties are now
only applied to the keystore and not the truststore.

Closes gh-38125
 2023-11-01 16:10:51 -07:00
Phillip Webb 5dc5c2a4bc Rename KeyVerifier to CertificateMatcher 
Rename `KeyVerifier` to `CertificateMatcher` and refactor some
of the internals. This commit also adds test helper classes to
help simplify some of the tests.

See gh-38173
 2023-11-01 16:10:31 -07:00
Phillip Webb 1b61bc1f20 Move PEM verification to spring-boot-autoconfigure 
Move `KeyVerifier` to spring-boot-autoconfigure to reduce the
public API required in `PemSslStoreBundle`.

This commit also moves the verify property so that is can be set
per store.

Closes gh-38173
 2023-11-01 16:10:16 -07:00
Phillip Webb 5e5d2265f5 Introduce PemSslStore as an alternative to PemSslStoreDetails. 
Add a `PemSslStore` interface that can be used as an alternative
to `PemSslStoreDetails` when PEM content has already been loaded
and parsed.

Closes gh-38175
 2023-11-01 16:06:28 -07:00
Phillip Webb 2b39ec6f60 Introduce a public PemContent class 
Update `PemContent` so that it now holds PEM data and is public.
This update is required so that in the future we can make use of
our PEM parsing code in spring-boot-autoconfigure.

Closes gh-38174
 2023-11-01 16:02:51 -07:00
Phillip Webb 2c6fca8df7 Allow alias and password to be configured on a per PEM store basis 
Closes gh-38124
 2023-11-01 16:02:33 -07:00
Phillip Webb 8bf847e549 Rename keyAlias parameter to alias 
Rename the keyAlais parameter to alias since it may be used as either
the key alias or the certificate alias.

Also clarify the javadoc for keyPassword.

Closes gh-38099
 2023-11-01 16:01:46 -07:00
Phillip Webb beb49e1933 Add tests for DataBlockInputStream and fix implementation oddities 
Fix issues with `DataBlockInputStream` including the fact that remain
bytes were not tracked correctly. Also add some tests and fix a few
other unusual details with the implementation.

Closes gh-38066
 2023-10-26 23:00:20 -07:00
Phillip Webb 4af9ed4d1d Fix Tomcat TldScanner issues by returning raw zip data for nested jars 
Update JarUrlConnection so that the full raw zip data is returned from
nested jars when no entry name is specified. This update allows
Tomcat's `WarURLConnection` to work with our nested connections since
they can parse the returned raw zip data.

Fixes gh-38047
 2023-10-26 23:00:20 -07:00
Phillip Webb bba323ba5f Copy zip data descriptor records when creating virtual zip data 
The zip specification states that when 'bit 3' of the general purpose
flags is set then a data descriptor record must be present. Prior to
this commit, our `VirtualZipDataBlock` ignored such records and would
create invalid data.

Although the generated data would work for zip parsers that read the
central directory records, it causes problems with streaming reader
implementations such as `JarInputStream`.

This commit updates the code so that it now copies the data descriptor
records. It support both blocks that have a signature and those that
don't. It also updates the generation logic to correctly deal with
any extra data bytes present after the local file header record.

Fixes gh-38063
 2023-10-26 23:00:20 -07:00
Phillip Webb b35c4d6497 Open loader jar URLs by default using runtimeVersion 
Update `UrlJarFileFactory` so that `runtimeVersion` is used by default
instead of `baseVersion`. Prior to this commit we tried to mirror the
JDK handler on look for a `#runtime` fragment. This unfortunately
doesn't work with the URLs produced by `URLClassPath`.

This commit also fixes a bug in `NestedJarFile` where we didn't return
the correct result from `hasEntry`.

Fixes gh-38050
 2023-10-25 21:20:42 -07:00
Phillip Webb 464523ac04 Merge branch '3.1.x' 
Closes gh-38048
 2023-10-25 12:37:41 -07:00
Phillip Webb 6e65d9380b Add missing @ServiceConnection annotation to reference doc sample 
Closes gh-38046
 2023-10-25 12:36:59 -07:00
Phillip Webb 0c66db7b18 Refine container initialization and parallel startup logic 
Update `TestcontainersLifecycleBeanPostProcessor` to restore early
container initialization logic and refine startup logic. Initial bean
access now again triggers the creation all container beans. In addition
the first access of a `Startable` bean now attempts to find and start
all other `Startable` beans.

Fixes gh-37989
 2023-10-25 11:58:22 -07:00
Phillip Webb 4e7c0737d4 Fix PropertiesLauncher classpath detection without 'loader.path' set 
Update `PropertiesLauncher` to restore classpath detection logic applied
when no `loader.path` property is set.

Fixes gh-37992
 2023-10-24 17:03:18 -07:00
Phillip Webb 7bd9989614 Fix merge conflict errors 
See gh-37999
 2023-10-23 19:40:44 -07:00
Phillip Webb 2ac69160c7 Revert "Allow PemPrivateKeyParser to parse multiple keys" 
This reverts commit 32e6ce210e.

Closes gh-37999
 2023-10-23 18:32:12 -07:00
Phillip Webb e1bd24695d Try @AssertFileChannelDataBlocksClosed for Windows fix 
This updates commit dad5dc6750 to
see if @AssertFileChannelDataBlocksClosed will take care of
closing files.

See gh-7161
 2023-10-20 10:05:43 -07:00
Phillip Webb 3eeb1b2849 Merge branch '3.1.x' 2023-10-19 23:21:42 -07:00
Phillip Webb 9f3afb3636 Merge branch '3.0.x' into 3.1.x 2023-10-19 23:21:20 -07:00
Phillip Webb 7c864804d5 Merge branch '2.7.x' into 3.0.x 2023-10-19 23:21:08 -07:00
Phillip Webb d47f8bf945 Update copyright year of changed files 2023-10-19 23:20:43 -07:00
Phillip Webb 25ce0ef3fc Refine PemContent and PEM parsers 2023-10-19 23:19:45 -07:00
Phillip Webb 41724fc5f1 Merge branch '3.1.x' 2023-10-19 22:06:53 -07:00
Phillip Webb 1dc3ea957b Merge branch '3.0.x' into 3.1.x 2023-10-19 22:06:49 -07:00
Phillip Webb 5ab4e0d153 Merge branch '2.7.x' into 3.0.x 2023-10-19 22:06:42 -07:00
Phillip Webb 548b0ea91f Fix failing exception assertion 
See gh-37964
 2023-10-19 22:05:59 -07:00
Phillip Webb 32e6ce210e Allow PemPrivateKeyParser to parse multiple keys 
Update `PemPrivateKeyParser` so that it can parse multiple keys in a
single PEM file.

Closes gh-37970
 2023-10-19 22:01:23 -07:00
Phillip Webb deb79425ee Polish 2023-10-19 21:47:13 -07:00
Phillip Webb d638bbb0ba Merge branch '3.1.x' 
Closes gh-37967
 2023-10-19 21:25:44 -07:00
Phillip Webb 1d456e09d2 Merge branch '3.0.x' into 3.1.x 
Closes gh-37966
 2023-10-19 21:12:52 -07:00
Phillip Webb a0b999c8b4 Merge branch '2.7.x' into 3.0.x 
Closes gh-37965
 2023-10-19 20:55:51 -07:00
Phillip Webb abdad1cabe Constently use assertThatExceptionOf... assertions 
Closes gh-37964
 2023-10-19 20:17:26 -07:00
Phillip Webb 343046d30c Polish 2023-10-19 10:55:26 +01:00
Phillip Webb fcb75b6a1e Search implemented interfaces on superclass for @ServiceConnection 
Refine original fix to also search interfaces on the superclass.

Fixes gh-37671
 2023-10-19 10:52:19 +01:00
Phillip Webb b8365e3118 Fix misconfigured Maven test 
See gh-37669
 2023-10-18 22:58:45 -07:00
Phillip Webb a8ad8ca9f7 Upgrade to Java 21.0.1+12 
Closes gh-37945
 2023-10-18 21:20:42 -07:00
Phillip Webb a354c236bb Upgrade to Java 17.0.9+11 
See gh-37944
 2023-10-18 21:20:24 -07:00
Phillip Webb 062b544447 Upgrade to Ubuntu Jammy 20231004 
Closes gh-37957
 2023-10-18 21:19:51 -07:00
Phillip Webb 5c6c0879fc Merge branch '3.1.x' 2023-10-18 21:19:11 -07:00
Phillip Webb dd821c719f Upgrade to Java 21.0.1+12 
Closes gh-37956
 2023-10-18 21:18:32 -07:00
Phillip Webb 6a51ef8adc Upgrade to Java 17.0.9+11 
See gh-37955
 2023-10-18 21:18:04 -07:00
Phillip Webb 55968ef995 Upgrade to Ubuntu Jammy 20231004 
Closes gh-37949
 2023-10-18 21:17:24 -07:00
Phillip Webb 7d71d60c14 Merge branch '3.0.x' into 3.1.x 2023-10-18 21:17:00 -07:00
Phillip Webb e778355bd7 Upgrade to Java 21.0.1+12 
Closes gh-37953
 2023-10-18 21:15:45 -07:00
Phillip Webb 53d04973e4 Upgrade to Java 17.0.9+11 
See gh-37951
 2023-10-18 21:14:54 -07:00
Phillip Webb 812023a84b Upgrade to Ubuntu Jammy 20231004 
Closes gh-37952
 2023-10-18 21:13:42 -07:00
Phillip Webb bc8a631aaf Merge branch '2.7.x' into 3.0.x 2023-10-18 21:12:13 -07:00
Phillip Webb c7d6fbcb3a Upgrade to Ubuntu Jammy 20231004 
See gh-37954
 2023-10-18 21:10:00 -07:00
Phillip Webb 39ffa50dc4 Merge branch '3.1.x' 2023-10-18 21:05:26 -07:00
Phillip Webb a28fb1b6f5 Merge branch '3.0.x' into 3.1.x 2023-10-18 21:05:18 -07:00
Phillip Webb b5fbcfdce2 Merge branch '2.7.x' into 3.0.x 2023-10-18 21:04:30 -07:00
Phillip Webb b226ff40f0 Upgrade to Java 21.0.1+12 
Closes gh-37948
 2023-10-18 21:03:47 -07:00
Phillip Webb d226ba88d9 Upgrade to Java 17.0.9+11 
Closes gh-37947
 2023-10-18 21:02:55 -07:00