Issue #384: update to sonarqube 8.9 LTS

Author: muhlba91

.ci/ci.sh

@@ -9,13 +9,14 @@ install)
   ;;
 
 integration-tests)
-  SONAR_APP_VERSION="7.9.2"
+  SONAR_APP_VERSION="8.9.3.48735"
   if [[ ! -f ~/.m2/sonar-application-$SONAR_APP_VERSION.zip ]]; then
     URL="https://repox.jfrog.io/repox/sonarsource/org/sonarsource/sonarqube/"
     URL=$URL"sonar-application/$SONAR_APP_VERSION/sonar-application-$SONAR_APP_VERSION.zip"
     wget $URL -O ~/.m2/sonar-application-$SONAR_APP_VERSION.zip
   fi
-  mkdir -p target/temp-downloads && cp ~/.m2/sonar-application-$SONAR_APP_VERSION.zip target/temp-downloads/
+  mkdir -p target/temp-downloads
+  cp ~/.m2/sonar-application-$SONAR_APP_VERSION.zip target/temp-downloads/
   mvn -e integration-test -DskipITs=false
   ;;
 

pom.xml

@@ -94,8 +94,8 @@
 
   <properties>
     <checkstyle.version>8.45.1</checkstyle.version>
-    <sonar.version>7.9</sonar.version>
-    <sonar-java.version>6.0.0.20538</sonar-java.version>
+    <sonar.version>8.9.3.48735</sonar.version>
+    <sonar-java.version>7.2.0.26923</sonar-java.version>
     <maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
     <maven.sevntu.checkstyle.plugin.version>1.40.0</maven.sevntu.checkstyle.plugin.version>
     <!-- it should be a version of checkstyle that is compatible/compiled with sevntu -->
