Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Sonarcloud integration #375

Merged
merged 6 commits into from
Jan 12, 2024
Merged

Fix Sonarcloud integration #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a85308a
Fix sonar project key
louisjdmartin Jan 5, 2024
d1976a0
Fix sonar settings in pom.xml
louisjdmartin Jan 5, 2024
c6ccb1c
Upgrade Java version for scan
louisjdmartin Jan 8, 2024
13321c9
Use Java 17 for CI
louisjdmartin Jan 8, 2024
7fbb82f
Cleaning sonar-project.properties
louisjdmartin Jan 8, 2024
f2f1190
Update version in pom.xml
louisjdmartin Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/java-continuous-integration.yml
View file
Open in desktop
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' ]
java: [ '11', '17' ]
louisjdmartin marked this conversation as resolved.
Show resolved Hide resolved
name: Java ${{ matrix.Java }} CI
steps:
- name: Check out repository code
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
java-version: '17'
- name: Cache Maven packages
uses: actions/cache@v2
with:
Expand All @@ -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.organization=lequal -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.token=$SONAR_TOKEN
6 changes: 4 additions & 2 deletions pom.xml
View file
Open in desktop
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.2.0</version>
<version>4.3.0</version>
<packaging>sonar-plugin</packaging>

<name>SonarQube CNES Report</name>
Expand All @@ -33,12 +33,14 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<junit.version>5.9.2</junit.version>
<jacoco.version>0.8.8</jacoco.version>
<jacoco.version>0.8.11</jacoco.version>
<sonar.apiVersion>9.8.0.203</sonar.apiVersion>
<sonar.testingHarnessVersion>9.5.0.56709</sonar.testingHarnessVersion>
<sonar.Version>9.9.0.65466</sonar.Version>
<sonar-packaging-maven-plugin.version>1.21.0.505</sonar-packaging-maven-plugin.version>
<sonar.pluginKey>cnesreport</sonar.pluginKey>
<sonar.organization>lequal</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.pluginUrl>https://github.com/cnescatlab/sonar-cnes-report</sonar.pluginUrl>
<sonar.pluginOrganizationName>CNES</sonar.pluginOrganizationName>
<sonar.sources>src/main/java</sonar.sources>
Expand Down
4 changes: 1 addition & 3 deletions sonar-project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
sonar.projectKey=cnesreport
sonar.projectName=cnesreport
sonar.projectVersion=3.3.0
# Other infos (project key, version, sonarcloud url, etc. are set in the pom.xml)
sonar.projectDescription=Export SonarQube report for a specific project.
sonar.sources=src/main
sonar.tests=src/test/ut
Expand Down
Loading