Skip to content

Commit 69e1506

Browse files
authored
Merge pull request #462 from finos/github-actions-update
Updated plugins for github actions
2 parents 040d8a3 + fbf3f1f commit 69e1506

File tree

7 files changed

+66
-67
lines changed

7 files changed

+66
-67
lines changed

.github/workflows/build-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Checkout repo
1616
uses: actions/checkout@v2
1717
- name: Cache Maven dependencies
18-
uses: actions/cache@v2
18+
uses: actions/cache@v3
1919
env:
2020
cache-name: cache-mvn-modules
2121
with:

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Checkout repo
1919
uses: actions/checkout@v2
2020
- name: Cache Maven dependencies
21-
uses: actions/cache@v2
21+
uses: actions/cache@v3
2222
env:
2323
cache-name: cache-mvn-modules
2424
with:

.github/workflows/cve-scanning.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ name: CVE Scanning for Maven
33
on:
44
pull_request:
55
paths:
6-
- 'pom.xml'
7-
- '.github/workflows/cve-scanning.yml'
6+
- "pom.xml"
7+
- ".github/workflows/cve-scanning.yml"
88
push:
99
paths:
10-
- 'pom.xml'
11-
- '.github/workflows/cve-scanning.yml'
10+
- "pom.xml"
11+
- ".github/workflows/cve-scanning.yml"
1212
schedule:
1313
# Run every day at 5am and 5pm
14-
- cron: '0 5,17 * * *'
15-
14+
- cron: "0 5,17 * * *"
1615

1716
jobs:
18-
depchecktest:
17+
depchecktest:
1918
runs-on: ubuntu-latest
2019
name: depcheck_test
2120
steps:
@@ -24,28 +23,28 @@ jobs:
2423
- name: Setup JDK 17
2524
uses: actions/setup-java@v3
2625
with:
27-
java-version: '17'
28-
distribution: 'temurin'
26+
java-version: "17"
27+
distribution: "temurin"
2928
- name: Build with Maven
30-
run: mvn install
29+
run: mvn install
3130
- name: Depcheck
3231
uses: dependency-check/Dependency-Check_Action@1b5d19fd4a32ff0ff982e8c9d8e27dbf7ac8a46c
3332
id: Depcheck
3433
env:
3534
JAVA_HOME: /opt/jdk
3635
with:
37-
project: 'spring-bot'
38-
format: 'HTML'
39-
path: '.'
40-
out: 'reports' # this is the default, no need to specify unless you wish to override it
36+
project: "spring-bot"
37+
format: "HTML"
38+
path: "."
39+
out: "reports" # this is the default, no need to specify unless you wish to override it
4140
args: >
4241
--suppression ./.github/workflows/allow-list.xml
4342
--failOnCVSS 5
4443
--enableRetired
45-
44+
4645
- name: Upload Test results
4746
if: ${{ always() }}
48-
uses: actions/upload-artifact@v3
47+
uses: actions/upload-artifact@v4
4948
with:
5049
name: Depcheck report
5150
path: ${{ github.workspace }}/reports

.github/workflows/license-check.yml

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,51 @@ name: License Scanning for Maven
22

33
on:
44
schedule:
5-
- cron: '0 8,18 * * 1-5'
5+
- cron: "0 8,18 * * 1-5"
66
push:
77
paths:
8-
- 'maven/pom.xml'
9-
- '.github/workflows/license-check.yml'
10-
- '.github/workflows/acceptable-licenses.txt'
8+
- "maven/pom.xml"
9+
- ".github/workflows/license-check.yml"
10+
- ".github/workflows/acceptable-licenses.txt"
1111