@@ -168,6 +168,12 @@
       <version>${sonar.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarqube</groupId>
+      <artifactId>sonar-plugin-api-impl</artifactId>
+      <version>${sonar.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
@@ -250,6 +256,12 @@
       <scope>test</scope>
       <version>1.4</version>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.19.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
@@ -833,7 +845,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>sonar-maven-plugin</artifactId>
-        <version>3.7.0.1746</version>
+        <version>3.9.0.2155</version>
       </plugin>
     </plugins>
   </build>

src/it/java/org/checkstyle/plugins/sonar/CheckJarTest.java

@@ -33,7 +33,8 @@
 import org.junit.Test;
 
 public class CheckJarTest {
-    private static final String MATCHER = ".*checkstyle-sonar-plugin-\\d+\\.\\d+(-SNAPSHOT)?\\.jar";
+    private static final String MATCHER = ".*checkstyle-sonar-plugin-"
+                                          + "\\d+\\.\\d+(.\\d+)?(-SNAPSHOT)?\\.jar";
 
     @Test
     public void testJarPresence() throws IOException {

src/it/java/org/checkstyle/plugins/sonar/RunPluginTest.java

@@ -61,7 +61,7 @@
  */
 public class RunPluginTest {
     private static final Logger LOG = LoggerFactory.getLogger(RunPluginTest.class);
-    private static final String SONAR_APP_VERSION = "7.9.2";
+    private static final String SONAR_APP_VERSION = "8.9.3.48735";
     private static final int LOGS_NUMBER_LINES = 200;
     private static final String TRUE = "true";
     private static final String PROJECT_KEY = "com.puppycrows.tools:checkstyle";
@@ -91,9 +91,6 @@ public static void beforeAll() {
                 .addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin",
                         "sonar-lits-plugin",
                         "0.8.0.1209"))
-                .addPlugin(MavenLocation.of("org.sonarsource.java",
-                        "sonar-java-plugin",
-                        "6.0.0.20538"))
                 .setServerProperty("sonar.web.javaOpts", "-Xmx1G")
                 .build();
 

src/main/java/org/sonar/plugins/checkstyle/CheckstylePlugin.java

@@ -22,14 +22,13 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.sonar.api.CoreProperties;
+import org.sonar.api.Plugin;
 import org.sonar.api.PropertyType;
-import org.sonar.api.SonarPlugin;
 import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.resources.Qualifiers;
 
-public final class CheckstylePlugin extends SonarPlugin {
-
+public final class CheckstylePlugin implements Plugin {
+    private static final String CHECKSTYLE_CATEGORY_NAME = "java";
     private static final String CHECKSTYLE_SUB_CATEGORY_NAME = "Checkstyle";
 
     private static final String DESCRIPTION_HEADER = "Checkstyle supports";
@@ -68,35 +67,34 @@ public final class CheckstylePlugin extends SonarPlugin {
             + "configuration for more information.";
 
     @SuppressWarnings("rawtypes")
-    @Override
     public List getExtensions() {
         return Arrays
                 .asList(PropertyDefinition.builder(CheckstyleConstants.CHECKER_FILTERS_KEY)
                                 .defaultValue(CheckstyleConstants.CHECKER_FILTERS_DEFAULT_VALUE)
-                                .category(CoreProperties.CATEGORY_JAVA)
+                                .category(CHECKSTYLE_CATEGORY_NAME)
                                 .subCategory(CHECKSTYLE_SUB_CATEGORY_NAME)
                                 .name("Checker Filters")
                                 .description(CHECKER_FILTERS_DESCRIPTION)
                                 .type(PropertyType.TEXT)
                                 .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE).build(),
                         PropertyDefinition.builder(CheckstyleConstants.TREEWALKER_FILTERS_KEY)
                                 .defaultValue(CheckstyleConstants.TREEWALKER_FILTERS_DEFAULT_VALUE)
-                                .category(CoreProperties.CATEGORY_JAVA)
+                                .category(CHECKSTYLE_CATEGORY_NAME)
                                 .subCategory(CHECKSTYLE_SUB_CATEGORY_NAME)
                                 .name("Treewalker Filters")
                                 .description(TREEWALKER_FILTERS_DESCRIPTION)
                                 .type(PropertyType.TEXT)
                                 .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE).build(),
                         PropertyDefinition.builder(CheckstyleConstants.CHECKER_TAB_WIDTH)
-                                .category(CoreProperties.CATEGORY_JAVA)
+                                .category(CHECKSTYLE_CATEGORY_NAME)
                                 .subCategory(CHECKSTYLE_SUB_CATEGORY_NAME)
                                 .name("Tab Width")
                                 .description(CHECKER_TAB_WIDTH_DESCRIPTION)
                                 .type(PropertyType.INTEGER)
                                 .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE)
                                 .build(),
                         PropertyDefinition.builder(CheckstyleConfiguration.PROPERTY_GENERATE_XML)
-                                .defaultValue("false").category(CoreProperties.CATEGORY_JAVA)
+                                .defaultValue("false").category(CHECKSTYLE_CATEGORY_NAME)
                                 .subCategory(CHECKSTYLE_SUB_CATEGORY_NAME)
                                 .name("Generate XML Report").type(PropertyType.BOOLEAN).hidden()
                                 .build(),
@@ -107,4 +105,8 @@ public List getExtensions() {
                         CheckstyleRulesDefinition.class);
     }
 
+    @Override
+    public void define(final Context context) {
+        context.addExtensions(getExtensions());
+    }
 }

src/test/java/org/sonar/plugins/checkstyle/CheckstyleConfigurationTest.java

@@ -43,6 +43,7 @@
 import org.sonar.api.config.internal.MapSettings;
 import org.sonar.api.profiles.RulesProfile;
 import org.sonar.api.rules.Rule;
+import org.sonar.api.utils.System2;
 
 import com.puppycrawl.tools.checkstyle.api.Configuration;
 
@@ -123,7 +124,7 @@ public void writeConfigurationToWorkingDir() throws IOException {
     public void getCheckstyleConfiguration() throws Exception {
         fileSystem.setEncoding(StandardCharsets.UTF_8);
         final MapSettings mapSettings = new MapSettings(new PropertyDefinitions(
-                new CheckstylePlugin().getExtensions()));
+                System2.INSTANCE, new CheckstylePlugin().getExtensions()));
         mapSettings.setProperty(CheckstyleConstants.CHECKER_FILTERS_KEY,
                 CheckstyleConstants.CHECKER_FILTERS_DEFAULT_VALUE);
         final org.sonar.api.config.Configuration settings = new ConfigurationBridge(mapSettings);

src/test/java/org/sonar/plugins/checkstyle/CheckstylePluginTest.java

@@ -20,8 +20,13 @@
 package org.sonar.plugins.checkstyle;
 
 import static org.fest.assertions.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import org.junit.Test;
+import org.sonar.api.Plugin;
 
 public class CheckstylePluginTest {
 
@@ -31,4 +36,13 @@ public void testGetExtensions() {
         assertThat(plugin.getExtensions().size()).isGreaterThan(1);
     }
 
+    @Test
+    public void testDefine() {
+        final Plugin.Context context = mock(Plugin.Context.class);
+
+        final CheckstylePlugin plugin = new CheckstylePlugin();
+        plugin.define(context);
+        verify(context, times(1)).addExtensions(anyList());
+    }
+
 }

src/test/java/org/sonar/plugins/checkstyle/CheckstyleProfileExporterTest.java

@@ -48,6 +48,7 @@
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RulePriority;
+import org.sonar.api.utils.System2;
 
 public class CheckstyleProfileExporterTest {
 
@@ -253,7 +254,7 @@ public void addTabWidthProperty() {
     @SuppressWarnings("unchecked")
     private void initSettings(@Nullable String key, @Nullable String property) {
         final MapSettings mapSettings = new MapSettings(
-                new PropertyDefinitions(new CheckstylePlugin().getExtensions()));
+                new PropertyDefinitions(System2.INSTANCE, new CheckstylePlugin().getExtensions()));
         if (Objects.nonNull(key)) {
             mapSettings.setProperty(key, property);
         }

test-resources/docker-compose.yml

@@ -3,9 +3,9 @@ version: "3"
 
 services:
   sonarqube:
-    image: sonarqube:7.9-community
+    image: sonarqube:8.9.3-community
     # next line is for arm64 devices when testing since SQ does not officially release multi-arch images
-    #image: mwizner/sonarqube:8.7.1-community
+    #image: stevefan1999/sonarqube:9.0.1-community
     restart: unless-stopped
     depends_on:
       - db
@@ -16,10 +16,11 @@ services:
       SONAR_JDBC_USERNAME: sonar
       SONAR_JDBC_PASSWORD: sonar
     volumes:
+      - sonarqube_conf:/opt/sonarqube/conf
       - sonarqube_data:/opt/sonarqube/data
       - ./tmp/extensions/:/opt/sonarqube/extensions
+      - sonarqube_bundled-plugins:/opt/sonarqube/lib/bundled-plugins
       - sonarqube_logs:/opt/sonarqube/logs
-      - sonarqube_temp:/opt/sonarqube/temp
   db:
     image: postgres
     restart: unless-stopped
@@ -31,8 +32,9 @@ services:
       - postgresql_data:/var/lib/postgresql/data
 
 volumes:
+  sonarqube_conf:
   sonarqube_data:
   sonarqube_logs:
-  sonarqube_temp:
+  sonarqube_bundled-plugins:
   postgresql:
   postgresql_data: