Skip to content

Commit 861b16a

Browse files
jpgough-msjpgough-ms
authored
Merge branch 'main' into renovate/org.apache.maven.plugins-maven-compiler-plugin-3.x
2 parents 79ffc78 + 58030da commit 861b16a

File tree

14 files changed

+199
-57
lines changed

14 files changed

+199
-57
lines changed

‎.github/maven-cve-ignore-list.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3-
</suppressions>
3+
<!-- Suppress quarkus-run.jar -->
4+
<suppress>
5+
<filePath regex="true">.*quarkus-run\.jar</filePath>
6+
<cvssBelow>10.0</cvssBelow>
7+
</suppress>
8+
</suppressions>

‎.github/workflows/cve-scanning-maven.yml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CVE Scanning for Maven
1+
name: CVE Scanning for Maven Projects
22

33
on:
44
workflow_dispatch:
@@ -22,20 +22,24 @@ jobs:
2222
matrix:
2323
java-version: [ '21' ]
2424
module-folder: [
25-
'translator'
25+
'translator',
26+
'calm-hub'
2627
]
2728
steps:
2829
- name: Checkout
2930
uses: actions/checkout@v4
31+
3032
- name: Setup JDK
3133
uses: actions/setup-java@v4
3234
with:
3335
java-version: ${{ matrix.java-version }}
3436
cache: maven
3537
distribution: 'adopt'
38+
3639
- name: Build with Maven
37-
run: mvn clean install -Dmaven.test.skip=true
40+
run: mvn -DskipTests verify
3841
working-directory: ${{ matrix.module-folder }}
42+
3943
- name: Depcheck
4044
uses: dependency-check/Dependency-Check_Action@main
4145
id: Depcheck
@@ -45,15 +49,20 @@ jobs:
4549
project: '${{ matrix.module-folder }}'
4650
path: '${{ matrix.module-folder }}'
4751
format: 'HTML'
48-
out: '${{ matrix.module-folder }}-reports' # this is the default, no need to specify unless you wish to override it
52+
out: '${{ matrix.module-folder }}-reports'
4953
args: >
50-
--suppression .github/maven-cve-ignore-list.xml
51-
--failOnCVSS 5
52-
--enableRetired
54+
--suppression .github/maven-cve-ignore-list.xml
55+
--failOnCVSS 5
56+
--enableRetired
57+
--exclude "**/package.json"
58+
--exclude "**/package-lock.json"
59+
--disableNodeAudit
60+
--disableYarnAudit
61+
--disableRetireJS
5362
5463
- name: Upload Test results
5564
if: ${{ always() }}
5665
uses: actions/upload-artifact@v4
5766
with:
5867
name: Depcheck report ${{ github.job }} ${{ matrix.module-folder }}
59-
path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports
68+
path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports

‎calm-hub/src/main/resources/META-INF/resources/asset-manifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"files": {
3-
"main.css": "/static/css/main.f623b4d2.css",
4-
"main.js": "/static/js/main.dd97ff64.js",
3+
"main.css": "/static/css/main.8ddf1820.css",
4+
"main.js": "/static/js/main.6a928fc7.js",
55
"static/media/pfbg_992@2x.jpg": "/static/media/pfbg_992@2x.30e8d31f821a144fe52c.jpg",
66
"static/media/pfbg_768@2x.jpg": "/static/media/pfbg_768@2x.eea28e73c0df6dbbb1ff.jpg",
77
"static/media/pfbg_2000.jpg": "/static/media/pfbg_2000.3b693db01ef2135e3f14.jpg",
@@ -76,11 +76,11 @@
7676
"static/media/pficon.woff2": "/static/media/pficon.e888fa788db9794c334f.woff2",
7777
"static/media/status-icon-sprite.svg": "/static/media/status-icon-sprite.4fee9fefc3971799d2dd.svg",
7878
"index.html": "/index.html",
79-
"main.f623b4d2.css.map": "/static/css/main.f623b4d2.css.map",
80-
"main.dd97ff64.js.map": "/static/js/main.dd97ff64.js.map"
79+
"main.8ddf1820.css.map": "/static/css/main.8ddf1820.css.map",
80+
"main.6a928fc7.js.map": "/static/js/main.6a928fc7.js.map"
8181
},
8282
"entrypoints": [
83-
"static/css/main.f623b4d2.css",
84-
"static/js/main.dd97ff64.js"
83+
"static/css/main.8ddf1820.css",
84+
"static/js/main.6a928fc7.js"
8585
]
8686
}

‎calm-hub/src/main/resources/META-INF/resources/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>CALM Hub</title><script defer="defer" src="/static/js/main.dd97ff64.js"></script><link href="/static/css/main.f623b4d2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>CALM Hub</title><script defer="defer" src="/static/js/main.6a928fc7.js"></script><link href="/static/css/main.8ddf1820.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

‎calm-hub/src/main/resources/META-INF/resources/static/css/main.8ddf1820.css‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎calm-hub/src/main/resources/META-INF/resources/static/css/main.8ddf1820.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎calm-hub/src/main/resources/META-INF/resources/static/css/main.f623b4d2.css‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎calm-hub/src/main/resources/META-INF/resources/static/css/main.f623b4d2.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎calm-hub/src/main/resources/META-INF/resources/static/js/main.dd97ff64.js‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎calm-hub/src/main/resources/META-INF/resources/static/js/main.dd97ff64.js.LICENSE.txt‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/**
2+
* @license React
3+
* react-dom.production.min.js
4+
*
5+
* Copyright (c) Facebook, Inc. and its affiliates.
6+
*
7+
* This source code is licensed under the MIT license found in the
8+
* LICENSE file in the root directory of this source tree.
9+
*/
10+
11+
/**
12+
* @license React
13+
* react-jsx-runtime.production.min.js
14+
*
15+
* Copyright (c) Facebook, Inc. and its affiliates.
16+
*
17+
* This source code is licensed under the MIT license found in the
18+
* LICENSE file in the root directory of this source tree.
19+
*/
20+
21+
/**
22+
* @license React
23+
* react.production.min.js
24+
*
25+
* Copyright (c) Facebook, Inc. and its affiliates.
26+
*
27+
* This source code is licensed under the MIT license found in the
28+
* LICENSE file in the root directory of this source tree.
29+
*/
30+
31+
/**
32+
* @license React
33+
* scheduler.production.min.js
34+
*
35+
* Copyright (c) Facebook, Inc. and its affiliates.
36+
*
37+
* This source code is licensed under the MIT license found in the
38+
* LICENSE file in the root directory of this source tree.
39+
*/

0 commit comments

Comments
 (0)