diff --git a/internal/capabilities/generate/merge.go b/internal/capabilities/generate/merge.go index 015104e8a..104df7eb6 100644 --- a/internal/capabilities/generate/merge.go +++ b/internal/capabilities/generate/merge.go @@ -492,7 +492,7 @@ func (e *EnrichmentData) EnrichWithBinaryClassifier(catalogerName string, entry packages = append(packages, capabilities.DetectorPackageInfo{ Class: o.Class, Name: o.Package, - PURL: o.PURL, + PURL: stripPURLVersion(o.PURL), CPEs: o.CPEs, Type: "BinaryPkg", }) diff --git a/internal/capabilities/packages.yaml b/internal/capabilities/packages.yaml index 029ed42a7..65f7ff422 100644 --- a/internal/capabilities/packages.yaml +++ b/internal/capabilities/packages.yaml @@ -1026,43 +1026,43 @@ catalogers: type: BinaryPkg - class: java-binary-graalvm name: graalvm - purl: pkg:generic/oracle/graalvm@version + purl: pkg:generic/oracle/graalvm cpes: - cpe:2.3:a:oracle:graalvm:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-binary-openjdk-zulu name: zulu - purl: pkg:generic/azul/zulu@version + purl: pkg:generic/azul/zulu cpes: - cpe:2.3:a:azul:zulu:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-binary-openjdk-with-update name: openjdk - purl: pkg:generic/oracle/openjdk@version + purl: pkg:generic/oracle/openjdk cpes: - cpe:2.3:a:oracle:openjdk:{{.primary}}:update{{.update}}:*:*:*:*:*:* type: BinaryPkg - class: java-binary-openjdk name: openjdk - purl: pkg:generic/oracle/openjdk@version + purl: pkg:generic/oracle/openjdk cpes: - cpe:2.3:a:oracle:openjdk:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-binary-ibm name: java - purl: pkg:generic/ibm/java@version + purl: pkg:generic/ibm/java cpes: - cpe:2.3:a:ibm:java:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-binary-openjdk-fallthrough name: jre - purl: pkg:generic/oracle/jre@version + purl: pkg:generic/oracle/jre cpes: - cpe:2.3:a:oracle:jre:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-binary-oracle name: jre - purl: pkg:generic/oracle/jre@version + purl: pkg:generic/oracle/jre cpes: - cpe:2.3:a:oracle:jre:*:*:*:*:*:*:*:* type: BinaryPkg @@ -1077,37 +1077,37 @@ catalogers: type: BinaryPkg - class: java-binary-graalvm name: graalvm - purl: pkg:generic/oracle/graalvm@version + purl: pkg:generic/oracle/graalvm cpes: - cpe:2.3:a:oracle:graalvm_for_jdk:*:*:*:*:*:*:*:* type: BinaryPkg - class: jdb-binary-openjdk-zulu name: zulu - purl: pkg:generic/azul/zulu@version + purl: pkg:generic/azul/zulu cpes: - cpe:2.3:a:azul:zulu:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-jdb-binary-openjdk name: openjdk - purl: pkg:generic/oracle/openjdk@version + purl: pkg:generic/oracle/openjdk cpes: - cpe:2.3:a:oracle:openjdk:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-sdk-binary-ibm name: java_sdk - purl: pkg:generic/ibm/java_sdk@version + purl: pkg:generic/ibm/java_sdk cpes: - cpe:2.3:a:ibm:java_sdk:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-binary-openjdk-fallthrough name: openjdk - purl: pkg:generic/oracle/openjdk@version + purl: pkg:generic/oracle/openjdk cpes: - cpe:2.3:a:oracle:openjdk:*:*:*:*:*:*:*:* type: BinaryPkg - class: java-binary-jdk name: jdk - purl: pkg:generic/oracle/jdk@version + purl: pkg:generic/oracle/jdk cpes: - cpe:2.3:a:oracle:jdk:*:*:*:*:*:*:*:* type: BinaryPkg