Skip to content

Commit a0e990c

Browse files
colinfyfecolinfyfe
authored
Merge branch 'DependencyTrack:master' into fix-issue-4507-suppressed-vulns
2 parents 13a587f + ba50feb commit a0e990c

File tree

10 files changed

+61
-35
lines changed

10 files changed

+61
-35
lines changed

‎.github/ISSUE_TEMPLATE/defect-report.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ body:
6969
- 4.13.1
7070
- 4.13.2
7171
- 4.13.3
72+
- 4.13.4
7273
- 4.14.0-SNAPSHOT
7374
validations:
7475
required: true

‎.github/workflows/_meta-build.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout Repository
30-
uses: actions/checkout@v4.2.2
30+
uses: actions/checkout@v5.0.0
3131

3232
- name: Set up NodeJs
3333
uses: actions/[email protected]
@@ -57,10 +57,10 @@ jobs:
5757

5858
steps:
5959
- name: Checkout Repository
60-
uses: actions/checkout@v4.2.2
60+
uses: actions/checkout@v5.0.0
6161

6262
- name: Download Artifacts
63-
uses: actions/download-artifact@v4.3.0
63+
uses: actions/download-artifact@v5.0.0
6464
with:
6565
name: assembled-frontend
6666

‎.github/workflows/ci-publish.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fi
2121
2222
- name: Checkout Repository
23-
uses: actions/checkout@v4.2.2
23+
uses: actions/checkout@v5.0.0
2424

2525
- name: Parse Version from package.json
2626
id: parse
@@ -47,10 +47,10 @@ jobs:
4747
- call-build
4848
steps:
4949
- name: Checkout Repository
50-
uses: actions/checkout@v4.2.2
50+
uses: actions/checkout@v5.0.0
5151

5252
- name: Download Artifacts
53-
uses: actions/download-artifact@v4.3.0
53+
uses: actions/download-artifact@v5.0.0
5454
with:
5555
name: assembled-frontend
5656

‎.github/workflows/ci-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout Repository
24-
uses: actions/checkout@v4.2.2
24+
uses: actions/checkout@v5.0.0
2525

2626
- name: Set up NodeJs
2727
uses: actions/[email protected]

‎.github/workflows/codeql-analysis.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v4.2.2
32+
uses: actions/checkout@v5.0.0
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL

‎.github/workflows/dependency-review.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout Repository
13-
uses: actions/checkout@v4.2.2
13+
uses: actions/checkout@v5.0.0
1414

1515
- name: Dependency Review
1616
uses: actions/dependency-review-action@v4

‎.github/workflows/i18n.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout Repository
21-
uses: actions/checkout@v4.2.2
21+
uses: actions/checkout@v5.0.0
2222

2323
- name: Set up NodeJs
2424
uses: actions/[email protected]

‎.github/workflows/lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout Repository
21-
uses: actions/checkout@v4.2.2
21+
uses: actions/checkout@v5.0.0
2222

2323
- name: Set up NodeJs
2424
uses: actions/[email protected]

‎docker/Dockerfile.alpine‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginxinc/nginx-unprivileged:1.29.0-alpine@sha256:094aa5b178bb09e30761325e37ff053aa4382e1e372a2a5dcd73b24170483b70
1+
FROM nginxinc/nginx-unprivileged:1.29.1-alpine@sha256:5fed1af03cc6e82fe276efec6fbfc6c5659d42b4e6f1f45ddccd2758f8c1d8ab
22

33
# Arguments that can be passed at build time
44
ARG COMMIT_SHA=unknown

‎src/views/policy/LicenseGroupList.vue‎

Lines changed: 48 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -105,30 +105,55 @@ export default {
105105
i18n,
106106
template: `
107107
<div>
108-
<b-row class="expanded-row">
109-
<b-col sm="6">
110-
<b-input-group-form-input id="input-license-group-name" :label="$t('message.name')" input-group-size="mb-3"
111-
required="true" type="text" v-model="name" lazy="true" autofocus="true"
112-
v-debounce:750ms="updateLicenseGroup" :debounce-events="'keyup'" />
113-
</b-col>
114-
<b-col sm="6">
115-
</b-col>
116-
</b-row>
117-
<b-row class="expanded-row">
118-
<b-col sm="12">
119-
<b-form-group :label="this.$t('message.licenses')">
120-
<div class="list-group">
121-
<span v-for="license in licenses">
122-
<actionable-list-group-item :value="license.name" :delete-icon="true" v-on:actionClicked="removeLicense(license)"/>
123-
</span>
124-
<actionable-list-group-item :add-icon="true" v-on:actionClicked="$root.$emit('bv::show::modal', 'selectLicenseModal')"/>
108+
<b-row class="expanded-row">
109+
<b-col sm="6">
110+
<b-input-group-form-input id="input-license-group-name" :label="$t('message.name')" input-group-size="mb-3"
111+
required="true" type="text" v-model="name" lazy="true" autofocus="true"
112+
v-debounce:750ms="updateLicenseGroup" :debounce-events="'keyup'" />
113+
</b-col>
114+
<b-col sm="6">
115+
</b-col>
116+
</b-row>
117+
<b-row class="expanded-row">
118+
<b-col sm="12">
119+
<b-form-group>
120+
<div>
121+
<div class="font-weight-bold mb-2">
122+
<b-row>
123+
<b-col md="8">{{$t('message.name')}}</b-col>
124+
<b-col md="3">{{$t('message.spdx_license_id')}}</b-col>
125+
<b-col md="1"></b-col>
126+
</b-row>
127+
</div>
128+
<div v-for="license in licenses" :key="license.uuid" class="mb-2">
129+
<b-row class="align-items-center">
130+
<b-col md="8" class="d-flex align-items-center">{{ license.name }}</b-col>
131+
<b-col md="3" class="d-flex align-items-center text-muted">
132+
<a
133+
v-if="license.licenseId"
134+
:href="'/portfolio/licenses/' + encodeURIComponent(license.licenseId)"
135+
>
136+
{{ license.licenseId }}
137+
</a>
138+
<span v-else>-</span>
139+
</b-col>
140+
<b-col md="1" class="d-flex align-items-center justify-content-end">
141+
<b-button size="sm" variant="outline-danger" @click="removeLicense(license)">
142+
<span class="fa fa-trash"></span>
143+
</b-button>
144+
</b-col>
145+
</b-row>
146+
</div>
147+
<div>
148+
<actionable-list-group-item :add-icon="true" v-on:actionClicked="$root.$emit('bv::show::modal', 'selectLicenseModal')" />
149+
</div>
150+
</div>
151+
</b-form-group>
152+
<div style="text-align:right">
153+
<b-button variant="outline-danger" @click="deleteLicenseGroup">{{ $t('message.delete_license_group') }}</b-button>
125154
</div>
126-
</b-form-group>
127-
<div style="text-align:right">
128-
<b-button variant="outline-danger" @click="deleteLicenseGroup">{{ $t('message.delete_license_group') }}</b-button>
129-
</div>
130-
</b-col>
131-
</b-row>
155+
</b-col>
156+
</b-row>
132157
<select-license-modal v-on:selection="updateLicenseSelection" />
133158
</div>
134159
`,

0 commit comments

Comments
 (0)