Skip to content

Commit df96346

Browse files
authored
Merge branch 'eclipse-sw360:main' into master
2 parents 7d081f8 + 09ababc commit df96346

File tree

272 files changed

+13691
-3638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+13691
-3638
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ updates:
33
- package-ecosystem: github-actions
44
directory: /
55
schedule:
6-
interval: daily
6+
interval: weekly
77

88
- package-ecosystem: docker
99
directory: /
1010
schedule:
11-
interval: daily
11+
interval: weekly
1212

1313
- package-ecosystem: maven
1414
directory: /
1515
schedule:
16-
interval: daily
16+
interval: weekly

.github/testForLicenseHeaders.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ done <<< "$(git ls-files \
4040
| grep -v 'id_rsa' \
4141
| grep -v '.versions' \
4242
| grep -v '.github/*' \
43+
| grep -v 'third-party/*' \
4344
| grep -v 'scripts/lint/checkstyle.xml' \
4445
| grep -v 'scripts/lint/google_checks.xml' \
4546
| grep -v 'sw360.code-workspace' \

.github/workflows/build_and_test.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -----------------------------------------------------------------------------
22
# Copyright Siemens AG, 2021.
3+
# Copyright Helio Chissini de Castro 2022-2025
34
# Part of the SW360 Portal Project.
45
#
56
# This program and the accompanying materials are made
@@ -14,16 +15,20 @@ name: SW360 Build and Test
1415

1516
on:
1617
pull_request:
17-
branches: [main]
18+
branches:
19+
- main
1820
paths-ignore:
19-
- "**.md"
20-
- ".github/workflows/docker_deploy.yml"
21-
- ".github/workflows/scorecard.yml"
21+
- third-party/**
22+
- Dockerfile
23+
- docker_build.sh
24+
- .github/sw360_container.yml
25+
- .github/thrift_container.yml
2226
workflow_dispatch:
2327

2428
env:
2529
COUCHDB_USER: sw360
2630
COUCHDB_PASSWORD: sw360fossie
31+
THRIFT_VERSION: "0.20.0"
2732

2833
permissions:
2934
contents: read
@@ -35,7 +40,7 @@ jobs:
3540

3641
steps:
3742
- name: Harden Runner
38-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
43+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
3944
with:
4045
egress-policy: audit
4146

@@ -47,10 +52,6 @@ jobs:
4752
chmod +x .github/testForLicenseHeaders.sh
4853
bash .github/testForLicenseHeaders.sh
4954
50-
- name: Set environment variables
51-
run: |
52-
cat .versions >> $GITHUB_ENV
53-
5455
- name: Setup CouchDB
5556
run: scripts/startCouchdbForTests.sh
5657

@@ -62,16 +63,15 @@ jobs:
6263
sudo sed -i 's/^couchdb.password\s*=/& '${COUCHDB_PASSWORD}'/' /etc/sw360/couchdb-test.properties
6364
6465
- name: Set up JDK 21
65-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
66+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6667
with:
6768
java-version: "21"
6869
distribution: "temurin"
6970
check-latest: true
70-
cache: "maven"
7171

7272
- name: Cache Thrift
7373
id: cache-thrift
74-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
74+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
7575
with:
7676
path: |
7777
${{ github.workspace }}/dist/thrift-${{ env.THRIFT_VERSION }}
@@ -84,8 +84,8 @@ jobs:
8484
run: |
8585
sudo apt-get update -qq
8686
sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq build-essential libevent-dev libtool flex bison pkg-config libssl-dev git cmake
87-
chmod +x scripts/install-thrift.sh
88-
DESTDIR=${{ github.workspace }}/dist/thrift-${{ env.THRIFT_VERSION }} scripts/install-thrift.sh
87+
chmod +x third-party/thrift/install-thrift.sh
88+
DESTDIR=${{ github.workspace }}/dist/thrift-${{ env.THRIFT_VERSION }} third-party/thrift/install-thrift.sh
8989
9090
- name: Build SW360
9191
run: |

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
6060
steps:
6161
- name: Harden Runner
62-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
62+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
6363
with:
6464
egress-policy: audit
6565

@@ -68,7 +68,7 @@ jobs:
6868

6969
# Initializes the CodeQL tools for scanning.
7070
- name: Initialize CodeQL
71-
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
71+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
7272
with:
7373
languages: ${{ matrix.language }}
7474
build-mode: ${{ matrix.build-mode }}
@@ -96,6 +96,6 @@ jobs:
9696
exit 1
9797
9898
- name: Perform CodeQL Analysis
99-
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
99+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
100100
with:
101101
category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
20+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
2121
with:
2222
egress-policy: audit
2323

2424
- name: 'Checkout Repository'
2525
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
27+
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1

.github/workflows/docker_deploy.yml

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

.github/workflows/scorecard.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Harden Runner
34-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
34+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
3535
with:
3636
egress-policy: audit
3737

@@ -41,20 +41,20 @@ jobs:
4141
persist-credentials: false
4242

4343
- name: "Run analysis"
44-
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
44+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
4545
with:
4646
results_file: results.sarif
4747
results_format: sarif
4848
publish_results: true
4949

5050
- name: "Upload artifact"
51-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
51+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5252
with:
5353
name: SARIF file
5454
path: results.sarif
5555
retention-days: 5
5656

5757
- name: "Upload to code-scanning"
58-
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
58+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
5959
with:
6060
sarif_file: results.sarif

0 commit comments

Comments
 (0)