Merge pull request #149 from RHEcosystemAppEng/hotfix/maven-import-sc…

…ope-excluded-sa fix: 2 bugs of gradle and maven
RHEcosystemAppEng · Jul 28, 2024 · a79b900 · a79b900
2 parents c0639d7 + 02e4851
commit a79b900
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/providers/base_java.js b/src/providers/base_java.js
@@ -46,8 +46,8 @@ export default class Base_Java {
 			if (targetDepth === srcDepth + 1) {
 				let from = this.parseDep(src);
 				let to = this.parseDep(target);
-				let matchedScope = target.match(/:compile|:provided|:runtime|:test|:system/g)
-				let matchedScopeSrc = src.match(/:compile|:provided|:runtime|:test|:system/g)
+				let matchedScope = target.match(/:compile|:provided|:runtime|:test|:system|:import/g)
+				let matchedScopeSrc = src.match(/:compile|:provided|:runtime|:test|:system|:import/g)
 				// only add dependency to sbom if it's not with test scope or if it's root
 				if ((matchedScope && matchedScope[0] !== ":test" && (matchedScopeSrc && matchedScopeSrc[0] !== ":test")) || (srcDepth == 0 && matchedScope && matchedScope[0] !== ":test")) {
 					sbom.addDependency(sbom.purlToComponent(from), to)

diff --git a/src/providers/java_gradle.js b/src/providers/java_gradle.js
@@ -393,7 +393,7 @@ export default class Java_gradle extends Base_java {
 		// 	Dependency line is of form String Notation
 		} else {
 			let depParts
-			if(depToBeIgnored.match(/^[a-z]+\s/)) {
+			if(depToBeIgnored.match(/^[a-zA-Z]+\s/)) {
 				depParts = depToBeIgnored.split(" ")[1].split(":");
 			}
 			else {