Skip to content

Commit

Permalink
Merge pull request #125 from lequal/dev
Browse files Browse the repository at this point in the history
Fix #124 : compatibility with Java 8
  • Loading branch information
Sancretor authored Mar 10, 2020
2 parents 7abf07a + 1eaafd8 commit 25dc7fb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ addons:


jdk:
- openjdk8
- openjdk11

env:
Expand Down Expand Up @@ -51,6 +52,8 @@ cache:
directories:
- '$HOME/.m2/repository'
- '$HOME/.sonar/cache'
- 'node'
- 'node_modules'

notifications:
email: false
Expand All @@ -65,3 +68,5 @@ deploy:
on:
branch: master
condition: $sonarqube = none
tags: true
jdk: 'openjdk11'
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This tool can be used in standalone as a JAR executable (with the command line)

#### Installation
##### Standalone mode
**cnesreport** does not need any installation. It is a portable Java application you can copy and run according to following examples. The only requirement is an **up-to-date JRE (>=1.11)**.
**cnesreport** does not need any installation. It is a portable Java application you can copy and run according to following examples. The only requirement is an **up-to-date JRE (>=1.8)**.

##### Plugin mode (Since 2.2.0)
- Copy the sonar-cnes-report.jar in the plugin folder of sonarqube (On linux path should be like `/opt/sonarqube/plugins`)
Expand Down Expand Up @@ -119,7 +119,7 @@ For legacy versions, check the wiki page here : [Note on legacy versions](https:
<td><b>2.2.0<br/>Standalone + Plugin</b></td>
<td><b>3.0.x<br/>Standalone + Plugin</b></b></td>
<td><b>3.1.0<br/>Standalone + Plugin</b></b></td>
<td><b>3.2.0<br/>Standalone + Plugin</b></b></td>
<td><b>3.2.x<br/>Standalone + Plugin</b></b></td>
</tr>
<tr>
<td><b>7.9.x (LTS)</b></td>
Expand Down
8 changes: 4 additions & 4 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>3.2.1</version>
<version>3.2.2</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>1.8</jdk.min.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<junit.version>4.12</junit.version>
<jacoco.version>0.8.4</jacoco.version>
<sonar.apiVersion>6.5</sonar.apiVersion>
Expand Down

0 comments on commit 25dc7fb

Please sign in to comment.