Commit Graph
64 Commits
Author SHA1 Message Date
Phillip Webb bd1ae5ede0 Merge branch '4.0.x' into 4.1.x
Closes gh-51745
2026-09-14 18:09:52 -07:00
Phillip Webb d6aac54e2e Polish 'Fix inflater cache race in NestedJarFileResources'
See gh-51744
2026-09-14 17:37:06 -07:00
Ian Kettle b103aaa1f6 Fix inflater cache race in NestedJarFileResources
Update `NestedJarFileResources` to fix a race condition that could
result in a `NullPointerException`.

The methods `getOrCreateInflater` and `endOrCacheInflater` both
synchronize on a local `inflaterCache` variable but attempted to use the
`this.inflaterCache` instance which could be set to null.

The `releaseInflators` method had a synchronized block for ending each
inflater but the cache was being nulled out outside the block meaning that
the other 2 methods mentioned could hit the race condition.

Signed-off-by: Ian Kettle <25729118+icikle@users.noreply.github.com>

See gh-51744
2026-09-14 17:34:45 -07:00
Andy Wilkinson 5b3631bfe9 Merge branch '4.0.x' into 4.1.x
Closes gh-51651
2026-09-09 15:31:57 +01:00
Andy Wilkinson 007ca201e1 Polish "Add SBOM manifest attributes to repackaged Maven wars"
See gh-51551

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-09 14:44:51 +01:00
COBI-98 bfd05e38b5 Add SBOM manifest attributes to repackaged Maven wars
Packager#isCycloneDxBom only recognized CycloneDX SBOMs beneath
META-INF/sbom/. In a war, the CycloneDX Maven plugin's output is
packaged beneath WEB-INF/classes/META-INF/sbom/, so repackaging did
not add the SBOM manifest attributes.

Also check beneath Layout#getClassesLocation(), which findMainMethod
already uses to locate application classes. Continue to support the
root location used by jars.

Signed-off-by: COBI-98 <tkdgus968@naver.com>

See gh-51551
2026-09-09 14:44:33 +01:00
Andy Wilkinson 50350d0c83 Merge branch '4.0.x' into 4.1.x
Closes gh-51606
2026-09-07 12:20:30 +01:00
Hyunwoo Jung 528c8bd1ea Fix typos
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51590
2026-09-07 11:53:30 +01:00
Andy Wilkinson ea613dc511 Merge branch '4.0.x' into 4.1.x
Closes gh-51599
2026-09-07 08:26:42 +01:00
Manu Sridharan 25a3f8feb9 Remove unnecessary NullAway suppressions
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51591
2026-09-07 08:18:11 +01:00
Moritz Halbritter 07e3850143 Merge branch '4.0.x' into 4.1.x
Closes gh-51547
2026-09-02 16:23:27 +02:00
Hyeongjun Cho d92a75c66b Print a simple error message when a jarmode tools command fails
See gh-51540

Signed-off-by: Hyeongjun Cho <ryuu.public@gmail.com>
2026-09-02 16:17:49 +02:00
Andy Wilkinson 40e8911734 Merge branch '4.0.x' into 4.1.x
Closes gh-51520
2026-09-01 16:12:05 +01:00
Andy Wilkinson 837f44f764 Return correct total when read(ByteBuffer) cannot fill buffer
Fixes gh-51515
2026-09-01 16:03:12 +01:00
Stéphane Nicoll 0a399e49da Merge branch '4.0.x' into 4.1.x
Closes gh-51089
2026-07-21 15:18:23 +02:00
Stéphane Nicoll 59de56d66a Polish "Fix nested archive paths logging in PropertiesLauncher"
See gh-50968
2026-07-21 15:15:43 +02:00
Filip Hrisafov 2578e81796 Fix nested archive paths logging in PropertiesLauncher
See gh-50968

