From ccc590679d3a9ed060b875fbbaf2825bd37bf334 Mon Sep 17 00:00:00 2001
From: Alban Auzeill
Date: Wed, 11 Dec 2019 17:02:20 +0100
Subject: Rely on sonar-plugin-api 7.9 (#217)

---
 pom.xml                                                            | 4 ++--
 sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssPlugin.java | 2 +-
 .../src/test/java/org/sonar/css/plugin/CssPluginTest.java          | 7 ++++---
 .../test/java/org/sonar/css/plugin/StylelintReportSensorTest.java  | 3 ++-
 .../src/test/java/org/sonar/css/plugin/TestActiveRules.java        | 5 +++++
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 077669a..f5f31bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,8 +74,8 @@
         <slf4j.version>1.7.25</slf4j.version>
         <assertj.version>3.10.0</assertj.version>
         <junit.version>4.12</junit.version>
-        <sonar.version>7.4-alpha2</sonar.version>
-        <sonar.min.version>6.7</sonar.min.version>
+        <sonar.version>7.9</sonar.version>
+        <sonar.min.version>7.9</sonar.min.version>
         <sonar-orchestrator.version>3.26.0.2111</sonar-orchestrator.version>
         <sonarlint.version>3.1.0.1376</sonarlint.version>
         <jsr305.version>3.0.2</jsr305.version>
diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssPlugin.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssPlugin.java
index 9e78205..d627527 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssPlugin.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssPlugin.java
@@ -76,7 +76,7 @@ public class CssPlugin implements Plugin {
           .defaultValue(STYLELINT_REPORT_PATHS_DEFAULT_VALUE)
           .name("Stylelint Report Files")
           .description("Paths (absolute or relative) to the JSON files with stylelint issues.")
-          .onQualifiers(Qualifiers.MODULE, Qualifiers.PROJECT)
+          .onQualifiers(Qualifiers.PROJECT)
           .subCategory(LINTER_SUBCATEGORY)
           .category(CSS_CATEGORY)
           .multiValues(true)
diff --git a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/CssPluginTest.java b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/CssPluginTest.java
index 792f065..a2e420e 100644
--- a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/CssPluginTest.java
+++ b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/CssPluginTest.java
@@ -21,6 +21,7 @@ package org.sonar.css.plugin;
 
 import org.junit.Test;
 import org.sonar.api.Plugin;
+import org.sonar.api.SonarEdition;
 import org.sonar.api.SonarQubeSide;
 import org.sonar.api.SonarRuntime;
 import org.sonar.api.internal.SonarRuntimeImpl;
@@ -32,7 +33,7 @@ public class CssPluginTest {
 
   @Test
   public void count_extensions() {
-    SonarRuntime runtime = SonarRuntimeImpl.forSonarQube(Version.create(6, 7), SonarQubeSide.SCANNER);
+    SonarRuntime runtime = SonarRuntimeImpl.forSonarQube(Version.create(6, 7), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY);
     Plugin.Context context = new Plugin.Context(runtime);
     Plugin underTest = new CssPlugin();
     underTest.define(context);
@@ -41,7 +42,7 @@ public class CssPluginTest {
 
   @Test
   public void count_extensions_7_2() {
-    SonarRuntime runtime = SonarRuntimeImpl.forSonarQube(Version.create(7, 2), SonarQubeSide.SCANNER);
+    SonarRuntime runtime = SonarRuntimeImpl.forSonarQube(Version.create(7, 2), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY);
     Plugin.Context context = new Plugin.Context(runtime);
     Plugin underTest = new CssPlugin();
     underTest.define(context);
@@ -50,7 +51,7 @@ public class CssPluginTest {
 
   @Test
   public void count_extensions_7_4() {
-    SonarRuntime runtime = SonarRuntimeImpl.forSonarQube(Version.create(7, 4), SonarQubeSide.SCANNER);
+    SonarRuntime runtime = SonarRuntimeImpl.forSonarQube(Version.create(7, 4), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY);
     Plugin.Context context = new Plugin.Context(runtime);
     Plugin underTest = new CssPlugin();
     underTest.define(context);
diff --git a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/StylelintReportSensorTest.java b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/StylelintReportSensorTest.java
index 62974d9..20779b4 100644
--- a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/StylelintReportSensorTest.java
+++ b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/StylelintReportSensorTest.java
@@ -28,6 +28,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.sonar.api.SonarEdition;
 import org.sonar.api.SonarQubeSide;
 import org.sonar.api.SonarRuntime;
 import org.sonar.api.batch.fs.InputFile.Type;
@@ -212,7 +213,7 @@ public class StylelintReportSensorTest {
   }
 
   private SonarRuntime getRuntime(int major, int minor) {
-    return SonarRuntimeImpl.forSonarQube(Version.create(major, minor), SonarQubeSide.SERVER);
+    return SonarRuntimeImpl.forSonarQube(Version.create(major, minor), SonarQubeSide.SERVER, SonarEdition.COMMUNITY);
   }
 
   private static DefaultInputFile createInputFile(SensorContextTester sensorContext, String content, String relativePath) {
diff --git a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/TestActiveRules.java b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/TestActiveRules.java
index 2a75665..79cd5bc 100644
--- a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/TestActiveRules.java
+++ b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/TestActiveRules.java
@@ -110,5 +110,10 @@ public class TestActiveRules implements ActiveRules {
     public String templateRuleKey() {
       return null;
     }
+
+    @Override
+    public String qpKey() {
+      return null;
+    }
   }
 }
-- 
cgit v1.2.3