Skip to content

ES-102: Exclude log4j-simple #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isasmendiagus merged 3 commits into from
Jan 21, 2025
Merged

ES-102: Exclude log4j-simple #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8aa331c
ES-102: Exclude log4j-simple
isasmendiagus Jan 20, 2025
022629d
replace target name on pom.xml
isasmendiagus Jan 20, 2025
5e27530
corrected comment
ortizjeronimo Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,9 @@
<goal>single</goal>
</goals>
<configuration>
<archive>
<manifest>
<mainClass>${exec.mainClass}</mainClass>
</manifest>
</archive>
<inlineDescriptors>
<inlineDescriptor>
<id>with-dependencies-excluded-slf4j</id>
<id>with-dependencies-exclude-slf4j-simple</id>
<formats>
<format>jar</format>
</formats>
Expand All @@ -197,7 +192,6 @@
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<excludes>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-simple</exclude>
</excludes>
</dependencySet>
Expand Down Expand Up @@ -302,4 +296,4 @@
</build>
</profile>
</profiles>
</project>
</project>
5 changes: 2 additions & 3 deletions src/main/java/com/scanoss/ScannerPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,15 @@ private ScanFileDetails createUpdatedResultDetails(ScanFileDetails existingCompo
.build();
}


/**
* Applies remove rules to scan results, filtering out matches based on certain criteria.
* <p>
* First, matches are found based on path and/or purl:
* - Rule must match either both path and purl, just the path, or just the purl
* <p>
* 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 &rarr; Remove the result
* 2. If any matching rules define line ranges &rarr; 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
Expand Down
Loading