Phillip Webb
f8a1dae835
Merge branch '3.2.x'
2024-02-21 15:27:57 -08:00
Phillip Webb
12de6aa46a
Merge branch '3.1.x' into 3.2.x
2024-02-21 15:27:27 -08:00
Phillip Webb
2c4909a89a
Update copyright year of changed files
2024-02-21 13:58:53 -08:00
Scott Frederick
bb384f268e
Merge branch '3.2.x'
...
Closes gh-39639
2024-02-20 10:34:54 -06:00
Scott Frederick
71e5e1252a
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39638
2024-02-20 10:34:32 -06:00
Scott Frederick
c93acdafbd
Polish "Prevent long parse times for images with illegal char in tag"
...
See gh-39617
2024-02-20 10:27:28 -06:00
Jakob Wanger
c892544741
Prevent long parse times for images with illegal char in tag
...
Update the regular expression used to parse Docker images references to
prevent catastrophic backtracking when images names are long and the
tag contains an illegal character.
See gh-39617
2024-02-20 10:27:27 -06:00
Adrian Cole
4b0bed23b0
Migrate to Brave 6 and Zipkin Reporter 3
...
Signed-off-by: Adrian Cole <adrian@tetrate.io>
See gh-39049
2024-02-20 12:00:36 +01:00
Andy Wilkinson
e3de575841
Merge branch '3.2.x'
...
Closes gh-39550
2024-02-14 14:54:32 +00:00
Andy Wilkinson
deb3d70a2e
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39549
2024-02-14 14:54:16 +00:00
Andy Wilkinson
5bc4bdd1de
Test Gradle plugin against Gradle 8.6
...
Closes gh-39548
2024-02-14 14:54:10 +00:00
Moritz Halbritter
7f55cae90f
Merge branch '3.2.x'
2024-02-12 10:19:46 +01:00
Moritz Halbritter
4387b79831
Merge branch '3.1.x' into 3.2.x
2024-02-12 10:18:46 +01:00
Moritz Halbritter
8ffcfc9b77
Harmonize style of igored exceptions across the codebase
2024-02-12 10:14:20 +01:00
Scott Frederick
f5b1f811d6
Merge branch '3.2.x'
...
Closes gh-39514
2024-02-11 14:32:47 -06:00
Scott Frederick
eb75bb1339
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39513
2024-02-11 14:32:35 -06:00
Jakob Wanger
7e90b4951b
Enforce Gradle version to be at least of version 7.5
...
See gh-39508
Signed-off-by: Jakob Wanger <jakobwanger@gmail.com>
2024-02-11 14:30:26 -06:00
Scott Frederick
09a6ae51cc
Add support for Bitnami container images with Docker Compose
...
Closes gh-35759
2024-02-09 14:58:25 -06:00
Andy Wilkinson
5ae533a00d
Minimize scope of version management for commons-compress
...
See gh-39368
2024-02-06 15:08:15 +00:00
Chris Bono
ff8089de06
Update to Pulsar 3.2.0 and use Pulsar BOM
...
This commit updates Pulsar to 3.2.0 and leverages the newly added
Pulsar BOM in order to ease dependency management.
See gh-39408
2024-02-06 13:56:10 +01:00
Andy Wilkinson
9a5b3b3a2b
Merge branch '3.2.x'
...
See gh-39369
2024-02-06 12:38:37 +00:00
Andy Wilkinson
84e390af70
Merge branch '3.1.x' into 3.2.x
...
See gh-39368
2024-02-06 12:37:18 +00:00
Andy Wilkinson
5f680ccac0
Revert "Stop managing version of commons-compress where it isn't needed"
...
This reverts commit 2b85cb0356
.
See gh-39367
2024-02-06 12:36:26 +00:00
Moritz Halbritter
cc2233a7d9
Merge branch '3.2.x'
...
Closes gh-39423
2024-02-06 13:10:22 +01:00
Moritz Halbritter
976152b244
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39422
2024-02-06 13:10:15 +01:00
Moritz Halbritter
8fd28d9ece
Polish "Update the Debugging Documentation of the Spring Boot Maven Plugin"
...
See gh-39392
2024-02-06 13:07:55 +01:00
lukasdooo
b25d52c896
Update the Debugging Documentation of the Spring Boot Maven Plugin
...
See gh-39392
2024-02-06 13:06:57 +01:00
Moritz Halbritter
07ee7254a6
Align to Native Build Tools metadata repository default
...
Closes gh-39068
2024-02-05 08:46:57 +01:00
Eddú Meléndez
f3e7325064
Add service connection for Docker Compose and Testcontainers ActiveMQ
...
See gh-39363
2024-02-02 09:05:37 +01:00
Andy Wilkinson
f9363569ab
Merge branch '3.2.x'
...
Closes gh-39369
2024-02-01 11:19:01 +00:00
Andy Wilkinson
0afe0635b9
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39368
2024-02-01 11:17:41 +00:00
Andy Wilkinson
2b85cb0356
Stop managing version of commons-compress where it isn't needed
...
Closes gh-39367
2024-02-01 10:20:20 +00:00
Andy Wilkinson
899da7891a
Merge branch '3.1.x' into 3.2.x
...
See gh-39340
2024-01-31 17:44:07 +00:00
Andy Wilkinson
dd082c6c21
Revert "Upgrade to Commons Compress 1.25.0"
...
This reverts commit 1c2a622f7f
.
See gh-39148
2024-01-31 17:35:57 +00:00
Eddú Meléndez
f15cd93a35
Add service connection for Docker Compose and Testcontainers Artemis
...
See gh-39311
2024-01-31 08:37:03 +01:00
Scott Frederick
588d544392
Merge branch '3.2.x'
...
Closes gh-39348
2024-01-30 16:28:50 -06:00
Scott Frederick
5b76416b06
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39347
2024-01-30 16:28:39 -06:00
Scott Frederick
a620d348ad
Fix exporting of Docker image layers
...
The logic to extract layers from a downloaded Docker image assumed that
the layer entries in the image tar archive always had the file extension
`.tar`. This was the case with Docker and other compatible daemons until
Docker 25.0. With this commit, the extension is no longer assumed, but
any entries listed in `manifest.json` will be recognized.
Fixes gh-39323
2024-01-30 16:25:03 -06:00
Andy Wilkinson
10e750ab3b
Merge branch '3.2.x'
...
Closes gh-39341
2024-01-30 13:53:13 +00:00
Andy Wilkinson
8c18d75b12
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39340
2024-01-30 13:50:13 +00:00
Andy Wilkinson
1c2a622f7f
Upgrade to Commons Compress 1.25.0
...
Closes gh-39148
2024-01-30 13:49:37 +00:00
Moritz Halbritter
f36b69f961
Merge branch '3.2.x'
...
Closes gh-39338
2024-01-30 13:48:44 +01:00
Piyal Ahmed
a85e99790b
Fix NestedJarFile constructor javadoc
...
See gh-39285
2024-01-30 13:47:23 +01:00
Andy Wilkinson
df67dec561
Merge branch '3.2.x'
...
Closes gh-39306
2024-01-25 13:32:20 +00:00
Andy Wilkinson
a42a8ce620
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39305
2024-01-25 13:31:59 +00:00
Andy Wilkinson
a6d1788be3
Tolerate OS and Java version differences in ExtractCommandTests
...
Co-Authored-By: Moritz Halbritter <moritz.halbritter@broadcom.com>
Closes gh-39303
2024-01-25 13:31:42 +00:00
Phillip Webb
8f1a330dd5
Update copyright header of cleaned up code
...
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
24e0864105
Replace !Optional.isPresent with Optional.isEmpty
...
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
7f4aaacf42
Simplify stream chain operations
...
See gh-39259
2024-01-23 10:18:49 -08:00
Phillip Webb
15f1e8536b
Polish 'Remove redundant array creation'
...
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
d3c97adf79
Remove redundant array creation
...
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
316b415e95
Use try with resources instead of try-finally
...
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
cb26c31dd6
Replace explicit type with diamond operator
...
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
06265ee617
Use pattern variables
...
See gh-39259
2024-01-23 10:18:48 -08:00
Tobias Lippert
fe38cb3b4a
Use string.repeat()
...
See gh-39259
2024-01-23 09:47:07 -08:00
Phillip Webb
ddb769bf7f
Polish 'Simplify conditionals'
...
See gh-39259
2024-01-23 09:47:07 -08:00
Tobias Lippert
65a1ff84e6
Simplify conditionals
...
See gh-39259
2024-01-23 09:07:40 -08:00
Tobias Lippert
def7523398
Inline redundant if statements
...
See gh-39259
2024-01-23 09:07:35 -08:00
Scott Frederick
bee6fe899c
Polish "Add Docker Compose service connection support for OpenLDAP"
...
See gh-39258
2024-01-22 16:51:45 -06:00
PhilKes
eb940c3907
Add Docker Compose service connection support for OpenLDAP
...
See gh-39258
2024-01-22 16:51:45 -06:00
Phillip Webb
a0a804cfdf
Merge branch '3.2.x'
2024-01-22 12:20:41 -08:00
Phillip Webb
cff8cb98c7
Merge branch '3.1.x' into 3.2.x
2024-01-22 12:20:24 -08:00
Phillip Webb
088b313ae5
Polish
2024-01-22 11:57:37 -08:00
Moritz Halbritter
ca799f7b21
Tolerate actuator endpoints with the same id
...
Closes gh-39249
2024-01-22 12:33:05 +01:00
Phillip Webb
9de0085a43
Merge branch '3.2.x'
...
Closes gh-39226
2024-01-17 13:16:53 -08:00
Phillip Webb
eb0040c225
Fix ZipCentralDirectoryFileHeaderRecord entry comment read offset
...
Update `ZipCentralDirectoryFileHeaderRecord.copyTo` comment read offset
to account for the record position.
Fixes gh-39166
2024-01-17 13:16:43 -08:00
Andy Wilkinson
ac63fc0701
Merge branch '3.2.x'
...
Closes gh-39121
2024-01-12 16:25:13 +00:00
Andy Wilkinson
6bfac1f860
Fix handling of nested: UNC paths on Windows
...
Closes gh-38956
2024-01-12 15:53:19 +00:00
Andy Wilkinson
6f4a8cc0c3
Polish "Change log messages to use singular or plural instead of "noun(s)""
...
See gh-37017
2024-01-11 14:44:07 +00:00
teacmity
c6c7fbc15f
Change log messages to use singular or plural instead of "noun(s)"
...
See gh-37017
2024-01-11 14:35:49 +00:00
Andy Wilkinson
17e9f0cb8e
Merge branch '3.2.x'
...
Closes gh-39093
2024-01-11 11:36:38 +00:00
Andy Wilkinson
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +00:00
Christoph Dreis
b7c9c82180
Fix typos
...
See gh-38983
2024-01-10 09:06:45 +01:00
Phillip Webb
2d12fa073d
Merge branch '3.2.x'
...
Closes gh-39071
2024-01-09 12:38:24 -08:00
Phillip Webb
e5f489f338
Restore manifest support for nested directory jars
...
Update `NestedJarFile` so that the `getManifest()` method returns the
manifest from the parent jar file for nested jars based on directory
entries.
This restores the previous behavior supported by Spring Boot 3.1 and
allows class methods such as `getPackage().getImplementationVersion()`
to return non `null` results.
Fixes gh-38996
2024-01-09 12:33:10 -08:00
Moritz Halbritter
25614710d5
Fail if superfluous properties are used in property metadata
...
Closes gh-37597
2024-01-09 13:59:51 +01:00
Moritz Halbritter
970c226847
Polish
2024-01-09 13:59:14 +01:00
Andy Wilkinson
5ef7db9a28
Start working on Spring Boot 3.3
2024-01-04 10:56:56 +00:00
Phillip Webb
f31ffbf927
Don't duplicate META-INF entries in nested directory jars
...
Update `ZipContent` so that `META-INF` entries are no longer duplicated
in nested jars created from directory entries. This aligns with the
behavior of the classic loader and prevents the same META-INF file from
being discovered twice.
Fixes gh-38862
2023-12-20 17:36:06 -08:00
Phillip Webb
246a0e6f21
Merge branch '3.1.x'
...
Closes gh-38878
2023-12-19 23:10:49 -08:00
Yanming Zhou
8cb8999772
Ban call of URLEncoder.encode/URLDecoder.decode(String,String)
...
Add ArchUnit rules to ban the use of `URLEncoder` calls with String
charsets and use `Charset` calls instead.
See gh-38740
2023-12-19 23:10:18 -08:00
Phillip Webb
5354ad15b3
Merge branch '3.1.x'
...
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou
b6e87cee35
Remove unnecessary `extends Object` from generic
...
See gh-38739
2023-12-19 22:38:19 -08:00
Yanming Zhou
ac18e3015c
Use `.isEmpty()` where feasible
...
See gh-38739
2023-12-19 22:38:05 -08:00
Phillip Webb
88429b6a66
Use file urls for unpacked jars
...
Update `JarFileArchive` so that unpacked jars use `file:` URLs rather
than `jar:file:`. This aligns with the behavior of Spring Boot 3.1 and
allows calls to `class.getSigners()` to work again.
Fixes gh-38833
2023-12-17 10:55:31 -08:00
Phillip Webb
b4a4e91238
Update ZipString to deal with reads that do not return all data
...
Refine the logic in `ZipString.hash` and `ZipString.compare` to deal
with the fact a read operation may not return all available bytes.
Fixes gh-38751
2023-12-13 13:29:37 -08:00
Moritz Halbritter
e81d1226fe
Prevent integer overflow when checking disk space
2023-12-12 16:26:58 +01:00
Moritz Halbritter
a242bd81e2
Merge branch '3.1.x'
...
Closes gh-38747
2023-12-12 13:55:44 +01:00
Yanming Zhou
3c65fdfa12
Use idiomatic AssertJ assertions
...
See gh-38702
2023-12-12 13:53:20 +01:00
Phillip Webb
ea87787279
Merge branch '3.1.x'
...
Closes gh-38741
2023-12-11 20:37:45 -08:00
Phillip Webb
39bc7c8582
Support getPermissions() call on Gradle 8.6-milestone-1
...
The `getPermissions` method is now part of the private
`ParentDirectoryStub` class so we now need to call
`setAccessible(true)`.
Fixes gh-38718
2023-12-11 20:35:06 -08:00
Moritz Halbritter
6330190913
Merge branch '3.1.x'
...
Closes gh-38728
2023-12-11 09:44:19 +01:00
Yanming Zhou
ebfbc0ef05
Cleanup kotlin sources
...
1. remove unused imports
2. remove redundant semicolon
3. remove empty class body
4. remove redundant 'constructor' keyword
5. remove redundant 'Unit' return type
6. use non-null type if possible
See gh-38708
2023-12-11 09:23:42 +01:00
Andy Wilkinson
e6970243ee
Retry read on ClosedByInterruptException
...
In gh-38154, we started handling ClosedByInterruptException. The
FileChannel was repaired by recreating it and then the exception was
rethrown. This allowed other threads to use the channel that had been
read by an interrupted thread while allowing that interruption to
continue.
This approach has proven to be insufficient as there are scenarios
where the read needs to succeed on the interrupted thread. This
commit updates the handling of ClosedByInterruptException so that
this is the case. The FileChannel is recreated as before but the
thread's interrupted flag is now cleared before retrying the read.
The flag is then reinstated so that any subsequent actions that
should fail due to the interruption will do so.
We could clear and reinstate the interrupted flag before the first
read, rather than catching ClosedByInterruptException. This approach
was rejected as it will have an impact on the performance of the
happy path where the thread hasn't been interrupted.
Fixes gh-38611
2023-12-07 10:49:40 -08:00
Phillip Webb
359a6cb5bb
Use encoded version of path for jar URLs
...
Update `JarUrl` so that the encoded version of the path is used.
This allows jars to placed in directories with `#` or `!` in the
name.
Fixes gh-38660
2023-12-06 16:20:27 -08:00
Phillip Webb
847daf484c
Fix JarUrlTests
...
Fix `JarUrlTests` to use the jarFile rather than temp.
2023-12-06 16:19:57 -08:00
Andy Wilkinson
49990afd78
Polish
...
See gh-38592
2023-12-05 20:49:34 +00:00
Andy Wilkinson
16c2ddb02c
Merge branch '3.1.x'
...
Closes gh-38665
2023-12-05 20:31:17 +00:00
Andy Wilkinson
b424254587
Test Gradle plugin against Gradle 8.5
...
Closes gh-38664
2023-12-05 20:30:54 +00:00