Update beta to stable

Author: camillof

.circleci/config.yml

@@ -51,3 +51,4 @@ workflows:
 notify:
   webhooks:
     - url: https://cc-slack-proxy.herokuapp.com/circle
+    

Dockerfile

@@ -1,14 +1,14 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:17-jdk-alpine3.14
 
 MAINTAINER Code Climate
 
 RUN adduser -u 9000 -D app
 VOLUME /code
 
 # Increase Java memory limits
-ENV JAVA_OPTS="-XX:+UseParNewGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -Xss4096k"
+ENV JAVA_OPTS="-XX:+UseG1GC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -Xss4096k"
 
-ENV GRADLE_VERSION=4.2.1
+ENV GRADLE_VERSION=7.3
 ENV GRADLE_HOME=/opt/gradle
 ENV GRADLE_FOLDER=$GRADLE_HOME
 ENV GRADLE_USER_HOME=$GRADLE_HOME

Makefile

@@ -10,6 +10,9 @@ endif
 image:
 	docker build --rm -t $(IMAGE_NAME) .
 
+analyze-fixtures:
+	docker run --rm -v "$(PWD)/fixtures/java_lib/main/java":/code -v "$(PWD)/fixtures/java_source_version/config_15.json":/config.json $(IMAGE_NAME)
+
 test: image
 	docker run --rm -ti -w /usr/src/app -u root $(IMAGE_NAME) gradle clean test
 

bin/codeclimate-sonar

@@ -10,7 +10,6 @@ CODE_DIR=$1; shift
 CONFIG_FILE=$1; shift
 
 java \
-  -noverify \
   -cp ${APP}:${WRAPPER}:${CORE}:${LIBS} \
   -Djava.awt.headless=true  \
   -Dsonarlint.home="${BUILD_DIR}"  \

build.gradle

@@ -7,18 +7,18 @@ repositories {
 
 task copyLibs(type: Copy) {
     into "${buildDir}/libs"
-    from configurations.runtime
+    from configurations.runtimeClasspath
     exclude "sonar-*-plugin*.jar"
 }
 
 task copyTestLibs(type: Copy) {
     into "${buildDir}/test"
-    from configurations.testCompile
+    from configurations.testRuntimeClasspath
 }
 
 task copyPlugins(type: Copy) {
     into "${buildDir}/plugins"
-    from configurations.runtime
+    from configurations.runtimeClasspath
     include "sonar-*-plugin*.jar"
 }
 
@@ -27,20 +27,28 @@ task copyRunnable(type: Copy) {
     from "bin/codeclimate-sonar"
 }
 
+tasks.named("jar") {
+    dependsOn copyRunnable
+}
+
+tasks.named("compileTestJava") {
+    dependsOn copyRunnable
+}
+
 task infra(dependsOn: ["copyPlugins", "copyLibs", "copyTestLibs", "copyRunnable", "jar"])
 
 build.dependsOn(infra)
 test.dependsOn(infra)
 
 dependencies {
-    compile("com.github.codeclimate:codeclimate-ss-analyzer-wrapper:master-SNAPSHOT")
+    implementation("com.github.codeclimate:codeclimate-ss-analyzer-wrapper:beta-SNAPSHOT")
 
     // Plugins
-    compile("org.sonarsource.java:sonar-java-plugin:4.14.0.11784")
+    implementation("org.sonarsource.java:sonar-java-plugin:6.15.1.26025")
 
-    testCompile("org.assertj:assertj-core:2.8.0")
-    testCompile("org.skyscreamer:jsonassert:1.5.0")
-    testCompile("junit:junit:4.12")
+    testImplementation("org.assertj:assertj-core:2.8.0")
+    testImplementation("org.skyscreamer:jsonassert:1.5.0")
+    testImplementation("junit:junit:4.12")
 }
 
 test {

fixtures/java_lib/main/java/Library.java

@@ -2,7 +2,14 @@
  * This Java source file was generated by the Gradle 'init' task.
  */
 // FIXME
+
+import java.util.List;
+import java.util.Set;
+
 public class Library {
+  List myList; // Noncompliant
+  Set mySet; // Noncompliant
+
   public static void main(String[] args) {
   }
 
@@ -13,4 +20,20 @@ public void foo() {
 			}
 		}
 	}
+
+  public boolean bar(Number n) {
+    if (String.class.isInstance(n)) {  // Noncompliant
+      return true;
+    }
+    String multi = """
+        this is a single line string""";
+    String textBlock = """
+          \"\"\" this \nis
+          text  block!
+          !!!!
+        """;
+    Pattern p = Pattern.compile(".*|a");
+    Matcher m = p.matcher(multi);
+    return m.matches();
+  }
 }

fixtures/java_source_version/config_11.json

@@ -0,0 +1,6 @@
+{
+  "enabled": true,
+  "config": {
+    "sonar.java.source": "11"
+  }
+}

fixtures/java_source_version/config_15.json

@@ -0,0 +1,7 @@
+{
+  "enabled": true,
+  "config": {
+    "sonar.java.source": "15",
+    "minimum_severity": "minor"
+  }
+}

src/test/java/integration/JavaSourceVersion.java

@@ -11,4 +11,16 @@ public void specify_java_source_version_through_config() throws Exception {
         Shell.Process process = Shell.execute("build/codeclimate-sonar fixtures/java_source_version fixtures/java_source_version/config.json");
         assertThat(process.stderr).contains("Configured Java source version (sonar.java.source): 6");
     }
+
+    @Test
+    public void specify_java_11_source_version_through_config() throws Exception {
+        Shell.Process process = Shell.execute("build/codeclimate-sonar fixtures/java_source_version fixtures/java_source_version/config_11.json");
+        assertThat(process.stderr).contains("Configured Java source version (sonar.java.source): 11");
+    }
+
+    @Test
+    public void specify_java_15_source_version_through_config() throws Exception {
+        Shell.Process process = Shell.execute("build/codeclimate-sonar fixtures/java_source_version fixtures/java_source_version/config_15.json");
+        assertThat(process.stderr).contains("Configured Java source version (sonar.java.source): 15");
+    }
 }

src/test/java/integration/SanityCheckTest.java

@@ -14,8 +14,9 @@ public class SanityCheckTest {
     public void executeJavaLibFixture() throws Exception {
         String expectedOutput = File.read("src/test/resources/sanity_check_expected_issues.json");
 
-        Shell.Process process = Shell.execute("build/codeclimate-sonar fixtures/java_lib");
+        Shell.Process process = Shell.execute("build/codeclimate-sonar fixtures/java_lib fixtures/java_source_version/config_15.json");
 
+        assertThat(process.stderr).contains("Configured Java source version (sonar.java.source): 15");
         assertThat(process.exitCode).isEqualTo(0);
         assertThat(process.stdout)
                 .withFailMessage("Issues must be split by a NULL (\\0) character")