Skip to content

Commit df4ba9e

Browse files
Updating the libraries
Updating dependencies Fixing the existing Sonar scanner issie
1 parent 59702f2 commit df4ba9e

File tree

3 files changed

+40
-23
lines changed

3 files changed

+40
-23
lines changed

.github/workflows/maven-test.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,10 @@ jobs:
1515
strategy:
1616
matrix:
1717
java:
18-
- 8
19-
- 9
2018
- 11
21-
- 12
22-
- 13
23-
- 14
19+
- 17
2420
steps:
25-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v1
2622
with:
2723
fetch-depth: 0
2824
- name: 'Set up JDK ${{ matrix.java }}'

.github/workflows/sonar-scan.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,27 @@ jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
17+
18+
- name: Set up JDK
19+
uses: actions/setup-java@v1
20+
with:
21+
java-version: 17
22+
java-package: jdk
23+
24+
- uses: actions/checkout@v1
1825
with:
1926
fetch-depth: 0
27+
2028
- name: Check for external PR
2129
if: ${{ !(contains(github.event.pull_request.labels.*.name, 'safe') ||
2230
github.event.pull_request.head.repo.full_name == github.repository ||
2331
github.event_name != 'pull_request_target') }}
2432
run: echo "Unsecure PR, must be labelled with the 'safe' label, then run the workflow again" && exit 1
25-
- name: Set up JDK
26-
uses: actions/setup-java@v1
27-
with:
28-
java-version: 11
33+
2934
- name: Build with Maven
30-
run: mvn clean install -Dgpg.signature.skip=true --file pom.xml
35+
run: >-
36+
mvn clean install -Dgpg.signature.skip=true --file pom.xml
37+
3138
- name: Sonar Scan
3239
env:
3340
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'

pom.xml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
<properties>
1616
<okhttp2-version>2.7.5</okhttp2-version>
17-
<okhttp3-version>4.8.1</okhttp3-version>
18-
<google-api-client-version>1.23.0</google-api-client-version>
17+
<okhttp3-version>4.12.0</okhttp3-version>
18+
<google-api-client-version>2.3.0</google-api-client-version>
1919
<feign-version>9.7.0</feign-version>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<gpg.signature.skip>false</gpg.signature.skip>
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>org.mockito</groupId>
109109
<artifactId>mockito-core</artifactId>
110-
<version>3.5.5</version>
110+
<version>5.10.0</version>
111111
<scope>test</scope>
112112
</dependency>
113113

@@ -135,7 +135,7 @@
135135
<dependency>
136136
<groupId>net.minidev</groupId>
137137
<artifactId>json-smart</artifactId>
138-
<version>2.4.9</version>
138+
<version>2.5.0</version>
139139
<scope>test</scope>
140140
</dependency>
141141

@@ -163,9 +163,23 @@
163163

164164
<profiles>
165165
<profile>
166-
<id>java11+</id>
166+
<id>java11</id>
167167
<activation>
168-
<jdk>[11,)</jdk>
168+
<jdk>11</jdk>
169+
</activation>
170+
<properties>
171+
<!-- The Javadoc generation started to fail with OpenJDK 11.0.2 (11.0.1 was OK) and OpenJDK 12-ea:
172+
"The code being documented uses modules but the packages defined in
173+
https://docs.oracle.com/javase/7/docs/api/ are in the unnamed module."
174+
See: https://bugs.openjdk.java.net/browse/JDK-8212233
175+
-->
176+
<maven.javadoc.skip>true</maven.javadoc.skip>
177+
</properties>
178+
</profile>
179+
<profile>
180+
<id>java17</id>
181+
<activation>
182+
<jdk>17</jdk>
169183
</activation>
170184
<properties>
171185
<!-- The Javadoc generation started to fail with OpenJDK 11.0.2 (11.0.1 was OK) and OpenJDK 12-ea:
@@ -184,7 +198,7 @@
184198
<plugin>
185199
<groupId>org.apache.maven.plugins</groupId>
186200
<artifactId>maven-compiler-plugin</artifactId>
187-
<version>3.8.1</version>
201+
<version>3.12.1</version>
188202
<configuration>
189203
<source>1.8</source>
190204
<target>1.8</target>
@@ -196,7 +210,7 @@
196210
<plugin>
197211
<groupId>org.jacoco</groupId>
198212
<artifactId>jacoco-maven-plugin</artifactId>
199-
<version>0.8.5</version>
213+
<version>0.8.7</version>
200214
<executions>
201215
<execution>
202216
<id>pre-unit-test</id>
@@ -216,7 +230,7 @@
216230
<plugin>
217231
<groupId>org.apache.maven.plugins</groupId>
218232
<artifactId>maven-gpg-plugin</artifactId>
219-
<version>1.6</version>
233+
<version>3.1.0</version>
220234
<executions>
221235
<execution>
222236
<id>sign-artifacts</id>
@@ -233,7 +247,7 @@
233247
<plugin>
234248
<groupId>org.apache.maven.plugins</groupId>
235249
<artifactId>maven-source-plugin</artifactId>
236-
<version>3.2.1</version>
250+
<version>3.3.0</version>
237251
<executions>
238252
<execution>
239253
<id>attach-sources</id>
@@ -246,7 +260,7 @@
246260
<plugin>
247261
<groupId>org.apache.maven.plugins</groupId>
248262
<artifactId>maven-javadoc-plugin</artifactId>
249-
<version>3.2.0</version>
263+
<version>3.6.3</version>
250264
<executions>
251265
<execution>
252266
<id>generate-javadoc</id>

0 commit comments

Comments
 (0)