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

fix: purl generation for pom.xml (#1078)

Browse Source
This commit is contained in:
cpendery 2022-06-30 10:31:36 -04:00 committed by GitHub
parent 1e3ffbebb9
commit bc054e4724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 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

@ -63,6 +63,11 @@ func newPackageFromPom(dep gopom.Dependency) *pkg.Package {
Type: pkg.JavaPkg, // TODO: should we differentiate between packages from jar/war/zip versus packages from a pom.xml that were not installed yet? Type: pkg.JavaPkg, // TODO: should we differentiate between packages from jar/war/zip versus packages from a pom.xml that were not installed yet?
MetadataType: pkg.JavaMetadataType, MetadataType: pkg.JavaMetadataType,
FoundBy: javaPomCataloger, FoundBy: javaPomCataloger,
Metadata: pkg.JavaMetadata{
PomProperties: &pkg.PomProperties{
GroupID: dep.GroupID,
},
},
} }
p.Metadata = pkg.JavaMetadata{PURL: packageURL(*p)} p.Metadata = pkg.JavaMetadata{PURL: packageURL(*p)}

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

@ -26,7 +26,7 @@ func Test_parserPomXML(t *testing.T) {
Type: pkg.JavaPkg, Type: pkg.JavaPkg,
MetadataType: pkg.JavaMetadataType, MetadataType: pkg.JavaMetadataType,
Metadata: pkg.JavaMetadata{ Metadata: pkg.JavaMetadata{
PURL: "pkg:maven/joda-time/joda-time@2.9.2", PURL: "pkg:maven/com.joda/joda-time@2.9.2",
}, },
}, },
{ {

5
syft/pkg/cataloger/java/test-fixtures/pom/pom.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.anchore</groupId> <groupId>org.anchore</groupId>
@ -16,7 +15,7 @@
<dependencies> <dependencies>
<!-- tag::joda[] --> <!-- tag::joda[] -->
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>com.joda</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<version>2.9.2</version> <version>2.9.2</version>
</dependency> </dependency>