1212
jobs:
1313
scan:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
17-
- name: Cache Maven dependencies
18-
uses: actions/cache@v2
19-
env:
20-
cache-name: cache-mvn-modules
21-
with:
22-
path: ~/.m2
23-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
24-
restore-keys: |
25-
${{ runner.os }}-build-${{ env.cache-name }}-
26-
${{ runner.os }}-build-
27-
${{ runner.os }}-
28-
- name: Set up JDK 17
29-
uses: actions/setup-java@v3
30-
with:
31-
java-version: 17
32-
distribution: 'adopt'
33-
- name: Install XQ
34-
run: pip install xq
35-
- name: Download deps and plugins
36-
run: mvn de.qaware.maven:go-offline-maven-plugin:resolve-dependencies
37-
- name: Build
38-
run: mvn install -DskipTests
39-
- name: License XML report
40-
run: |
41-
mvn org.codehaus.mojo:license-maven-plugin:2.0.0:aggregate-download-licenses
42-
- name: Validate XML report
43-
run: |
44-
ALLOW_LICENSES=`cat .github/workflows/acceptable-licenses.txt | sed "s|<name>|name='|" | sed "s|</name>|' |" | tr -s '\n' '~' | sed 's/\~/or /g' `
45-
xq "//dependency[count(licenses/license[${ALLOW_LICENSES}])=0]" target/generated-resources/aggregate-licenses.xml > target/license-issues.xml
46-
LINES_FOUND=`cat target/license-issues.xml | grep "<result>" | wc -l`
47-
if [ $LINES_FOUND -gt 0 ]; then cat target/license-issues.xml ; exit -1; fi
48-
- name: Upload license XML Issues
49-
uses: actions/upload-artifact@v3
50-
with:
51-
name: license-xml-report
52-
path: 'target/license-issues.xml'
16+
- uses: actions/checkout@v3
17+
- name: Cache Maven dependencies
18+
uses: actions/cache@v3
19+
env:
20+
cache-name: cache-mvn-modules
21+
with:
22+
path: ~/.m2
23+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
24+
restore-keys: |
25+
${{ runner.os }}-build-${{ env.cache-name }}-
26+
${{ runner.os }}-build-
27+
${{ runner.os }}-
28+
- name: Set up JDK 17
29+
uses: actions/setup-java@v3
30+
with:
31+
java-version: 17
32+
distribution: "adopt"
33+
- name: Install XQ
34+
run: pip install xq
35+
- name: Download deps and plugins
36+
run: mvn de.qaware.maven:go-offline-maven-plugin:resolve-dependencies
37+
- name: Build
38+
run: mvn install -DskipTests
39+
- name: License XML report
40+
run: |
41+
mvn org.codehaus.mojo:license-maven-plugin:2.0.0:aggregate-download-licenses
42+
- name: Validate XML report
43+
run: |
44+
ALLOW_LICENSES=`cat .github/workflows/acceptable-licenses.txt | sed "s|<name>|name='|" | sed "s|</name>|' |" | tr -s '\n' '~' | sed 's/\~/or /g' `
45+
xq "//dependency[count(licenses/license[${ALLOW_LICENSES}])=0]" target/generated-resources/aggregate-licenses.xml > target/license-issues.xml
46+
LINES_FOUND=`cat target/license-issues.xml | grep "<result>" | wc -l`
47+
if [ $LINES_FOUND -gt 0 ]; then cat target/license-issues.xml ; exit -1; fi
48+
- name: Upload license XML Issues
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: license-xml-report
52+
path: "target/license-issues.xml"

.github/workflows/semgrep.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ on: [push, pull_request]
55
jobs:
66
semgrep:
77
name: run-semgrep
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-22.04
99
container:
1010
image: returntocorp/semgrep
1111
steps:
12-
- uses: actions/checkout@v3
13-
- run: semgrep scan --error --config auto
14-
env:
15-
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
12+
- uses: actions/checkout@v3
13+
- run: semgrep scan --error --config auto
14+
env:
15+
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}

libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<dependency>
114114
<groupId>com.azure</groupId>
115115
<artifactId>azure-core-http-netty</artifactId>
116-
<version>1.14.1</version> <!-- Replace with property -->
116+
<version>${azure-core-http-netty.version}</version>
117117
</dependency>
118118

119119
<dependency>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
<properties>
5151
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
52-
<spring-boot.version>3.4.0</spring-boot.version>
52+
<spring-boot.version>3.4.5</spring-boot.version>
5353
<maven.compiler.source>17</maven.compiler.source>
5454
<maven.compiler.target>17</maven.compiler.target>
5555
<java.version>17</java.version>
@@ -70,7 +70,7 @@
7070
<symphony-bdk.version>3.0.0</symphony-bdk.version>
7171
<!--<mimepull.version>1.9.15</mimepull.version>-->
7272
<!--<thymeleaf.version>2.7.0</thymeleaf.version>-->
73-
<azure-core-http-netty.version>1.9.1</azure-core-http-netty.version>
73+
<azure-core-http-netty.version>1.15.11</azure-core-http-netty.version>
7474
<nimbus-jose-jwt.version>9.9.1</nimbus-jose-jwt.version>
7575
<httpclient.version>4.5.13</httpclient.version>
7676
<corenlp.version>4.5.7</corenlp.version>

0 commit comments

Comments
 (0)