oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Catalog java bundle-version if nothing else found (#677)

Browse Source
This commit is contained in:
Keith Zantow 2021-12-13 17:38:25 -05:00 committed by GitHub
parent f98868b55e
commit 3a10ca7e6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
syft/pkg/cataloger/java/parse_java_manifest.go
View File

@ -127,6 +127,7 @@ func selectVersion(manifest *pkg.JavaManifest, filenameObj archiveFilename) stri
"Implementation-Version", "Implementation-Version",
"Specification-Version", "Specification-Version",
"Plugin-Version", "Plugin-Version",
"Bundle-Version",
} }
for _, fieldName := range fieldNames { for _, fieldName := range fieldNames {

16
syft/pkg/cataloger/java/parse_java_manifest_test.go
View File

@ -212,6 +212,22 @@ func TestSelectVersion(t *testing.T) {
}, },
expected: "1.8.2", expected: "1.8.2",
}, },
{
name: "Implementation-Version takes precedence over Specification-Version in subsequent section",
manifest: pkg.JavaManifest{
Main: map[string]string{
"Manifest-Version": "1.0",
"Ant-Version": "Apache Ant 1.8.2",
"Created-By": "1.5.0_22-b03 (Sun Microsystems Inc.)",
},
NamedSections: map[string]map[string]string{
"some-other-section": {
"Bundle-Version": "1.11.28",
},
},
},
expected: "1.11.28",
},
} }
for _, test := range tests { for _, test := range tests {