Skip to content

Commit

Permalink
Merge pull request #386 from cnescatlab/java_21
Browse files Browse the repository at this point in the history
Java 21
  • Loading branch information
louisjdmartin authored Feb 7, 2024
2 parents 1717443 + 3bb5f05 commit 14e83e5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/java-continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '17' ]
java: [ '17' ]
name: Java ${{ matrix.Java }} CI
steps:
- name: Check out repository code
Expand Down Expand Up @@ -122,4 +122,4 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SonarCloud access token should be generated from https://sonarcloud.io/account/security/
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.token=$SONAR_TOKEN
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.token=$SONAR_TOKEN
13 changes: 8 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>fr.cnes.sonar</groupId>
<artifactId>cnesreport</artifactId>
<version>4.3.0</version>
<version>4.3.1</version>
<packaging>sonar-plugin</packaging>

<name>SonarQube CNES Report</name>
Expand All @@ -29,9 +29,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.min.version>11</jdk.min.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<jdk.min.version>17</jdk.min.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<junit.version>5.9.2</junit.version>
<jacoco.version>0.8.11</jacoco.version>
<sonar.apiVersion>9.8.0.203</sonar.apiVersion>
Expand Down Expand Up @@ -216,7 +216,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.1.1</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -315,6 +315,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M8</version>
<configuration>
<argLine>-Djava.security.manager=allow</argLine>
</configuration>
</plugin>

<plugin>
Expand Down

0 comments on commit 14e83e5

Please sign in to comment.