oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-02-14 03:26:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(java): improve identification for commons-jelly artifacts (#2399)

Browse Source 
Signed-off-by: Weston Steimel <weston.steimel@proton.me>
This commit is contained in:
Weston Steimel 2023-12-07 17:28:21 +00:00 committed by GitHub
parent 2c145f70b2
commit ea80f94c0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
syft/pkg/cataloger/common/cpe/java_groupid_map.go
View File

@ -1778,4 +1778,41 @@ var DefaultArtifactIDToGroupID = map[string]string{
"minio": "io.minio", "minio": "io.minio",
"minio-admin": "io.minio", "minio-admin": "io.minio",
"minio-java": "io.minio", "minio-java": "io.minio",
"commons-jelly": "commons-jelly",
"commons-jelly-avalon": "commons-jelly",
"commons-jelly-tags-ant": "commons-jelly",
"commons-jelly-tags-antlr": "commons-jelly",
"commons-jelly-tags-avalon": "commons-jelly",
"commons-jelly-tags-bean": "commons-jelly",
"commons-jelly-tags-beanshell": "commons-jelly",
"commons-jelly-tags-betwixt": "commons-jelly",
"commons-jelly-tags-bsf": "commons-jelly",
"commons-jelly-tags-define": "commons-jelly",
"commons-jelly-tags-dynabean": "commons-jelly",
"commons-jelly-tags-email": "commons-jelly",
"commons-jelly-tags-fmt": "commons-jelly",
"commons-jelly-tags-html": "commons-jelly",
"commons-jelly-tags-http": "commons-jelly",
"commons-jelly-tags-interaction": "commons-jelly",
"commons-jelly-tags-jaxme": "commons-jelly",
"commons-jelly-tags-jetty": "commons-jelly",
"commons-jelly-tags-jface": "commons-jelly",
"commons-jelly-tags-jms": "commons-jelly",
"commons-jelly-tags-jmx": "commons-jelly",
"commons-jelly-tags-jsl": "commons-jelly",
"commons-jelly-tags-junit": "commons-jelly",
"commons-jelly-tags-log": "commons-jelly",
"commons-jelly-tags-ojb": "commons-jelly",
"commons-jelly-tags-quartz": "commons-jelly",
"commons-jelly-tags-regexp": "commons-jelly",
"commons-jelly-tags-soap": "commons-jelly",
"commons-jelly-tags-sql": "commons-jelly",
"commons-jelly-tags-swing": "commons-jelly",
"commons-jelly-tags-swt": "commons-jelly",
"commons-jelly-tags-threads": "commons-jelly",
"commons-jelly-tags-util": "commons-jelly",
"commons-jelly-tags-validate": "commons-jelly",
"commons-jelly-tags-velocity": "commons-jelly",
"commons-jelly-tags-xml": "commons-jelly",
"commons-jelly-tags-xmlunit": "commons-jelly",
} }

9
test/integration/java_purl_test.go
View File

