oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-03-29 21:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(java): improve lz4 detection (#4642)

Browse Source 
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@surgut.co.uk>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
Co-authored-by: Keith Zantow <kzantow@gmail.com>
This commit is contained in:
Dimitri John Ledkov 2026-02-27 19:38:05 +00:00 committed by GitHub
parent db76d85d51
commit 35278f3d3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syft/pkg/cataloger/internal/cpegenerate/java.go
View File

@ -302,7 +302,11 @@ func GetManifestFieldGroupIDs(manifest *pkg.JavaManifest, fields []string) (grou
}
func cleanGroupID(groupID string) string {
return strings.TrimSpace(strings.Split(removeOSCIDirectives(groupID), "#")[0])
groupID = strings.TrimSpace(strings.Split(removeOSCIDirectives(groupID), "#")[0])
if replacement, ok := GroupIDCorrections[groupID]; ok {
return replacement
}
return groupID
}
func removeOSCIDirectives(groupID string) string {

4
syft/pkg/cataloger/internal/cpegenerate/java_groupid_map.go
View File

@ -1,5 +1,9 @@
package cpegenerate
var GroupIDCorrections = map[string]string{
"org.lz4.java": "org.lz4",
}
var DefaultArtifactIDToGroupID = map[string]string{
"ant": "org.apache.ant",
"ant-antlr": "org.apache.ant",

16
syft/pkg/cataloger/internal/cpegenerate/java_test.go
View File

@ -183,6 +183,22 @@ func Test_groupIDsFromJavaPackage(t *testing.T) {
},
expects: []string{"io.jenkins-ci.plugin.thing"},
},
{
name: "groupId correction properly applied",
pkg: pkg.Package{
Metadata: pkg.JavaArchive{
Manifest: &pkg.JavaManifest{
Main: pkg.KeyValues{
{
Key: "Automatic-Module-Name",
Value: "org.lz4.java",
},
},
},
},
},
expects: []string{"org.lz4"},
},
{
name: "from main Extension-Name field",
pkg: pkg.Package{