Skip to content

Commit f591bfd

Browse files
authored
Merge pull request #381 from cnescatlab/dev
Fix CI and update package
2 parents f7ab23b + 1717443 commit f591bfd

File tree

4 files changed

+196
-55
lines changed

4 files changed

+196
-55
lines changed

.github/workflows/java-continuous-integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
java: [ '11' ]
18+
java: [ '11', '17' ]
1919
name: Java ${{ matrix.Java }} CI
2020
steps:
2121
- name: Check out repository code
@@ -97,7 +97,7 @@ jobs:
9797
uses: actions/setup-java@v2
9898
with:
9999
distribution: 'adopt'
100-
java-version: '11'
100+
java-version: '17'
101101
- name: Cache Maven packages
102102
uses: actions/cache@v2
103103
with:
@@ -122,4 +122,4 @@ jobs:
122122
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
123123
# SonarCloud access token should be generated from https://sonarcloud.io/account/security/
124124
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
125-
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.organization=lequal -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
125+
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.token=$SONAR_TOKEN

pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>fr.cnes.sonar</groupId>
88
<artifactId>cnesreport</artifactId>
9-
<version>4.2.0</version>
9+
<version>4.3.0</version>
1010
<packaging>sonar-plugin</packaging>
1111

1212
<name>SonarQube CNES Report</name>
@@ -33,12 +33,14 @@
3333
<maven.compiler.source>11</maven.compiler.source>
3434
<maven.compiler.target>11</maven.compiler.target>
3535
<junit.version>5.9.2</junit.version>
36-
<jacoco.version>0.8.8</jacoco.version>
36+
<jacoco.version>0.8.11</jacoco.version>
3737
<sonar.apiVersion>9.8.0.203</sonar.apiVersion>
3838
<sonar.testingHarnessVersion>9.5.0.56709</sonar.testingHarnessVersion>
3939
<sonar.Version>9.9.0.65466</sonar.Version>
4040
<sonar-packaging-maven-plugin.version>1.21.0.505</sonar-packaging-maven-plugin.version>
4141
<sonar.pluginKey>cnesreport</sonar.pluginKey>
42+
<sonar.organization>lequal</sonar.organization>
43+
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
4244
<sonar.pluginUrl>https://github.com/cnescatlab/sonar-cnes-report</sonar.pluginUrl>
4345
<sonar.pluginOrganizationName>CNES</sonar.pluginOrganizationName>
4446
<sonar.sources>src/main/java</sonar.sources>
@@ -153,7 +155,7 @@
153155
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
154156
<groupId>com.google.guava</groupId>
155157
<artifactId>guava</artifactId>
156-
<version>31.1-jre</version>
158+
<version>32.0.0-jre</version>
157159
</dependency>
158160
<dependency>
159161
<!-- json parsing -->

sonar-project.properties

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
sonar.projectKey=cnesreport
2-
sonar.projectName=cnesreport
3-
sonar.projectVersion=3.3.0
1+
# Other infos (project key, version, sonarcloud url, etc. are set in the pom.xml)
42
sonar.projectDescription=Export SonarQube report for a specific project.
53
sonar.sources=src/main
64
sonar.tests=src/test/ut

0 commit comments

Comments
 (0)