@ -57,9 +57,6 @@ var noAssertion = map[string]string{
"/packages/hudson.war:WEB-INF/lib/asm-2.2.3.jar": "pkg:maven/asm/asm@2.2.3", "/packages/hudson.war:WEB-INF/lib/asm-2.2.3.jar": "pkg:maven/asm/asm@2.2.3",
"/packages/hudson.war:WEB-INF/lib/asm-commons-2.2.3.jar": "pkg:maven/asm/asm-commons@2.2.3", "/packages/hudson.war:WEB-INF/lib/asm-commons-2.2.3.jar": "pkg:maven/asm/asm-commons@2.2.3",
"/packages/hudson.war:WEB-INF/lib/asm-tree-2.2.3.jar": "pkg:maven/asm/asm-tree@2.2.3", "/packages/hudson.war:WEB-INF/lib/asm-tree-2.2.3.jar": "pkg:maven/asm/asm-tree@2.2.3",
"/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-define-1.0.1-hudson-20071021.jar": "pkg:maven/org.jvnet.hudson/commons-jelly-tags-define@1.0.1-hudson-20071021",
"/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-fmt-1.0.jar": "pkg:maven/commons-jelly/commons-jelly-tags-fmt@1.0",
"/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-xml-1.1.jar": "pkg:maven/commons-jelly/commons-jelly-tags-xml@1.1",
"/packages/hudson.war:WEB-INF/slave.jar": "pkg:maven/org.jvnet.hudson.main/remoting@1.390", "/packages/hudson.war:WEB-INF/slave.jar": "pkg:maven/org.jvnet.hudson.main/remoting@1.390",
"/packages/hudson.war:WEB-INF/lib/xpp3_min-1.1.4c.jar": "pkg:maven/xpp3_min/xpp3_min@1.1.4c", "/packages/hudson.war:WEB-INF/lib/xpp3_min-1.1.4c.jar": "pkg:maven/xpp3_min/xpp3_min@1.1.4c",
"/packages/hudson.war:WEB-INF/lib/xpp3-1.1.4c.jar": "pkg:maven/xpp3/xpp3@1.1.4c", "/packages/hudson.war:WEB-INF/lib/xpp3-1.1.4c.jar": "pkg:maven/xpp3/xpp3@1.1.4c",
@ -239,9 +236,9 @@ var expectedPURLs = map[string]string{
"/packages/hudson.war:WEB-INF/lib/commons-fileupload-1.2.1.jar": "pkg:maven/commons-fileupload/commons-fileupload@1.2.1", "/packages/hudson.war:WEB-INF/lib/commons-fileupload-1.2.1.jar": "pkg:maven/commons-fileupload/commons-fileupload@1.2.1",
"/packages/hudson.war:WEB-INF/lib/commons-io-1.4.jar": "pkg:maven/commons-io/commons-io@1.4", "/packages/hudson.war:WEB-INF/lib/commons-io-1.4.jar": "pkg:maven/commons-io/commons-io@1.4",
"/packages/hudson.war:WEB-INF/lib/commons-jelly-1.1-hudson-20100305.jar": "pkg:maven/org.jvnet.hudson/commons-jelly@1.1-hudson-20100305", "/packages/hudson.war:WEB-INF/lib/commons-jelly-1.1-hudson-20100305.jar": "pkg:maven/org.jvnet.hudson/commons-jelly@1.1-hudson-20100305",
// "/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-define-1.0.1-hudson-20071021.jar": "pkg:maven/org.jvnet.hudson/commons-jelly-tags-define@1.0.1-hudson-20071021", "/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-define-1.0.1-hudson-20071021.jar": "pkg:maven/org.jvnet.hudson/commons-jelly-tags-define@1.0.1-hudson-20071021",
// "/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-fmt-1.0.jar": "pkg:maven/commons-jelly/commons-jelly-tags-fmt@1.0", "/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-fmt-1.0.jar": "pkg:maven/commons-jelly/commons-jelly-tags-fmt@1.0",
// "/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-xml-1.1.jar": "pkg:maven/commons-jelly/commons-jelly-tags-xml@1.1", "/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-xml-1.1.jar": "pkg:maven/commons-jelly/commons-jelly-tags-xml@1.1",
"/packages/hudson.war:WEB-INF/lib/commons-jexl-1.1-hudson-20090508.jar": "pkg:maven/org.jvnet.hudson/commons-jexl@1.1-hudson-20090508", "/packages/hudson.war:WEB-INF/lib/commons-jexl-1.1-hudson-20090508.jar": "pkg:maven/org.jvnet.hudson/commons-jexl@1.1-hudson-20090508",
"/packages/hudson.war:WEB-INF/lib/commons-lang-2.4.jar": "pkg:maven/commons-lang/commons-lang@2.4", "/packages/hudson.war:WEB-INF/lib/commons-lang-2.4.jar": "pkg:maven/commons-lang/commons-lang@2.4",
"/packages/hudson.war:WEB-INF/lib/commons-logging-1.1.jar": "pkg:maven/commons-logging/commons-logging@1.1", "/packages/hudson.war:WEB-INF/lib/commons-logging-1.1.jar": "pkg:maven/commons-logging/commons-logging@1.1",