Updated version to 2.4-RC1 and downgraded sonar dependency to 7.6

piotrczy · Aug 6, 2019 · 7710699 · 7710699
1 parent 810fada
commit 7710699
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 16 deletions.
diff --git a/its/plugin/plugins/json-custom-rules-plugin/pom.xml b/its/plugin/plugins/json-custom-rules-plugin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json-its-plugin-plugins</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-custom-rules-plugin</artifactId>

diff --git a/its/plugin/plugins/pom.xml b/its/plugin/plugins/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json-its-plugin</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-its-plugin-plugins</artifactId>

diff --git a/its/plugin/pom.xml b/its/plugin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json-its</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-its-plugin</artifactId>

diff --git a/its/plugin/tests/pom.xml b/its/plugin/tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json-its-plugin</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-its-plugin-tests</artifactId>

diff --git a/its/pom.xml b/its/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-its</artifactId>

diff --git a/its/ruling/pom.xml b/its/ruling/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json-its</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-its-ruling</artifactId>

diff --git a/its/ruling/tests/pom.xml b/its/ruling/tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json-its-ruling</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-its-ruling-tests</artifactId>

diff --git a/json-checks-testkit/pom.xml b/json-checks-testkit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/json-checks/pom.xml b/json-checks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-checks</artifactId>

diff --git a/json-frontend/pom.xml b/json-frontend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>json-frontend</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.codehaus.sonar-plugins.json</groupId>
   <artifactId>json</artifactId>
-  <version>2.4-SNAPSHOT</version>
+  <version>2.4-RC1</version>
   <packaging>pom</packaging>
 
   <name>SonarQube JSON Analyzer</name>
@@ -61,7 +61,7 @@
     <license.title>SonarQube JSON Analyzer</license.title>
     <license.owner>David RACODON</license.owner>
     <license.mailto>[email protected]</license.mailto>
-    <sonar.version>7.9.1</sonar.version>
+    <sonar.version>7.6</sonar.version>
     <sslr.version>1.23</sslr.version>
     <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
   </properties>

diff --git a/sonar-json-plugin/pom.xml b/sonar-json-plugin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.json</groupId>
     <artifactId>json</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.4-RC1</version>
   </parent>
 
   <artifactId>sonar-json-plugin</artifactId>

diff --git a/sonar-json-plugin/src/test/java/org/sonar/plugins/json/JSONPluginTest.java b/sonar-json-plugin/src/test/java/org/sonar/plugins/json/JSONPluginTest.java
@@ -21,7 +21,6 @@
 
 import org.junit.Test;
 import org.sonar.api.Plugin;
-import org.sonar.api.SonarEdition;
 import org.sonar.api.SonarQubeSide;
 import org.sonar.api.internal.SonarRuntimeImpl;
 import org.sonar.api.utils.Version;
@@ -32,15 +31,15 @@ public class JSONPluginTest {
 
   @Test
   public void should_get_the_right_version() {
-    Plugin.Context context = new Plugin.Context(SonarRuntimeImpl.forSonarQube(Version.create(5, 6), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY));
+    Plugin.Context context = new Plugin.Context(SonarRuntimeImpl.forSonarQube(Version.create(5, 6), SonarQubeSide.SCANNER));
     new JSONPlugin().define(context);
     assertThat(context.getSonarQubeVersion().major()).isEqualTo(5);
     assertThat(context.getSonarQubeVersion().minor()).isEqualTo(6);
   }
 
   @Test
   public void should_get_the_right_number_of_extensions() {
-    Plugin.Context context = new Plugin.Context(SonarRuntimeImpl.forSonarQube(Version.create(5, 6), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY));
+    Plugin.Context context = new Plugin.Context(SonarRuntimeImpl.forSonarQube(Version.create(5, 6), SonarQubeSide.SCANNER));
     new JSONPlugin().define(context);
     assertThat(context.getExtensions()).hasSize(4);
   }