From 8aa331c4b9ddb12f08c6b0d1fb291613723b3452 Mon Sep 17 00:00:00 2001 From: Agustin Isasmendi Date: Mon, 20 Jan 2025 12:49:11 +0100 Subject: [PATCH 1/3] ES-102: Exclude log4j-simple --- pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6b075ff..c6d059e 100644 --- a/pom.xml +++ b/pom.xml @@ -179,14 +179,9 @@ single - - - ${exec.mainClass} - - - with-dependencies-excluded-slf4j + with-dependencies-excluded-slf4j-simple jar @@ -197,7 +192,6 @@ true true - org.slf4j:slf4j-api org.slf4j:slf4j-simple From 022629dd67b44666691d1dfec3cdf998c22b0d06 Mon Sep 17 00:00:00 2001 From: Agustin Isasmendi Date: Mon, 20 Jan 2025 14:42:22 +0100 Subject: [PATCH 2/3] replace target name on pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c6d059e..afcfd55 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ - with-dependencies-excluded-slf4j-simple + with-dependencies-exclude-slf4j-simple jar @@ -296,4 +296,4 @@ - \ No newline at end of file + From 5e27530920b1b4e110afe4c8696da34c66d46101 Mon Sep 17 00:00:00 2001 From: Jeronimo Ortiz <166400360+ortizjeronimo@users.noreply.github.com> Date: Mon, 20 Jan 2025 15:28:21 -0300 Subject: [PATCH 3/3] corrected comment --- src/main/java/com/scanoss/ScannerPostProcessor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/scanoss/ScannerPostProcessor.java b/src/main/java/com/scanoss/ScannerPostProcessor.java index 009fa3a..ebb8dcc 100644 --- a/src/main/java/com/scanoss/ScannerPostProcessor.java +++ b/src/main/java/com/scanoss/ScannerPostProcessor.java @@ -257,7 +257,6 @@ private ScanFileDetails createUpdatedResultDetails(ScanFileDetails existingCompo .build(); } - /** * Applies remove rules to scan results, filtering out matches based on certain criteria. *

@@ -265,8 +264,8 @@ private ScanFileDetails createUpdatedResultDetails(ScanFileDetails existingCompo * - Rule must match either both path and purl, just the path, or just the purl *

* Then, for each matched result: - * 1. If none of the matching rules define line ranges -> Remove the result - * 2. If any matching rules define line ranges -> Only remove if the result's lines overlap with any rule's line range + * 1. If none of the matching rules define line ranges → Remove the result + * 2. If any matching rules define line ranges → Only remove if the result's lines overlap with any rule's line range * * @param results The list of scan results to process * @param rules The list of remove rules to apply