Merge pull request #22 from scanoss/feat/support-ignore-include

feat: Add suport ignore/include

Author: isasmendiagus

.gitignore

@@ -11,6 +11,7 @@ target/
 *.iws
 *.iml
 *.ipr
+.idea
 
 ### Eclipse ###
 .apt_generated

.idea/.gitignore

@@ -11,13 +11,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Upcoming changes...
 
-## [0.7.3] - 2024-09-12
+
+## [0.9.0] - 2025-02-03
 ### Added
-- Added variables `DEFAULT_BASE_URL` and `DEFAULT_BASE_URL2` to separate the scan URL from the scan path
+- Add support to rules: include & ignore
 
-## [0.7.2] - 2024-04-17
+## [0.8.2] - 2025-01-23
+### Changed
+- Updates scope on dependencies pom.xml
+- Publish workflow
+
+## [0.8.0] - 2025-01-21
 ### Added
 - Added [tagging workflow](.github/workflows/version-tag.yml) to aid release generation
+- Added variables `DEFAULT_BASE_URL` and `DEFAULT_BASE_URL2` to separate the scan URL from the scan path
+- Adds support to rules: replace & remove
 
 ## [0.7.1] - 2024-04-12
 ### Changed
@@ -76,10 +84,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.2.0] - 2023-07-04
 ### Added
 - First pass at the following Classes
-    - Fingerprinting ([Winnowing](src/main/java/com/scanoss/Winnowing.java))
-    - Scanning ([Scanner](src/main/java/com/scanoss/Scanner.java))
-    - REST Interface ([ScanApi](src/main/java/com/scanoss/rest/ScanApi.java))
-    - JSON Utils ([JsonUtils](src/main/java/com/scanoss/utils/JsonUtils.java))
+  - Fingerprinting ([Winnowing](src/main/java/com/scanoss/Winnowing.java))
+  - Scanning ([Scanner](src/main/java/com/scanoss/Scanner.java))
+  - REST Interface ([ScanApi](src/main/java/com/scanoss/rest/ScanApi.java))
+  - JSON Utils ([JsonUtils](src/main/java/com/scanoss/utils/JsonUtils.java))
 - CLI ([CommandLine](src/main/java/com/scanoss/cli/CommandLine.java))
 
 [0.2.0]: https://github.com/scanoss/scanoss.java/compare/v0.0.0...v0.2.0
@@ -94,5 +102,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [0.6.1]: https://github.com/scanoss/scanoss.java/compare/v0.6.0...v0.6.1
 [0.7.0]: https://github.com/scanoss/scanoss.java/compare/v0.6.1...v0.7.0
 [0.7.1]: https://github.com/scanoss/scanoss.java/compare/v0.7.0...v0.7.1
-[0.7.2]: https://github.com/scanoss/scanoss.java/compare/v0.7.1...v0.7.2
-[0.7.3]: https://github.com/scanoss/scanoss.java/compare/v0.7.2...v0.7.3
+[0.8.0]: https://github.com/scanoss/scanoss.java/compare/v0.7.1...v0.8.0
+[0.8.1]: https://github.com/scanoss/scanoss.java/compare/v0.8.0...v0.8.1
+[0.9.0]: https://github.com/scanoss/scanoss.java/compare/v0.8.1...v0.9.0

.idea/encodings.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.scanoss</groupId>
     <artifactId>scanoss</artifactId>
-    <version>0.8.2</version>
+    <version>0.9.0</version>
     <packaging>jar</packaging>
     <name>scanoss.java</name>
     <url>https://github.com/scanoss/scanoss.java</url>
@@ -181,6 +181,34 @@
                             </descriptorRefs>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>without-slf4j</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <inlineDescriptors>
+                                <inlineDescriptor>
+                                    <id>with-dependencies-exclude-slf4j-simple</id>
+                                    <formats>
+                                        <format>jar</format>
+                                    </formats>
+                                    <includeBaseDirectory>false</includeBaseDirectory>
+                                    <dependencySets>
+                                        <dependencySet>
+                                            <outputDirectory>/</outputDirectory>
+                                            <useProjectArtifact>true</useProjectArtifact>
+                                            <unpack>true</unpack>
+                                            <excludes>
+                                                <exclude>org.slf4j:slf4j-simple</exclude>
+                                            </excludes>
+                                        </dependencySet>
+                                    </dependencySets>
+                                </inlineDescriptor>
+                            </inlineDescriptors>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

.idea/inspectionProfiles/Project_Default.xml

@@ -127,7 +127,7 @@ private Scanner(Boolean skipSnippets, Boolean allExtensions, Boolean obfuscate,
                         .build());
         this.scanApi = Objects.requireNonNullElseGet(scanApi, () ->
                 ScanApi.builder().url(url).apiKey(apiKey).timeout(timeout).retryLimit(retryLimit).flags(scanFlags)
-                        .sbomType(sbomType).sbom(sbom).customCert(customCert).proxy(proxy)
+                        .sbomType(sbomType).sbom(sbom).customCert(customCert).proxy(proxy).settings(settings)
                         .build());
         this.scanFileProcessor = Objects.requireNonNullElseGet(scanFileProcessor, () ->
                 ScanFileProcessor.builder().winnowing(this.winnowing).scanApi(this.scanApi).build());

.idea/misc.xml

@@ -36,7 +36,6 @@
 import lombok.Builder;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
@@ -77,6 +76,10 @@ public List<ScanFileResult> process(@NonNull List<ScanFileResult> scanFileResult
         log.info("Starting scan results processing with {} results", scanFileResults.size());
         log.debug("BOM configuration - Remove rules: {}, Replace rules: {}", removeSize, replaceSize);
 
+        if (scanFileResults.isEmpty()) {
+            log.info("No scan results found. Skipping: {}", bom);
+        }
+
         buildPurl2ComponentDetailsMap(scanFileResults);
         List<ScanFileResult> processedResults = new ArrayList<>(scanFileResults);
         if (removeSize > 0) {
@@ -109,6 +112,11 @@ private void buildPurl2ComponentDetailsMap(@NonNull List<ScanFileResult> scanFil
             }
             // Iterate through file details
             for (ScanFileDetails details : fileDetails) {
+                if (details != null && details.getMatchType() == MatchType.none) {
+                    log.warn("Skipping no match for file: {}", result.getFilePath());
+                    continue;
+                }
+
                 String[] purls = details != null ? details.getPurls() : null;
                 if (purls == null) {
                     log.warn("Null details or empty scan file result details. Skipping: {}", details);