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

fix: pom properties not setting artifact id (#1870)

Browse Source 
Signed-off-by: James Neate <jamesmneate@gmail.com>
This commit is contained in:
James Neate 2023-06-12 14:59:14 +01:00 committed by GitHub
parent 2c5d64ac9e
commit 098c255a2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
syft/pkg/cataloger/java/parse_pom_xml.go
View File

@ -68,8 +68,9 @@ func newPomProject(path string, p gopom.Project) *pkg.PomProject {
func newPackageFromPom(pom gopom.Project, dep gopom.Dependency, locations ...file.Location) pkg.Package {
m := pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: resolveProperty(pom, dep.GroupID),
Scope: resolveProperty(pom, dep.Scope),
GroupID: resolveProperty(pom, dep.GroupID),
ArtifactID: resolveProperty(pom, dep.ArtifactID),
Scope: resolveProperty(pom, dep.Scope),
},
}

60
syft/pkg/cataloger/java/parse_pom_xml_test.go
View File

@ -28,7 +28,10 @@ func Test_parserPomXML(t *testing.T) {
Type: pkg.JavaPkg,
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{GroupID: "com.joda"},
PomProperties: &pkg.PomProperties{
GroupID: "com.joda",
ArtifactID: "joda-time",
},
},
},
{
@ -40,8 +43,9 @@ func Test_parserPomXML(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "junit",
Scope: "test",
GroupID: "junit",
ArtifactID: "junit",
Scope: "test",
},
},
},
@ -75,7 +79,10 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
Type: pkg.JavaPkg,
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{GroupID: "org.apache.commons"},
PomProperties: &pkg.PomProperties{
GroupID: "org.apache.commons",
ArtifactID: "commons-lang3",
},
},
},
{
@ -87,8 +94,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "org.junit.jupiter",
Scope: "test",
GroupID: "org.junit.jupiter",
ArtifactID: "junit-jupiter",
Scope: "test",
},
},
},
@ -101,8 +109,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "org.assertj",
Scope: "test",
GroupID: "org.assertj",
ArtifactID: "assertj-core",
Scope: "test",
},
},
},
@ -115,8 +124,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "commons-io",
Scope: "test",
GroupID: "commons-io",
ArtifactID: "commons-io",
Scope: "test",
},
},
},
@ -129,8 +139,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "org.mockito",
Scope: "test",
GroupID: "org.mockito",
ArtifactID: "mockito-inline",
Scope: "test",
},
},
},
@ -143,8 +154,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "org.graalvm.js",
Scope: "test",
GroupID: "org.graalvm.js",
ArtifactID: "js",
Scope: "test",
},
},
},
@ -157,8 +169,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "org.graalvm.js",
Scope: "test",
GroupID: "org.graalvm.js",
ArtifactID: "js-scriptengine",
Scope: "test",
},
},
},
@ -171,8 +184,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "org.apache.commons",
Scope: "test",
GroupID: "org.apache.commons",
ArtifactID: "commons-rng-simple",
Scope: "test",
},
},
},
@ -185,8 +199,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "org.openjdk.jmh",
Scope: "test",
GroupID: "org.openjdk.jmh",
ArtifactID: "jmh-core",
Scope: "test",
},
},
},
@ -199,8 +214,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: "org.openjdk.jmh",
Scope: "test",
GroupID: "org.openjdk.jmh",
ArtifactID: "jmh-generator-annprocess",
Scope: "test",
},
},
},