Skip to content

Commit

Permalink
Revert "[ISSUE 30] technical incompatible updates (sonar 9.9.0 to 10.…
Browse files Browse the repository at this point in the history
…6.0)"

This reverts commit 2fcf516.
  • Loading branch information
dedece35 committed Jul 21, 2024
1 parent 2fcf516 commit e384c4c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 38 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- upgrade docker system
- [#30](https://github.com/green-code-initiative/ecoCode-php/issues/30) Upgrade dependencies to latest ones - technical incompatibilities for SonarQube before 9.9 version

### Deleted

Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ARG MAVEN_BUILDER=3-openjdk-17-slim

#ARG SONARQUBE_VERSION=9.9.0-community
ARG SONARQUBE_VERSION=10.6.0-community

FROM maven:${MAVEN_BUILDER} AS builder
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@ Ready to use binaries are available [from GitHub](https://github.com/green-code-
🧩 Compatibility
-----------------

| Plugin version | SonarQube version | Java version |
|----------------|-------------------|--------------|
| 1.4.+ | 9.4.+ to 10.6.0 | 11 / 17 |
| 1.5.+ | 9.9.+ to 10.6.0 | 17 |
| Plugin version | SonarQube version | Java version |
|----------------|---------------------|--------------|
| 1.4.+ | 9.4.+ LTS to 10.6.0 | 11 / 17 |

> Compatibility table of versions lower than 1.4.+ are available from the
> main [ecoCode repository](https://github.com/green-code-initiative/ecoCode#-plugins-version-compatibility).
Expand Down
4 changes: 4 additions & 0 deletions TODOs_DDC.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ TODOS dev DDC
actions vues en séance weekly-meeting :

- ecoCode-android : nettoyer packages (suite au release)
- teams : nettoyer anciennes équipes

actions vues perso :

- nettoyer le MIGRATION_TODOs.md
- ménage dans les branches de dev (local et remote)
- JYC : suppression dépendance analyser-commons ==> check si bien tout nettoyé (version dans pom, référence dans code)
- créer issue sur la rule EC2 (`avoidMultipleIfElse`) sur JAVA :
- à refondre avec les uses cases du PHP + implem du PHP (en cours - PR_160_recup)
- JAVA : existe depuis longtemps !!! normal que l'implem PHP et python aient le même code minimaliste fonctionellement
Expand Down
48 changes: 17 additions & 31 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<properties>

<java.version>17</java.version>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>

Expand All @@ -51,30 +51,24 @@
<sonar.organization>green-code-initiative</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>

<!-- max version accepted by SonarQube 10.6.0 but not by 9.9.0 -->
<!--<sonarqube.version>10.7.0.2191</sonarqube.version>-->
<!-- max version with SonarQube 10.0 -->
<sonarqube.version>9.4.0.54424</sonarqube.version>

<!-- max version accepted by SonarQube 9.9.0 -->
<sonarqube.version>9.14.0.375</sonarqube.version>

<sonarphp.version>3.36.0.11813</sonarphp.version>

<sonar-analyzer-commons.version>2.11.0.2861</sonar-analyzer-commons.version>
<!-- max version with SonarQube 10.0 : check lib/extension directory -->
<sonarphp.version>3.28.0.9490</sonarphp.version>

<sonar-analyzer-commons.version>2.5.0.1358</sonar-analyzer-commons.version>
<sonar-packaging.version>1.23.0.740</sonar-packaging.version>

<!-- temporary version waiting for real automatic release in ecocode repository -->
<ecocode-rules-specifications.version>1.6.2</ecocode-rules-specifications.version>

<maven-shade.version>3.6.0</maven-shade.version>

<junit.jupiter.version>5.10.3</junit.jupiter.version>

<assertj.version>3.26.3</assertj.version>
<ecocode-rules-specifications.version>1.5.3</ecocode-rules-specifications.version>

<mockito.version>5.12.0</mockito.version>
<maven-shade.version>3.5.0</maven-shade.version>

<jacoco.version>0.8.12</jacoco.version>
<junit.jupiter.version>5.9.2</junit.jupiter.version>
<assertj.version>3.24.2</assertj.version>
<mockito.version>5.3.1</mockito.version>
<jacoco.version>0.8.11</jacoco.version>

</properties>

Expand All @@ -96,7 +90,7 @@
</dependency>

<dependency>
<groupId>org.sonarsource.api.plugin</groupId>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-plugin-api</artifactId>
<version>${sonarqube.version}</version>
<scope>provided</scope>
Expand All @@ -109,14 +103,6 @@
<version>${sonar-analyzer-commons.version}</version>
</dependency>

<!-- To keep because of dependency used by sonar-analyzer-commons for Unit Tests -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>2.0.13</version>
<scope>provided</scope>
</dependency>

<!-- TEST sources dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -146,12 +132,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -196,7 +182,7 @@
<!-- plugin to generate a unique build number for sonar-packaging-maven-plugin : usage of buildNumber variable -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.1.0</version>
<executions>
<execution>
<phase>validate</phase>
Expand Down Expand Up @@ -246,7 +232,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.5</version>
<version>4.1</version>
<configuration>
<properties>
<owner>Green Code Initiative</owner>
Expand Down

0 comments on commit e384c4c

Please sign in to comment.