Skip to content

Commit 514b39f

Browse files
committed
Don't use older Maven in workflows
1 parent d1965a7 commit 514b39f

File tree

3 files changed

+3
-30
lines changed

3 files changed

+3
-30
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,6 @@ jobs:
8080
java-version: '8'
8181
cache: maven
8282

83-
# Need to downgrade Maven in order to allow HTTP (not HTTPS) packages to be downloaded.
84-
# This is necessary as HTTP repositories were blocked in Maven 3.8.1
85-
# HTTP repositories are used in some outdated dependenciesns
86-
# This step can be removed once KLASS packages have been updated to more recent versions
87-
- name: Set up Maven
88-
uses: stCarolas/setup-maven@v4.5
89-
with:
90-
maven-version: 3.6.3
91-
9283
# Build only klass-forvaltning with JDK 1.8
9384
- name: Build, test and package with Maven
9485
run: mvn --batch-mode --update-snapshots package -Djava.version=1.8 -pl :klass-forvaltning -am -P github

.github/workflows/klass-forvaltning-build-and-deploy.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Klass-forvaltning build and deploy
22

33
on:
44
release:
5-
types: [published]
5+
types: [ published ]
66
push:
7-
# branches:
8-
# - nais-migration
7+
# branches:
8+
# - nais-migration
99
paths:
1010
- "klass-forvaltning/**"
1111
- "klass-shared/**"
@@ -30,15 +30,6 @@ jobs:
3030
java-version: '8'
3131
cache: 'maven'
3232

33-
# Need to downgrade Maven in order to allow HTTP (not HTTPS) packages to be downloaded.
34-
# This is necessary as HTTP repositories were blocked in Maven 3.8.1
35-
# HTTP repositories are used in some outdated dependenciesns
36-
# This step can be removed once KLASS packages have been updated to more recent versions
37-
- name: Set up Maven
38-
uses: stCarolas/setup-maven@v4.5
39-
with:
40-
maven-version: 3.6.3
41-
4233
- name: Build with Maven
4334
working-directory: klass-forvaltning
4435
run: mvn -B install -P github -DskipTests

.github/workflows/tests.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@ jobs:
3737
java-version: '8'
3838
cache: maven
3939

40-
# Need to downgrade Maven in order to allow HTTP (not HTTPS) packages to be downloaded.
41-
# This is necessary as HTTP repositories were blocked in Maven 3.8.1
42-
# HTTP repositories are used in some outdated dependenciesns
43-
# This step can be removed once KLASS packages have been updated to more recent versions
44-
- name: Set up Maven
45-
uses: stCarolas/setup-maven@v4.5
46-
with:
47-
maven-version: 3.6.3
48-
4940
# Build only klass-forvaltning with JDK 1.8
5041
- name: Build, test and package with Maven
5142
run: mvn --batch-mode --update-snapshots package -Djava.version=1.8 -pl :klass-forvaltning -am -P github

0 commit comments

Comments
 (0)