Signed-off-by: Filip Hrisafov <filip.hrisafov@gmail.com>
2026-07-21 14:58:48 +02:00
Moritz Halbritter 8afd978548 Merge branch '4.0.x'
Closes gh-50510
2026-05-27 10:47:58 +02:00
Moritz Halbritter 5f0d0ad265 Merge branch '3.5.x' into 4.0.x
Closes gh-50509
2026-05-27 10:47:47 +02:00
Andy Wilkinson 6a74bb85a3 Merge branch '4.0.x'
Closes gh-50440
2026-05-14 15:03:44 +01:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x
Closes gh-50439
2026-05-14 15:02:24 +01:00
Phillip Webb fae5a098f7 Merge branch '4.0.x'
Closes gh-50298
2026-05-05 11:35:27 -07:00
Phillip Webb 031cf98084 Merge branch '3.5.x' into 4.0.x
Closes gh-50297
2026-05-05 11:21:40 -07:00
Andy Wilkinson dcf0b4ccab Merge branch '4.0.x'
Closes gh-50132
2026-04-20 10:09:21 +01:00
Andy Wilkinson b43d3d439d Merge branch '3.5.x' into 4.0.x
Closes gh-50131
2026-04-20 10:05:26 +01:00
Stéphane Nicoll 3a38f0039b Merge branch '4.0.x'
Closes gh-49728
2026-03-24 10:29:45 +01:00
Stéphane Nicoll a96bfd6a0b Merge branch '3.5.x' into 4.0.x
Closes gh-49727
2026-03-24 10:29:30 +01:00
Stéphane Nicoll 6bf72956fd Merge branch '4.0.x'
Closes gh-49301
2026-02-23 16:47:29 +01:00
Stéphane Nicoll 5c9dbd4a4d Merge branch '3.5.x' into 4.0.x
Closes gh-49300
2026-02-23 16:47:20 +01:00
Andy Wilkinson 3d6671d47a Merge branch '4.0.x'
Closes gh-48701
2026-01-08 12:14:50 +00:00
Andy Wilkinson 0ffffee4bf Upgrade to Nullability Plugin 0.0.9
Closes gh-48638
2026-01-08 11:59:51 +00:00
Phillip Webb a6e4a93cda Merge branch '4.0.x'
Closes gh-48679
2026-01-05 14:34:20 -08:00
Phillip Webb eef6a6a5e2 Merge branch '3.5.x' into 4.0.x
Closes gh-48678
2026-01-05 14:33:39 -08:00
Stéphane Nicoll da56bfea6e Remove support for the deprecated layertools jar mode
Closes gh-48568
2025-12-22 08:36:52 +01:00
Andy Wilkinson 85bbbc99ad Merge branch '3.5.x'
Closes gh-48229
2025-11-21 16:54:25 +00:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Stéphane Nicoll 728cb95a17 Fix formatting 2025-10-23 14:12:50 +02:00
Andy Wilkinson aa95282290 Polish @since tags
Closes gh-47779
2025-10-23 12:48:58 +01:00
Phillip Webb debbec8ee1 Merge branch '3.5.x'
Closes gh-47772
2025-10-22 22:15:43 -07:00
Phillip Webb 739cb529fb Merge branch '3.5.x'
Closes gh-47749
2025-10-21 11:30:56 -07:00
Andy Wilkinson 81aa674adb Remove support for embedded launch scripts
Closes gh-47666
2025-10-20 20:03:14 +01:00
Moritz Halbritter 797f25f884 Add nullability annotations to tests in loader/spring-boot-loader-tools
See gh-47263
2025-10-16 14:07:16 +02:00
Moritz Halbritter 6f94129c85 Add nullability annotations to tests in loader/spring-boot-jarmode-tools
See gh-47263
2025-10-16 14:07:16 +02:00
Moritz Halbritter e350286196 Improve null-safety of loader/spring-boot-loader-tools
See gh-47263
2025-10-16 14:07:15 +02:00
Dmytro Nosan bc2ca5b9fc Extend ArchitectureCheck with NullMarkedExtension
Introduce NullMarkedExtension for ArchitectureCheck, which provides
functionality to configure packages to ignore in nullability checks and
to enable or disable the extension.

See gh-47596

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-10-15 08:23:47 +02:00
Andy Wilkinson 44099d3d21 Build with Gradle 9.1.0 2025-10-06 18:30:48 +01:00
Andy Wilkinson 53cda6a6a1 Polish "Remove unused SHA-1 hash from UNPACK markers"
See gh-46520
2025-10-03 15:16:36 +01:00
academey d5717b71ab Remove unused SHA-1 hash from UNPACK markers
In BootZipCopyAction and AbstractJarWriter, SHA-1 hash is calculated for
stored entries requiring unpack and set as entry comment. However, the
hash isn't used anywhere, just the marker prefix 'UNPACK:' is checked.

This commit removes the unnecessary SHA-1 hash calculation which reads
the file completely in memory, potentially three times in extreme cases.
Now the comment is simply set to 'UNPACK:' without any hash, improving
performance.

See gh-46520

Signed-off-by: Hyunjoon Choi <hyunjoon@example.com>
Signed-off-by: academey <academey@gmail.com>
2025-10-03 15:16:36 +01:00
Andy Wilkinson 0b0b742758 Merge branch '3.5.x'
Closes gh-47312
2025-09-24 15:21:40 +01:00
Andy Wilkinson 6490b749db Merge branch '3.5.x'
Closes gh-47310
2025-09-24 14:57:27 +01:00