diff --git a/syft/pkg/cataloger/common/cpe/java_groupid_map.go b/syft/pkg/cataloger/common/cpe/java_groupid_map.go index 81cf0aafa8e..09c57f2343d 100644 --- a/syft/pkg/cataloger/common/cpe/java_groupid_map.go +++ b/syft/pkg/cataloger/common/cpe/java_groupid_map.go @@ -1815,4 +1815,44 @@ var DefaultArtifactIDToGroupID = map[string]string{ "commons-jelly-tags-velocity": "commons-jelly", "commons-jelly-tags-xml": "commons-jelly", "commons-jelly-tags-xmlunit": "commons-jelly", + "groovy": "org.codehaus.groovy", + "groovy-all": "org.codehaus.groovy", + "groovy-all-jdk14": "org.codehaus.groovy", + "groovy-all-minimal": "org.codehaus.groovy", + "groovy-all-tests": "org.codehaus.groovy", + "groovy-ant": "org.codehaus.groovy", + "groovy-astbuilder": "org.codehaus.groovy", + "groovy-backports-compat23": "org.codehaus.groovy", + "groovy-binary": "org.codehaus.groovy", + "groovy-bom": "org.codehaus.groovy", + "groovy-bsf": "org.codehaus.groovy", + "groovy-cli-commons": "org.codehaus.groovy", + "groovy-cli-picocli": "org.codehaus.groovy", + "groovy-console": "org.codehaus.groovy", + "groovy-datetime": "org.codehaus.groovy", + "groovy-dateutil": "org.codehaus.groovy", + "groovy-docgenerator": "org.codehaus.groovy", + "groovy-eclipse-batch": "org.codehaus.groovy", + "groovy-eclipse-compiler": "org.codehaus.groovy", + "groovy-groovydoc": "org.codehaus.groovy", + "groovy-groovysh": "org.codehaus.groovy", + "groovy-jaxb": "org.codehaus.groovy", + "groovy-jdk14": "org.codehaus.groovy", + "groovy-jmx": "org.codehaus.groovy", + "groovy-json": "org.codehaus.groovy", + "groovy-json-direct": "org.codehaus.groovy", + "groovy-jsr223": "org.codehaus.groovy", + "groovy-macro": "org.codehaus.groovy", + "groovy-nio": "org.codehaus.groovy", + "groovy-servlet": "org.codehaus.groovy", + "groovy-sql": "org.codehaus.groovy", + "groovy-swing": "org.codehaus.groovy", + "groovy-templates": "org.codehaus.groovy", + "groovy-test": "org.codehaus.groovy", + "groovy-test-junit5": "org.codehaus.groovy", + "groovy-testng": "org.codehaus.groovy", + "groovy-tests-vm8": "org.codehaus.groovy", + "groovy-xml": "org.codehaus.groovy", + "groovy-xmlrpc": "org.codehaus.groovy", + "groovy-yaml": "org.codehaus.groovy", } diff --git a/test/integration/java_purl_test.go b/test/integration/java_purl_test.go index 4fa5ca278a8..2af26ab7051 100644 --- a/test/integration/java_purl_test.go +++ b/test/integration/java_purl_test.go @@ -60,7 +60,6 @@ var noAssertion = map[string]string{ "/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-1.1.4c.jar": "pkg:maven/xpp3/xpp3@1.1.4c", - "/packages/hudson.war:WEB-INF/lib/groovy-all-1.6.0.jar": "pkg:maven/org.codehaus.groovy/groovy-all@1.6.0", "/packages/hudson.war:WEB-INF/hudson-cli.jar": "pkg:maven/org.jvnet.hudson.main/hudson-cli@1.390", "/packages/hudson.war:WEB-INF/lib/dom4j-1.6.1-hudson-3.jar": "pkg:maven/org.jvnet.hudson.dom4j/dom4j@1.6.1-hudson-3", "/packages/xpp3_min-1.1.4c.jar": "pkg:maven/xpp3/xpp3_min@1.1.4c", @@ -245,10 +244,10 @@ var expectedPURLs = map[string]string{ "/packages/hudson.war:WEB-INF/lib/commons-pool-1.3.jar": "pkg:maven/commons-pool/commons-pool@1.3", "/packages/hudson.war:WEB-INF/lib/crypto-util-1.0.jar": "pkg:maven/org.jvnet.hudson/crypto-util@1.0", // "/packages/hudson.war:WEB-INF/lib/dom4j-1.6.1-hudson-3.jar": "pkg:maven/org.jvnet.hudson.dom4j/dom4j@1.6.1-hudson-3", - "/packages/hudson.war:WEB-INF/lib/embedded_su4j-1.1.jar": "pkg:maven/com.sun.solaris/embedded_su4j@1.1", - "/packages/hudson.war:WEB-INF/lib/ezmorph-1.0.3.jar": "pkg:maven/net.sf.ezmorph/ezmorph@1.0.3", - "/packages/hudson.war:WEB-INF/lib/graph-layouter-1.0.jar": "pkg:maven/org.kohsuke/graph-layouter@1.0", - // "/packages/hudson.war:WEB-INF/lib/groovy-all-1.6.0.jar": "pkg:maven/org.codehaus.groovy/groovy-all@1.6.0", + "/packages/hudson.war:WEB-INF/lib/embedded_su4j-1.1.jar": "pkg:maven/com.sun.solaris/embedded_su4j@1.1", + "/packages/hudson.war:WEB-INF/lib/ezmorph-1.0.3.jar": "pkg:maven/net.sf.ezmorph/ezmorph@1.0.3", + "/packages/hudson.war:WEB-INF/lib/graph-layouter-1.0.jar": "pkg:maven/org.kohsuke/graph-layouter@1.0", + "/packages/hudson.war:WEB-INF/lib/groovy-all-1.6.0.jar": "pkg:maven/org.codehaus.groovy/groovy-all@1.6.0", "/packages/hudson.war:WEB-INF/lib/guava-r06.jar": "pkg:maven/com.google.guava/guava@r06", "/packages/hudson.war:WEB-INF/lib/hudson-core-1.390.jar": "pkg:maven/org.jvnet.hudson.main/hudson-core@1.390", "/packages/hudson.war:WEB-INF/lib/j-interop-2.0.5.jar": "pkg:maven/j-interop/j-interop@2.0.5",