Skip to content

Fix CI and update package #381

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.

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

Merged
merged 23 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 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
dd5d9f1
Merge pull request #375 from cnescatlab/fix-ci
louisjdmartin Jan 12, 2024
693c27a
Bump semver from 5.7.1 to 5.7.2
dependabot[bot] Jan 12, 2024
80182c8
Merge pull request #379 from cnescatlab/dependabot/npm_and_yarn/semve…
Topin2001 Jan 12, 2024
230fb51
Bump ua-parser-js from 0.7.28 to 0.7.37
dependabot[bot] Jan 12, 2024
b8e8c28
Merge pull request #372 from cnescatlab/dependabot/npm_and_yarn/ua-pa…
Topin2001 Jan 12, 2024
dd05b84
Bump terser from 4.8.0 to 4.8.1
dependabot[bot] Jan 12, 2024
8b00883
Merge pull request #325 from cnescatlab/dependabot/npm_and_yarn/terse…
louisjdmartin Jan 18, 2024
8393e1a
Bump com.google.guava:guava from 31.1-jre to 32.0.0-jre
dependabot[bot] Jan 19, 2024
c2a8de3
Merge pull request #370 from cnescatlab/dependabot/maven/com.google.g…
Topin2001 Jan 19, 2024
c5cf311
Bump loader-utils from 1.4.0 to 1.4.2
dependabot[bot] Jan 19, 2024
58dc0ca
Merge pull request #337 from cnescatlab/dependabot/npm_and_yarn/loade…
Topin2001 Jan 19, 2024
c9acc50
Bump decode-uri-component from 0.2.0 to 0.2.2
dependabot[bot] Jan 19, 2024
e7dc993
Merge pull request #341 from cnescatlab/dependabot/npm_and_yarn/decod…
Topin2001 Jan 19, 2024
56ae175
Bump browserify-sign from 4.2.1 to 4.2.2
dependabot[bot] Jan 19, 2024
a9ac0b5
Merge pull request #377 from cnescatlab/dependabot/npm_and_yarn/brows…
Topin2001 Jan 19, 2024
48c7952
Bump @babel/traverse from 7.15.0 to 7.23.7
dependabot[bot] Jan 19, 2024
1717443
Merge pull request #378 from cnescatlab/dependabot/npm_and_yarn/babel…
Topin2001 Jan 19, 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
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' ]
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
8 changes: 5 additions & 3 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.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 Expand Up @@ -153,7 +155,7 @@
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<version>32.0.0-jre</version>
</dependency>
<dependency>
<!-- json parsing -->
Expand Down
4 changes: 1 addition & 3 deletions sonar-project.properties
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