Moritz Halbritter
82f0684cd8
Merge branch '3.1.x'
...
Closes gh-38354
2023-11-14 17:04:41 +01:00
Moritz Halbritter
22a991b334
Document tags format used in Gradle and Maven plugins
...
Closes gh-33088
2023-11-14 17:03:50 +01: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
Moritz Halbritter
b9a5bdc294
Merge branch '3.1.x'
...
Closes gh-38249
2023-11-07 11:28:52 +01:00
Moritz Halbritter
e549380a59
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38248
2023-11-07 11:28:20 +01:00
Moritz Halbritter
3664877d80
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38247
2023-11-07 11:24:16 +01:00
Andy Wilkinson
08a4a836aa
Merge branch '3.1.x'
...
Closes gh-38233
2023-11-06 14:26:09 +00:00
Andy Wilkinson
b01235e68d
Copy attributes from runtimeClasspath to productionRuntimeClasspath
...
Fixes gh-38209
2023-11-06 11:50:27 +00: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
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
e891a3e24c
Polish adoc formatting
2023-11-02 14:12:56 -07:00
Andy Wilkinson
890a3e72ac
Repair file channel when it's closed by interruption
...
When an interrupted that calls FileChannel.read, the channel is
closed and the read fails with a ClosedByInterruptException. The
closure of the channel makes it unusable by other threads. To
allow other threads to read from the data block, this commit
recreates the FileChannel when a read fails on an interrupted
thread with a ClosedByInterruptException. The exception is then
rethrown to continue the thread's interruption.
Closes gh-38154
2023-11-01 17:12:43 +00:00
Andy Wilkinson
173e6543fd
Merge branch '3.1.x'
...
Closes gh-38168
2023-11-01 15:06:20 +00:00
Andy Wilkinson
40ce6182a1
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38167
2023-11-01 15:03:29 +00:00
Andy Wilkinson
b7f00c1087
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38166
2023-11-01 15:02:54 +00:00
Moritz Halbritter
20edbb402f
Merge branch '3.1.x'
2023-10-31 10:23:13 +01:00
Moritz Halbritter
607ed86edb
Merge branch '3.0.x' into 3.1.x
2023-10-31 10:23:01 +01:00
Moritz Halbritter
f3c10ae97b
Polish JsonStream
2023-10-31 09:49:01 +01:00
Andy Wilkinson
94e810201e
Fix test for incremental build of renamed properties class
...
Previously, the .class file for the renamed properties class was
on the class path of the compilation in two places:
1. The output directory of the test's previous compilation
2. The output directory of the compilation of src/test/java of
spring-boot-configuration-processor
The first of these locations is addressed by updating TestProject.
The .class file is now deleted from the project's output location
at the same time as the .java file is deleted from its source
location.
The second of these locations is addressed by configuring the class
path of the compiler to include a copy of the result of compiling
src/test/java of spring-boot-configuration-processor. From this copy
entries can then be deleted as needed without destabilizing other tests.
Closes gh-26271
2023-10-30 15:17:28 +00:00
Moritz Halbritter
f66c76e2a8
Merge branch '3.1.x'
...
Closes gh-38078
2023-10-27 13:47:23 +02:00
Moritz Halbritter
5ca7201fa5
Fix "Integrating with Actuator" code snippet
...
Closes gh-36114
2023-10-27 13:47:02 +02:00
Moritz Halbritter
35aa28485a
Merge branch '3.1.x'
...
Closes gh-38069
2023-10-27 09:50:57 +02:00
Moritz Halbritter
8bb2228adf
Document how to unset maven.compiler.release
...
Closes gh-37993
2023-10-27 09:50:12 +02: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
Andy Wilkinson
b167eb3b02
Merge branch '3.1.x'
2023-10-25 14:50:30 +01:00
Andy Wilkinson
4dea11ef96
Merge branch '3.0.x' into 3.1.x
2023-10-25 14:50:21 +01:00
Andy Wilkinson
ead0c77a5b
Polish
...
See gh-38030
2023-10-25 14:50:07 +01:00
Andy Wilkinson
0d1a223fee
Merge branch '3.1.x'
...
Closes gh-38032
2023-10-25 14:08:22 +01:00
Andy Wilkinson
649117de35
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38031
2023-10-25 14:08:10 +01:00
Andy Wilkinson
331bf51332
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38030
2023-10-25 14:07:57 +01:00
Andy Wilkinson
666f68ea60
Document configuration for building images with Colima
...
Closes gh-34522
2023-10-25 14:07:43 +01: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
Johnny Lim
b5d4983829
Polish
...
See gh-37984
2023-10-23 11:15:27 +02: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
Andy Wilkinson
d13d38a141
Trim multiple leading slashes in NestedLocation
...
See gh-37668
2023-10-20 11:55:35 +01:00
Andy Wilkinson
88bf3dfba2
Close byte channel created by newByteChannelReturnsByteChannel
...
See gh-7161
2023-10-20 11:22:16 +01:00
Andy Wilkinson
dad5dc6750
Try to fix NestedFileSystemProviderTests on Windows
...
See gh-7161
2023-10-20 10:56:08 +01:00
Andy Wilkinson
4161eb1853
Fix path handling in NestedLocation on Windows
...
See 4b495ca
See gh-37668
2023-10-20 09:15:54 +01:00
Phillip Webb
3eeb1b2849
Merge branch '3.1.x'
2023-10-19 23:21:42 -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
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
b8365e3118
Fix misconfigured Maven test
...
See gh-37669
2023-10-18 22:58:45 -07:00
Phillip Webb
3c62defb9d
Support java.nio.file Paths and FileSystems with nested jars
...
Add a `NestedFileSystemProvider` implementation so that the JDK's
`ZipFileSystem` can load content from nested jars and nested
directory entries.
Creating a `ZipFileSystem` may be a relatively expensive operation as
zip structures need to be parsed and in the case of directory entries
a virtual datablock nees to be generated on the fly. As such, we
install the `ZipFileSystem` as late as possible since in a typical
application it may never be needed.
This commit also tweaks Gradle and Maven plugins to ensure that the
service loader file is written to repackaged jars.
Closes gh-7161
2023-10-18 20:46:36 -07:00
Phillip Webb
4b495ca2a9
Change NestedLocation
to hold a Path
rather than a File
...
Refactor `NestedLocation` so that it holds a `Path` rather than a
`File`.
See gh-37668
2023-10-18 20:46:35 -07:00
Andy Wilkinson
1559485f56
Fix Gradle plugin test classpath after Kotlin upgrade
...
See gh-37926
2023-10-18 14:07:49 +01:00
Phillip Webb
33c5e1269a
Write signature files to uber jars to for Oracle Java 17 verification
...
Update Gradle and Maven plugins to write an empty `META-INF/BOOT.SF`
file whenever there is a nested signed jar.
This update allows Oracle Java 17 to correctly verify the nested JARs.
The file is required because `JarVerifier` has code roughly equivalent
to:
if (!jarManifestNameChecked && SharedSecrets
.getJavaUtilZipFileAccess().getManifestName(jf, true) == null) {
throw new JarException("The JCE Provider " + jarURL.toString() +
" is not signed.");
}
The `SharedSecrets.getJavaUtilZipFileAccess().getManifestName(jf, true)`
call ends up in `ZipFile.getManifestName(onlyIfSignatureRelatedFiles)`
which is a private method that we cannot override in our `NestedJarFile`
subclass. By writing an empty `.SF` file we ensure that the `Manifest`
is always returned because there are always "signature related files".
Fixes gh-28837
2023-10-16 16:19:16 -07:00
Andy Wilkinson
d6a9295c26
Allow additional build info properties to have provided values
...
Closes gh-37889
2023-10-16 18:15:42 +01:00
Andy Wilkinson
084bd3a420
Merge branch '3.1.x'
2023-10-13 21:38:06 +01:00
Andy Wilkinson
ccaa54436b
Merge branch '3.0.x' into 3.1.x
2023-10-13 21:37:56 +01:00
Andy Wilkinson
b1eb08faba
Merge branch '2.7.x' into 3.0.x
2023-10-13 21:37:44 +01:00
Andy Wilkinson
3dba0d76d2
Polish
...
See gh-37878
2023-10-13 21:17:12 +01:00
Andy Wilkinson
2231244d2c
Merge branch '3.1.x'
2023-10-13 20:42:15 +01:00
Andy Wilkinson
e957c3087c
Merge branch '3.0.x' into 3.1.x
2023-10-13 20:36:51 +01:00
Andy Wilkinson
c25e532aeb
Merge branch '2.7.x' into 3.0.x
2023-10-13 20:36:32 +01:00
Andy Wilkinson
dbc06faed8
Polish
...
See gh-37878
2023-10-13 20:36:16 +01:00
Andy Wilkinson
60f05eaa94
Merge branch '3.1.x'
...
Closes gh-37882
2023-10-13 16:01:47 +01:00
Andy Wilkinson
5af13d191f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37881
2023-10-13 16:01:32 +01:00
Andy Wilkinson
ae2693b7f1
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37880
2023-10-13 16:01:14 +01:00
Andy Wilkinson
42ee6b9e74
Use new permissions API with Gradle 8.3+
...
Closes gh-37878
2023-10-13 16:00:54 +01:00
Johnny Lim
446677375e
Polish gh-35082
...
See gh-37831
2023-10-12 14:17:02 +02:00
Andy Wilkinson
bdaf7a7603
Merge branch '3.1.x'
...
Closes gh-37830
2023-10-11 15:06:09 +01:00
Andy Wilkinson
411586347c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37829
2023-10-11 15:04:21 +01:00
Andy Wilkinson
781ac2ece2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37828
2023-10-11 15:02:36 +01:00
Andy Wilkinson
5a75fae23b
Polish "Polish"
...
See gh-37745
2023-10-11 14:58:04 +01:00
Johnny Lim
303015ea2d
Polish
...
See gh-37745
2023-10-11 14:57:38 +01:00
Andy Wilkinson
d0486ef43f
Merge branch '3.1.x'
...
Closes gh-37827
2023-10-11 14:47:35 +01:00
Andy Wilkinson
40461488db
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37826
2023-10-11 14:47:23 +01:00
Andy Wilkinson
a80f8ea5e6
Configure Java toolchain on AOT-processing tasks
...
Closes gh-37717
2023-10-11 14:31:44 +01:00
Andy Wilkinson
b9a0159b97
Merge branch '3.1.x'
...
Closes gh-37825
2023-10-11 13:54:39 +01:00
Andy Wilkinson
ac1f7ccc33
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37824
2023-10-11 13:54:25 +01:00
Andy Wilkinson
5a6cd77c56
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37823
2023-10-11 13:54:11 +01:00
Andy Wilkinson
5a1abb76f7
Test the Gradle plugin against Gradle 8.4
...
Closes gh-37811
2023-10-11 13:52:03 +01:00
Phillip Webb
9e4f160c17
Attempt to fix NestedJarFile file lock issues on Windows
...
Update `DefaultCleanerTracking` and `@AssertFileChannelDataBlocksClosed`
to capture and store the source object if it is a `Cleanable` so that
it can be released later.
Although the real cleaner cannot keep a reference to `obj`, it is safe
for us to do so in tests since we are in control of the object lifecycle
and we don't need it to be garbage collected.
This commit also updates the `UrlJarFile` to call the cleaner so that
it can be tracked.
See gh-37668
2023-10-06 23:44:55 -07:00
Phillip Webb
5da31aca46
Attempt to fix NestedJarFile file lock issues on Windows
...
Update `NestedJarFile.close()` to call `super.close()` so that the outer
jar file is closed and files can hopefully be deleted on Windows.
See gh-37668
2023-10-06 21:47:55 -07:00
Phillip Webb
1f5472387d
Fix formatting
2023-10-03 20:41:48 -07:00
Phillip Webb
42f50fa292
Attempt to fix CI failures
...
Attempt to fix CI failures caused by timezone differences and different
JDK versions.
See gh-37668
2023-10-03 20:29:33 -07:00
Phillip Webb
7ad4a9817d
Rewrite nested jar support code and remove Java 8 support
...
Rewrite nested jar code to better align with the implementations
provided in Java 17. This update makes two fundamental changes to
the previous implementation:
- Resource cleanup is now handled using the `java.lang.ref.Cleaner`
- Jar URLs now use the form `jar:nested:/my.jar/!nested.jar!/entry`
Unlike the previous `jar🫙 /my,jar!/nested.jar!/entry` URL format,
the new format is compatible with Java's default Jar URL handler.
Specifically, it now only uses a single `jar:` prefix and it no longer
includes multiple `!/` separators.
In addition to the changes above, many of the ancillary classes have
also been refactored and updated to create cleaner APIs.
Closes gh-37668
2023-10-03 17:27:57 -07:00
Phillip Webb
75ddb9fa47
Fix test failure caused by PropertiesLoader class reference
...
See gh-37667
2023-10-03 17:27:39 -07:00
Phillip Webb
55b5610dd9
Add Maven and Gradle option for the loader implementation to use
...
Add properties to the Maven and Gradle plugins so that users can
switch between the two loader modules.
See gh-37669
2023-10-03 15:40:42 -07:00
Phillip Webb
a89057b7c7
Reintroduce spring-boot-loader modules
...
Restore the `spring-boot-loader` with the previous loader code so
that we can develop it further.
See gh-37669
2023-10-03 15:40:25 -07:00
Phillip Webb
aeb6537f57
Rename spring-boot-loader to spring-boot-loader-classic
...
Rename the `spring-boot-loader` module to `spring-boot-loader-classic`
so that we can introduce an alternative loader implementation.
See gh-37669
2023-10-03 15:40:04 -07:00
Phillip Webb
c22548982a
Relocate launcher classes
...
Create alternative launcher classes under the package
`org.springframework.boot.loader.launch` and use them in favor
of the previous location.
This update is designed to improve compatibility with future
changes in the loader.
Closes gh-37667
2023-10-03 14:53:04 -07:00
Scott Frederick
f947bad3f7
Merge branch '3.1.x'
...
Closes gh-37666
2023-10-03 13:18:32 -05:00
Ivo Smid
f2a4336ea1
Increase the socket timeout for remote connections to Docker daemon
...
The default socket timeout with HttpClient 5 is not long enough
in some cases where Docker images are built that require the
GraalVM native image compiler to run in a buildpack. This commit
increases the timeout to 30 minutes.
Fixes gh-37665
Co-authored-by: Scott Frederick <sfrederick@vmware.com>"
2023-10-03 11:52:48 -05:00
Andy Wilkinson
7d40a45b50
Merge branch '3.1.x'
...
Closes gh-37662
2023-10-03 11:21:29 +01:00
Andy Wilkinson
a4100e12ff
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37661
2023-10-03 11:05:51 +01:00
Andy Wilkinson
931584f8af
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37659
2023-10-03 10:28:51 +01:00
Phillip Webb
3d6859e80f
Use the term "uber jar" in reference documentation and javadoc
...
Update reference documentation and javadoc to use the term "uber jar"
rather than "fat jar".
Closes gh-37653
2023-10-02 23:01:34 -07:00
Scott Frederick
619a0f3b35
Merge branch '3.1.x'
...
Closes gh-37624
2023-09-28 16:32:45 -05:00
JinseongHwang
0b703f9007
Use consistent capitalization in MySQL and MariaDB test names
...
See gh-37497
2023-09-28 16:28:32 -05:00
Andy Wilkinson
bebca55a8f
Add testAndDevelopmentOnly configuration
...
Closes gh-35436
2023-09-28 13:24:34 +01:00
Phillip Webb
052757c2d8
Polish
2023-09-27 20:58:09 -07:00
Scott Frederick
3cf08e1351
Clarify default security options for image building
...
See gh-37479
2023-09-27 11:05:40 -05:00
Scott Frederick
9811cc030f
Fix LifecycleTests for security options on Windows
...
Fixes gh-37598
2023-09-27 10:09:44 -05:00
Scott Frederick
7c23c0b3c2
Merge branch '3.1.x'
2023-09-26 18:51:03 -05:00
Scott Frederick
5ae4ba83a7
Merge branch '3.0.x' into 3.1.x
2023-09-26 18:19:48 -05:00
Scott Frederick
7e29a3c70b
Use latest available Gradle version for Paketo system tests
...
This ensures that the tests will run with the latest Java versions.
See gh-37507
2023-09-26 18:19:25 -05:00
Scott Frederick
d37e9424a2
Merge branch '3.1.x'
...
Closes gh-37589
2023-09-26 14:07:16 -05:00
Scott Frederick
4f8684fd69
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37588
2023-09-26 14:07:05 -05:00
Scott Frederick
a03e3320a6
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37587
2023-09-26 14:06:50 -05:00
Scott Frederick
aeeb5cf1f8
Apply Gradle fileMode and dirMode consistently in jar and war archives
...
Fixes gh-37496
2023-09-26 13:49:19 -05:00
Scott Frederick
c45ad6ce83
Use actual Java version in build image integration tests
...
See gh-37453
2023-09-22 13:38:37 -05:00
Scott Frederick
e80f743648
Merge branch '3.1.x'
...
Closes gh-37551
2023-09-22 11:37:00 -05:00
Scott Frederick
3803bd9af9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37550
2023-09-22 11:32:28 -05:00
Scott Frederick
7322c078c4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37549
2023-09-22 11:32:07 -05:00
Scott Frederick
98bfaf0412
Remove compatibility blocks from Gradle plugin integration tests
...
Closes gh-37453
2023-09-22 11:28:12 -05:00
Andy Wilkinson
fb15125d01
Merge branch '3.1.x'
...
Closes gh-37548
2023-09-22 16:30:36 +01:00
Andy Wilkinson
8080bb9cfb
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37547
2023-09-22 16:30:19 +01:00
Johnny Lim
ce813346c9
Add Javadoc since for AbstractAotMojo.getSession()
...
See gh-37462
2023-09-22 16:29:49 +01:00
Andy Wilkinson
af495b2dc0
Merge branch '3.1.x'
...
Closes gh-37546
2023-09-22 16:26:48 +01:00
Andy Wilkinson
e4d8b22403
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37545
2023-09-22 16:26:31 +01:00
Andy Wilkinson
333820627f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37544
2023-09-22 16:26:21 +01:00
Eric Haag
a2be276dd8
Mock working directory for extract test
...
Prior to this change, this test would create files in the project
directory. This can cause issues with Gradle caching and up-to-date
checks.
To address this, the value of the working directory is mocked to a
temporary directory like all the other tests.
See gh-37395
2023-09-22 16:24:49 +01:00
Andy Wilkinson
7bb40d50d4
Polish
2023-09-22 16:06:44 +01:00
Andy Wilkinson
1b6f29a1da
Merge branch '3.1.x'
...
Closes gh-37540
2023-09-22 15:51:49 +01:00
Andy Wilkinson
e3c3cb4b47
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37539
2023-09-22 15:50:28 +01:00
Andy Wilkinson
18b7015552
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37538
2023-09-22 15:35:45 +01:00
Andy Wilkinson
89a86e91f5
Avoid deprecation warning with Gradle 8.4-rc-1
...
Closes gh-37493
2023-09-22 15:31:36 +01:00
Moritz Halbritter
ec9ac05d3d
Merge branch '3.1.x'
...
Closes gh-37536
2023-09-22 11:21:53 +02:00
Moritz Halbritter
059bb69705
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37535
2023-09-22 11:21:37 +02:00
Moritz Halbritter
c991a7b90b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37534
2023-09-22 11:21:25 +02:00
Moritz Halbritter
a3611ae9f3
Polish "Use the Maven Archiver implementation for parsing outputTimestamp"
...
See gh-37438
2023-09-22 11:13:10 +02:00
Niels Basjes
a1b08e1819
Use the Maven Archiver implementation for parsing outputTimestamp
...
See gh-37438
2023-09-22 11:12:48 +02:00
Phillip Webb
2075f6c685
Merge branch '3.1.x'
2023-09-20 17:16:13 -07:00
Phillip Webb
78eb8f90d1
Merge branch '3.0.x' into 3.1.x
2023-09-20 17:12:27 -07:00
Phillip Webb
9b5062e5bb
Merge branch '2.7.x' into 3.0.x
2023-09-20 17:06:55 -07:00
Phillip Webb
e10ac76761
Polish
2023-09-20 16:05:30 -07:00
Scott Frederick
7de770f6a1
Add support for security options in CNB builder container config
...
Closes gh-37479
2023-09-20 13:43:36 -05:00
Scott Frederick
4433fcd1f2
Add support for build workspace option when building images
...
Closes gh-37478
2023-09-20 13:43:35 -05:00
Moritz Halbritter
ec87e65c8f
Merge branch '3.1.x'
...
Closes gh-37461
2023-09-19 16:02:17 +02:00
Moritz Halbritter
ea57988e2f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37460
2023-09-19 16:02:07 +02:00
Moritz Halbritter
2b4afe974a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37459
2023-09-19 16:01:55 +02:00
Moritz Halbritter
6805a3393b
Close file handle on exceptions during connect
...
Closes gh-32423
2023-09-19 15:17:14 +02:00
Moritz Halbritter
f93a497cc6
Merge branch '3.1.x'
...
Closes gh-37423
2023-09-15 15:18:46 +02:00
Moritz Halbritter
ed4b6aaa7b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37422
2023-09-15 15:18:08 +02:00
Moritz Halbritter
5be826dd4a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37413
2023-09-15 14:47:57 +02:00
Moritz Halbritter
408fb8ae9d
Add support for EdDSA, XDH and RSA-PSS key parsing
...
This works with Java 17 and up. Also refactor the test for more
structure.
Closes gh-37237
2023-09-15 14:15:02 +02:00
Andy Wilkinson
8599f8ecfc
Merge branch '3.1.x'
...
Closes gh-37409
2023-09-15 11:18:16 +01:00
Andy Wilkinson
ee6d558060
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37408
2023-09-15 11:18:06 +01:00
Andy Wilkinson
24e3a124d9
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37407
2023-09-15 11:17:56 +01:00
Andy Wilkinson
ee78e45ea7
Polish "Polish Javadoc for DockerImageNames.rabbit()"
...
See gh-37394
2023-09-15 11:17:15 +01:00
Johnny Lim
fbfd6816c2
Polish Javadoc for DockerImageNames.rabbit()
...
See gh-37394
2023-09-15 11:16:06 +01:00
Andy Wilkinson
a0435920ce
Merge branch '3.1.x'
...
Closes gh-37406
2023-09-15 11:15:03 +01:00
Andy Wilkinson
5910b3c0d6
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37405
2023-09-15 11:08:40 +01:00
Andy Wilkinson
0af008960f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37404
2023-09-15 11:05:24 +01:00
Andy Wilkinson
e1f6fb5a61
Remove @since
from spring-boot-test-support's javadoc
...
Closes gh-37403
2023-09-15 10:54:41 +01:00
Andy Wilkinson
44bc47d96d
Merge branch '3.1.x'
...
Closes gh-37381
2023-09-14 11:03:25 +01:00
Andy Wilkinson
dfb95329fd
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37380
2023-09-14 11:03:08 +01:00
Andy Wilkinson
a795065555
Polish "Lazily query attributes when copying from base configuration"
...
See gh-37343
2023-09-14 10:32:05 +01:00
Fouad Almalki
7edc9ebc28
Lazily query attributes when copying from base configuration
...
See gh-37343
2023-09-14 10:30:11 +01:00
Eddú Meléndez
6997277f75
Add service connection from OpenTelemetry Collector
...
See gh-35082
2023-09-14 09:44:20 +02:00
Scott Frederick
a9f26e0f95
Conditionally enable image building bind cache tests
...
Accessing bind mount directories as is done in the tests for building
images with bind mount caches requires Docker configuration when
using Docker Desktop. It works without configuration on Linux with
Docker Engine.
See gh-28387
2023-09-12 17:00:59 -05:00
Andy Wilkinson
ed5d16de84
Upgrade to Jetty 12
...
Closes gh-36073
2023-09-07 13:59:15 +01:00
Chris Bono
6e7b845bdf
Add support for Apache Pulsar
...
Add support for Apache Pulsar using the Spring for Apache Pulsar
project.
See gh-34763
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-09-05 17:01:51 -07:00
Andy Wilkinson
db02f89f03
Merge branch '3.1.x'
...
Closes gh-37184
2023-09-04 08:26:04 +01:00
Andy Wilkinson
c562e8e01f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37183
2023-09-04 08:25:46 +01:00
Andy Wilkinson
d6b04af512
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37182
2023-09-04 08:25:33 +01:00
Andy Wilkinson
fadc58679d
Speed up ImageReference.of when path contains upper-case chars
...
Closes gh-35657
2023-09-04 08:18:28 +01:00
Andy Wilkinson
f45a32d911
Merge branch '3.1.x'
...
Closes gh-37175
2023-09-01 14:18:23 +01:00
Andy Wilkinson
a84ee2fb12
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37174
2023-09-01 14:17:59 +01:00
Andy Wilkinson
3ab1dfb9dc
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37173
2023-09-01 14:17:40 +01:00
Andy Wilkinson
a77863245d
Polish "Use project.getLayout().getBuildDirectory() instead of getBuildDir()"
...
See gh-37167
2023-09-01 14:15:33 +01:00
Yanming Zhou
a8706962d4
Use project.getLayout().getBuildDirectory() instead of getBuildDir()
...
See gh-37167
2023-09-01 14:08:16 +01:00
Phillip Webb
b1547d0139
Merge branch '3.1.x'
...
Closes gh-37171
2023-08-31 22:38:29 -07:00
Phillip Webb
37e67058b7
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37169
2023-08-31 22:24:14 -07:00
Phillip Webb
71ed31343c
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37168
2023-08-31 22:01:06 -07:00
Phillip Webb
fd8cb74b46
Load algorithm parameters from PEM encoded 'EC PRIVATE KEY' files
...
Update `PrivateKeyParser` implementations so that algorithm parameters
for PEM encoded 'EC PRIVATE KEY' files are loaded from the incoming
data.
Prior to this commit, the algorithm parameter was hard-coded to
'secp384r1' which could result in a mismatch to the actual file
content.
Fixes gh-34232
2023-08-31 21:40:11 -07:00
Phillip Webb
3640491d5a
Fix Timezone used for now in BuildRequestTests
2023-08-30 20:34:01 -07:00
Phillip Webb
c142051320
Merge branch '3.1.x'
2023-08-30 20:33:32 -07:00
Phillip Webb
f8f4a2b986
Fix Timezone used for now in BuildRequestTests
2023-08-30 20:33:17 -07:00
Scott Frederick
1c03ed3184
Merge branch '3.1.x'
...
Closes gh-37052
2023-08-21 16:41:11 -05:00
Scott Frederick
ef40d9ebe2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37051
2023-08-21 16:40:55 -05:00
Scott Frederick
0b197650a9
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37050
2023-08-21 16:40:43 -05:00
Scott Frederick
d5cfe4d475
Remove invalid caches parameter entry from Maven plugin docs
...
Fixes gh-37048
2023-08-21 16:40:18 -05:00
Scott Frederick
c17ecf0f0b
Add support for caching to bind mounts when building images
...
When building an image using the Maven `spring-boot:build-image` goal or
the Gradle `bootBuildImage` task, the build and launch caches can be
configured to use a bind mount as an alternative to using a named
volume.
Closes gh-28387
2023-08-21 15:04:39 -05:00
Stephane Nicoll
fc35975fcc
Merge branch '3.1.x'
...
Closes gh-37028
2023-08-18 14:33:46 +02:00
Stephane Nicoll
d9cc6e810f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37027
2023-08-18 14:31:51 +02:00
Stephane Nicoll
1f6d0600b5
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37026
2023-08-18 14:15:48 +02:00
Stephane Nicoll
6efd9ed0b0
Test Gradle plugin against Gradle 8.3
...
Closes gh-37025
2023-08-18 14:05:50 +02:00
Scott Frederick
eb45aab712
Upgrade default CNB builders to Paketo Jammy
...
Closes gh-36689
2023-08-14 13:29:42 -05:00
Stephane Nicoll
b0ac3a7835
Merge branch '3.1.x'
...
Closes gh-36973
2023-08-14 16:13:07 +02:00
Stephane Nicoll
5f2432aca2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36972
2023-08-14 16:12:55 +02:00
Stephane Nicoll
0271efae4c
Polish "Avoid setting null compiler option"
...
See gh-36971
2023-08-14 16:07:25 +02:00
omaryaya
a0ad00c542
Avoid setting null compiler option
...
See gh-36971
2023-08-14 16:06:34 +02:00
Stephane Nicoll
70ea830277
Merge branch '3.1.x'
...
Closes gh-36967
2023-08-14 15:14:59 +02:00
Stephane Nicoll
0cf21b21ca
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36966
2023-08-14 15:14:49 +02:00
normandra
62902a798d
Fix typo
...
See gh-36964
2023-08-14 15:01:39 +02:00
Stephane Nicoll
e073d14950
Merge branch '3.1.x'
...
Closes gh-36960
2023-08-14 11:37:14 +02:00
Stephane Nicoll
b903df7327
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36959
2023-08-14 11:37:07 +02:00
Stephane Nicoll
3ae65e073c
Use Aether to download JUnit platform launcher
...
This commit updates our maven plugin to use aether directly, rather than
the now deprecated maven features.
Closes gh-36724
2023-08-14 11:23:43 +02:00
Phillip Webb
8edec21a6f
Update copyright year of changed files
2023-08-13 20:44:44 -07:00