Skip to content

Commit 747db61

Browse files
testowertestower
committed
Merge branch 'master' into feature/cli
2 parents 4a4630a + f0ae622 commit 747db61

File tree

7 files changed

+86
-35
lines changed

7 files changed

+86
-35
lines changed

‎.github/workflows/build-external.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Build pull request
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
jobs:
7+
maven-verify:
8+
if: github.event.pull_request.head.repo.fork == true
9+
runs-on: ubuntu-24.04
10+
steps:
11+
- uses: actions/checkout@v5
12+
with:
13+
fetch-depth: 0
14+
- uses: actions/setup-java@v5
15+
with:
16+
java-version: 17.0.13
17+
distribution: liberica
18+
- name: Cache Maven dependencies
19+
uses: actions/cache@v4
20+
with:
21+
path: ~/.m2/repository
22+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
23+
restore-keys: |
24+
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
25+
${{ runner.os }}-maven-
26+
${{ runner.os }}-
27+
- name: Run maven build
28+
run: mvn install -PprettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm

‎.github/workflows/build.yml‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,50 @@ on:
33
pull_request:
44
branches:
55
- master
6+
env:
7+
JFROG_USER: ${{ secrets.ARTIFACTORY_AUTH_USER }}
8+
JFROG_PASS: ${{ secrets.ARTIFACTORY_AUTH_TOKEN }}
9+
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
610
jobs:
7-
maven-verify:
8-
if: github.event.pull_request.head.repo.fork == true
11+
maven-package:
12+
if: github.event.pull_request.head.repo.fork == false
913
runs-on: ubuntu-24.04
1014
steps:
1115
- uses: actions/checkout@v5
1216
with:
1317
fetch-depth: 0
18+
- name: Copy maven settings
19+
run: |
20+
wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings.xml -O .github/workflows/settings.xml
1421
- uses: actions/setup-java@v5
1522
with:
1623
java-version: 17.0.13
1724
distribution: liberica
18-
#- name: Cache Maven dependencies
19-
# uses: actions/cache@v4
20-
# with:
21-
# path: ~/.m2/repository
22-
# key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
23-
# restore-keys: |
24-
# ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
25-
# ${{ runner.os }}-maven-
26-
# ${{ runner.os }}-
25+
- name: Cache Maven dependencies
26+
uses: actions/cache@v4
27+
with:
28+
path: ~/.m2/repository
29+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
30+
restore-keys: |
31+
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
32+
${{ runner.os }}-maven-
33+
${{ runner.os }}-
2734
- name: Run maven build
28-
run: mvn install -PprettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
35+
run: mvn verify -s .github/workflows/settings.xml -PprettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
36+
- name: Sonar Scan
37+
env:
38+
SONAR_TOKEN: ${{ secrets.ENTUR_SONAR_PASSWORD }}
39+
SONAR_PROJECT_NAME: ${{ github.event.repository.name }}
40+
SONAR_PROJECT_KEY: entur_${{ github.event.repository.name }}
41+
run: |
42+
mvn -Psonar -s .github/workflows/settings.xml \
43+
sonar:sonar \
44+
-Dsonar.projectKey=${SONAR_PROJECT_KEY} \
45+
-Dsonar.organization=enturas-github \
46+
-Dsonar.projectName=${SONAR_PROJECT_NAME} \
47+
-Dsonar.host.url=https://sonarcloud.io \
48+
-Dsonar.token=${SONAR_TOKEN}
49+
- name: Upload artifact
50+
uses: actions/upload-artifact@v4.6.2
51+
with:
52+
path: gbfs-validator-java/target/*.jar

‎.github/workflows/deploy.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
name: Build and Deploy Maven Central
2+
3+
concurrency:
4+
group: deploy-master
5+
cancel-in-progress: false
6+
27
on:
38
push:
49
branches:
510
- master
6-
pull_request:
7-
branches:
8-
- master
9-
concurrency:
10-
group: master-release
11-
cancel-in-progress: false
1211
env:
1312
JFROG_USER: ${{ secrets.ARTIFACTORY_AUTH_USER }}
1413
JFROG_PASS: ${{ secrets.ARTIFACTORY_AUTH_TOKEN }}
@@ -19,7 +18,7 @@ env:
1918
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
2019
jobs:
2120
maven-package:
22-
if: github.event.pull_request.head.repo.fork == false && !contains(github.event.head_commit.message, 'ci skip')
21+
if: github.event_name == 'push' && !contains(github.event.head_commit.message, 'ci skip')
2322
runs-on: ubuntu-24.04
2423
steps:
2524
- uses: actions/checkout@v5

‎gbfs-validator-java-api/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.entur.gbfs</groupId>
77
<artifactId>gbfs-validator-java-parent</artifactId>
8-
<version>2.0.52-SNAPSHOT</version>
8+
<version>2.0.56-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>gbfs-validator-java-api</artifactId>
@@ -37,9 +37,9 @@
3737
<java.version>17</java.version>
3838
<maven.compiler.source>17</maven.compiler.source>
3939
<maven.compiler.target>17</maven.compiler.target>
40-
<junit.version>5.10.2</junit.version>
40+
<junit.version>6.0.0</junit.version>
4141
<mockito.version>5.11.0</mockito.version>
42-
<junit-platform.version>1.10.2</junit-platform.version>
42+
<junit-platform.version>6.0.0</junit-platform.version>
4343
<openapi-generator-maven-plugin>6.0.0</openapi-generator-maven-plugin>
4444
</properties>
4545

@@ -125,18 +125,18 @@
125125
<dependency>
126126
<groupId>org.entur.gbfs</groupId>
127127
<artifactId>gbfs-validator-java-loader</artifactId>
128-
<version>2.0.52-SNAPSHOT</version>
128+
<version>2.0.56-SNAPSHOT</version>
129129
</dependency>
130130

131131
<dependency>
132132
<groupId>org.entur.gbfs</groupId>
133133
<artifactId>gbfs-validator-java</artifactId>
134-
<version>2.0.52-SNAPSHOT</version>
134+
<version>2.0.56-SNAPSHOT</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>com.google.guava</groupId>
138138
<artifactId>guava</artifactId>
139-
<version>32.1.3-jre</version>
139+
<version>33.5.0-jre</version>
140140
</dependency>
141141

142142
<dependency>
@@ -189,15 +189,15 @@
189189
<dependency>
190190
<groupId>org.eclipse.jetty</groupId>
191191
<artifactId>jetty-servlet</artifactId>
192-
<version>9.4.53.v20231009</version>
192+
<version>11.0.26</version>
193193
<scope>test</scope>
194194
</dependency>
195195

196196
<!-- Jetty util dependency required by Spring Boot Test -->
197197
<dependency>
198198
<groupId>org.eclipse.jetty</groupId>
199199
<artifactId>jetty-util</artifactId>
200-
<version>9.4.53.v20231009</version>
200+
<version>12.1.1</version>
201201
<scope>test</scope>
202202
</dependency>
203203
</dependencies>

‎gbfs-validator-java-loader/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.entur.gbfs</groupId>
88
<artifactId>gbfs-validator-java-parent</artifactId>
9-
<version>2.0.52-SNAPSHOT</version>
9+
<version>2.0.56-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>gbfs-validator-java-loader</artifactId>
@@ -18,16 +18,16 @@
1818
<maven.compiler.source>17</maven.compiler.source>
1919
<maven.compiler.target>17</maven.compiler.target>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21-
<junit.version>5.10.2</junit.version>
22-
<wiremock.version>2.35.1</wiremock.version>
21+
<junit.version>6.0.0</junit.version>
22+
<wiremock.version>3.0.1</wiremock.version>
2323
<mockito.version>5.11.0</mockito.version>
2424
</properties>
2525

2626
<dependencies>
2727
<dependency>
2828
<groupId>org.json</groupId>
2929
<artifactId>json</artifactId>
30-
<version>20240303</version>
30+
<version>20250517</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>commons-io</groupId>

‎gbfs-validator-java/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<parent>
55
<groupId>org.entur.gbfs</groupId>
66
<artifactId>gbfs-validator-java-parent</artifactId>
7-
<version>2.0.52-SNAPSHOT</version>
7+
<version>2.0.56-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>gbfs-validator-java</artifactId>
11-
<version>2.0.52-SNAPSHOT</version>
11+
<version>2.0.56-SNAPSHOT</version>
1212
<packaging>jar</packaging>
1313

1414
<name>gbfs-validator-java</name>
@@ -71,7 +71,7 @@
7171

7272
<!-- Unit test frameworks versions -->
7373
<assertj.core.version>3.27.6</assertj.core.version>
74-
<junit.version>5.13.4</junit.version>
74+
<junit.version>6.0.0</junit.version>
7575
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
7676
</properties>
7777

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.entur.gbfs</groupId>
66
<artifactId>gbfs-validator-java-parent</artifactId>
7-
<version>2.0.52-SNAPSHOT</version>
7+
<version>2.0.56-SNAPSHOT</version>
88

99
<packaging>pom</packaging>
1010

0 commit comments

Comments
 (0)