Skip to content

Commit 0c46fd7

Browse files
pulledtimpulledtim
authored
reenable combatibility checks (#207)
* reenable combatibility checks * use token for orionld version call * replace deprecated github actions * replace deprecated plugin * coverall down for maintenance * fixed micronaut logger property * Reenable coverall after it returned from maintenance mode * jdk17 compatible jacoco
1 parent cf19506 commit 0c46fd7

File tree

12 files changed

+29
-28
lines changed

12 files changed

+29
-28
lines changed

‎.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020

2121
- uses: actions/setup-java@v1
2222
with:
@@ -40,7 +40,7 @@ jobs:
4040
steps:
4141
- uses: technote-space/workflow-conclusion-action@v2
4242
- name: Checkout
43-
uses: actions/checkout@v1
43+
uses: actions/checkout@v4
4444

4545
- name: Comment PR
4646
if: env.WORKFLOW_CONCLUSION == 'failure'

‎.github/workflows/doc.yml

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

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

1515
- uses: actions/setup-java@v1
1616
with:

‎.github/workflows/matrix-compat.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- id: mintaka-version
15-
uses: wistefan/get-releases-by-semver@0.1.1
15+
uses: wistefan/get-releases-by-semver@master
1616
with:
1717
include: "MINOR"
1818
repository: fiware/mintaka
@@ -25,6 +25,7 @@ jobs:
2525
minMinor: "6"
2626
versionField: "TAG-NAME"
2727
repository: fiware/context.Orion-LD
28+
token: ${{ secrets.ADMIN_TOKEN }}
2829

2930
outputs:
3031
mintaka-matrix: ${{ steps.mintaka-version.outputs.releases }}
@@ -41,7 +42,7 @@ jobs:
4142

4243
steps:
4344

44-
- uses: actions/checkout@v2
45+
- uses: actions/checkout@v4
4546

4647
- uses: wistefan/check-compatibility@master
4748
id: check-compatibility
@@ -58,7 +59,7 @@ jobs:
5859
java-version: '17'
5960
java-package: jdk
6061

61-
- uses: actions/checkout@v2
62+
- uses: actions/checkout@v4
6263
with:
6364
ref: ${{ matrix.mintaka }}
6465

@@ -95,7 +96,7 @@ jobs:
9596
compatible: "False"
9697

9798
- name: Upload report
98-
uses: actions/upload-artifact@v2
99+
uses: actions/upload-artifact@v4
99100
with:
100101
name: ${{ matrix.orion }}-${{ matrix.mintaka }}
101102
path: compatibility.json
@@ -105,7 +106,7 @@ jobs:
105106
runs-on: ubuntu-latest
106107
steps:
107108

108-
- uses: actions/checkout@v2
109+
- uses: actions/checkout@v4
109110
with:
110111
ref: compat-matrix
111112

@@ -114,7 +115,7 @@ jobs:
114115
git config user.name "$GITHUB_ACTOR"
115116
git config user.email "[email protected]"
116117
117-
- uses: actions/download-artifact@v2
118+
- uses: actions/download-artifact@v4
118119
with:
119120
path: results
120121
token: ${{ secrets.ADMIN_TOKEN }}

‎.github/workflows/prerelease.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
version: ${{ steps.out.outputs.version }}
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

2323
- id: bump
2424
uses: zwaldowski/match-label-action@v1
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545

4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848

4949
- uses: actions/setup-java@v1
5050
with:
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565

6666
steps:
67-
- uses: actions/checkout@v2
67+
- uses: actions/checkout@v4
6868

6969
- uses: actions/setup-java@v1
7070
with:
@@ -89,7 +89,7 @@ jobs:
8989

9090
steps:
9191

92-
- uses: actions/checkout@v2
92+
- uses: actions/checkout@v4
9393

9494
- uses: "marvinpinto/action-automatic-releases@latest"
9595
with:

‎.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
version: ${{ steps.out.outputs.version }}
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1818

1919
- uses: actions/setup-java@v1
2020
with:
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ubuntu-latest
4444

4545
steps:
46-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v4
4747

4848
- uses: actions/setup-java@v1
4949
with:
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565

6666
steps:
67-
- uses: actions/checkout@v2
67+
- uses: actions/checkout@v4
6868

6969
- uses: actions/setup-java@v1
7070
with:
@@ -89,7 +89,7 @@ jobs:
8989

9090
steps:
9191

92-
- uses: actions/checkout@v2
92+
- uses: actions/checkout@v4
9393

9494
- uses: "marvinpinto/action-automatic-releases@latest"
9595
with:

‎.github/workflows/static.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
analyze:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111

1212
- name: Set up JDK
1313
uses: actions/setup-java@v1

‎.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
repo: context.Orion-LD
1717
excludes: prerelease, draft
1818

19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020

2121
- uses: actions/setup-java@v1
2222
with:
2323
java-version: '17'
2424
java-package: jdk
2525

2626
- name: Run tests
27-
run: mvn clean test coveralls:jacoco -Dcoveralls.token=${{ secrets.COVERALLS_TOKEN }}
27+
run: mvn clean test coveralls:report -Dcoveralls.token=${{ secrets.COVERALLS_TOKEN }}
2828
env:
2929
ORION_IMAGE: fiware/orion-ld:${{ steps.orion-version.outputs.release }}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ The following table concentrates on the most important configuration parameters
9999
| `datasources.default.database` | `DATASOURCES_DEFAULT_DATABASE` | Name of the default database, needs to coincide with orion-ld | orion |
100100
| `datasources.default.username` | `DATASOURCES_DEFAULT_USERNAME` | Username to be used for db connections | orion |
101101
| `datasources.default.password` | `DATASOURCES_DEFAULT_PASSWORD` | Password to be used for db connections | orion |
102-
| `loggers.levels.ROOT` | `LOGGERS_LEVELS_ROOT` | Root log level of mintaka | ERROR |
102+
| `logger.levels.ROOT` | `LOGGER_LEVELS_ROOT` | Root log level of mintaka | ERROR |
103103
| `basepath` | `BASEPATH` | The basepath to be used for the api. Could for example be `/ngsi-ld/v1` | `` |
104104

105105
#### Operations

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
<version.org.mockito.mockito-all>1.10.19</version.org.mockito.mockito-all>
8787
<version.org.mockito.mockito-junit-jupiter>4.2.0</version.org.mockito.mockito-junit-jupiter>
8888
<version.org.awaitility>4.0.3</version.org.awaitility>
89-
<version.org.jacoco.maven-plugin>0.8.7</version.org.jacoco.maven-plugin>
90-
<version.org.eluder.coveralls.maven-plugin>2.2.0</version.org.eluder.coveralls.maven-plugin>
89+
<version.org.jacoco.maven-plugin>0.8.8</version.org.jacoco.maven-plugin>
90+
<version.com.github.hazendaz.maven.coveralls-maven-plugin>4.5.0-M6</version.com.github.hazendaz.maven.coveralls-maven-plugin>
9191
<version.com.github.spotbugs.maven-plugin>4.5.2.0</version.com.github.spotbugs.maven-plugin>
9292
<version.org.apache.maven.plugins.maven-site-plugin>3.9.1</version.org.apache.maven.plugins.maven-site-plugin>
9393
<version.org.apache.maven.plugins.maven-javadoc-plugin>3.2.0</version.org.apache.maven.plugins.maven-javadoc-plugin>
@@ -558,9 +558,9 @@
558558
</executions>
559559
</plugin>
560560
<plugin>
561-
<groupId>org.eluder.coveralls</groupId>
561+
<groupId>com.github.hazendaz.maven</groupId>
562562
<artifactId>coveralls-maven-plugin</artifactId>
563-
<version>${version.org.eluder.coveralls.maven-plugin}</version>
563+
<version>${version.com.github.hazendaz.maven.coveralls-maven-plugin}</version>
564564
<configuration>
565565
<repoToken>${coveralls.token}</repoToken>
566566
</configuration>

‎src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ jpa:
5151
# set to true if you want to see the queries.
5252
show_sql: false
5353

54-
loggers:
54+
logger:
5555
levels:
5656
ROOT: ERROR

0 commit comments

Comments
 (0)