Skip to content

Commit 8263f54

Browse files
committed
- scanner now uses scancode service
- removed extract inventory from pom (deprecated) - updated release workflow
1 parent eb67071 commit 8263f54

18 files changed

+21
-331
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,17 @@ jobs:
6262
.mirror
6363
.maven-index
6464
65+
- name: Install Maven
66+
run: |
67+
MVN_VER=3.9.11
68+
wget -q https://downloads.apache.org/maven/maven-3/${MVN_VER}/binaries/apache-maven-${MVN_VER}-bin.tar.gz
69+
sudo tar -xzf apache-maven-${MVN_VER}-bin.tar.gz -C /opt/
70+
sudo mv /opt/apache-maven-${MVN_VER} /opt/maven
71+
echo "/opt/maven/bin" >> "$GITHUB_PATH"
72+
6573
- name: Run tests
6674
shell: bash
67-
run: |
75+
run: |
6876
./tests/scripts/pipelines/run_workspace-001.sh
6977
./tests/scripts/pipelines/run_workspace-002.sh
7078

processors/extract/extract_inventory-from-pom.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

processors/extract/extract_inventory-from-pom.xml

Lines changed: 0 additions & 91 deletions
This file was deleted.

processors/mirror/mirror_update-index_external.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Mirror - Update Index external
22

33
This processor created or updates the indices of the mirror. It uses the previously downloaded data files of the
4-
external data sources. As a result the specified mirror directory is extended by the index files. The main difference to
5-
the processor [extract_inventory-from-pom](../extract/extract_inventory-from-pom.md) is that some advisories are excluded.
4+
external data sources. As a result the specified mirror directory is extended by the index files.
65

76
## Properties
87

processors/scan/scan_scan-inventory.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,3 @@ of this repository.
1414
| output.inventory.file | yes | The scanned output inventory file path. |
1515
| input.output.analysis.base.dir | yes | The directory in which the scanner caches information on artifacts. Increases speed drastically between multiple scanner runs. |
1616
| input.properties.file | yes | Yaml file containing properties to configure the scanners behaviour. |
17-
18-
### Environment
19-
| Property | Required | Explanation |
20-
|-------------------------------|----------|--------------------------------------------------------------------------------------------------------------------------------|
21-
| env.scancode.binary.file | yes | The path where the ScanCode Toolkit is installed. |

processors/scan/scan_scan-inventory.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@
8282
<requireProperty>
8383
<property>input.properties.file</property>
8484
</requireProperty>
85-
<requireProperty>
86-
<property>env.scancode.binary.file</property>
87-
</requireProperty>
8885
</rules>
8986
<fail>true</fail>
9087
</configuration>

tests/resources/workbench/configs/resolver/artifact-resolver-config.yaml

Lines changed: 0 additions & 67 deletions
This file was deleted.

tests/resources/workbench/configs/resolver/artifact-resolver-proxy.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/resources/workbench/configs/scanner/scan-control.properties

Lines changed: 0 additions & 22 deletions
This file was deleted.

tests/scripts/cases/analyze/analyze_resolve-inventory-01.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
export INPUT_INVENTORY_FILE="$WORKSPACE_001_DIR/sample-product-1.0.0/01_assets/example-001.xlsx"
44
export OUTPUT_INVENTORY_FILE="$RESOLVED_DIR_001/example-001-resolved.xlsx"
55
export DOWNLOAD_BASE_DIR="$KONTINUUM_DIR/.maven-index"
6-
export ARTIFACT_RESOLVER_CONFIG="$INTERNAL_WORKBENCH_DIR/configs/resolver/artifact-resolver-config.yaml"
7-
export PROXY_CONFIG="$INTERNAL_WORKBENCH_DIR/configs/resolver/artifact-resolver-proxy.yaml"
6+
export ARTIFACT_RESOLVER_CONFIG="$EXTERNAL_WORKBENCH_DIR/config/resolver/artifact-resolver-config.yaml"
7+
export PROXY_CONFIG="$EXTERNAL_WORKBENCH_DIR/config/resolver/artifact-resolver-proxy.yaml"

0 commit comments

Comments
 (0)