Merge branch 'master' into issue-70_getStackTrace

KengoTODA · Feb 5, 2019 · 6eedefb · 6eedefb
2 parents 5717ae5 + 8749851
commit 6eedefb
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,18 @@ This changelog follows [Keep a Changelog v1.0.0](https://keepachangelog.com/en/1
 
 ## Unreleased
 
-- SLF4J_GET_STACK_TRACE bug pattern
+### Added
+
+- Support for new SonarQube v6.7 LTS
+- New SLF4J_GET_STACK_TRACE bug pattern
+
+### Changed
+
+- Bump up sonar-findbugs to v3.8, and sonar-java to 5.6.1.15064
+
+### Removed
+
+- Support for old SonarQube v5.6 LTS
 
 ## 1.4.2 - 2018-10-10
 ### Fixed

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This product helps you to verify usage of SLF4J 1.6, 1.7 and 1.8. Works with Java8 and later.
 
-To use this plugin with SonarQube, see [here](sonar-plugin/README.md).
+To use this plugin with SonarQube, see [here](sonar-plugin/README.md). To detect problems at compile time, see [errorprone-slf4j](https://github.com/KengoTODA/errorprone-slf4j).
 
 [![Build Status](https://secure.travis-ci.org/KengoTODA/findbugs-slf4j.png)](http://travis-ci.org/KengoTODA/findbugs-slf4j)
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=jp.skypencil.findbugs.slf4j%3Afindbugs-slf4j&metric=alert_status)](https://sonarcloud.io/dashboard?id=jp.skypencil.findbugs.slf4j%3Afindbugs-slf4j)

diff --git a/bug-pattern/pom.xml b/bug-pattern/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>jp.skypencil.findbugs.slf4j</groupId>
     <artifactId>findbugs-slf4j</artifactId>
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>bug-pattern</artifactId>
   <name>findbugs-slf4j bug pattern</name>
@@ -126,5 +126,13 @@
       <groupId>com.youdevise</groupId>
       <artifactId>test-driven-detectors4findbugs</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>jp.skypencil.findbugs.slf4j</groupId>
   <artifactId>findbugs-slf4j</artifactId>
-  <version>1.4.3-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <url>https://github.com/KengoTODA/findbugs-slf4j</url>
   <description>FindBugs plugin for SLF4J</description>
   <packaging>pom</packaging>
@@ -16,9 +16,10 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spotbugs.version>3.1.7</spotbugs.version>
-    <spotless.version>1.15.0</spotless.version>
+    <spotbugs.version>3.1.11</spotbugs.version>
+    <spotless.version>1.17.0</spotless.version>
     <version.slf4j>1.7.25</version.slf4j>
+    <junit.version>5.3.2</junit.version>
   </properties>
   <scm>
     <connection>scm:git:[email protected]:KengoTODA/findbugs-slf4j.git</connection>
@@ -73,7 +74,7 @@
             <dependency>
               <groupId>com.google.errorprone</groupId>
               <artifactId>error_prone_core</artifactId>
-              <version>2.3.1</version>
+              <version>2.3.2</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -84,19 +85,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.0</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.junit.platform</groupId>
-              <artifactId>junit-platform-surefire-provider</artifactId>
-              <version>1.3.1</version>
-            </dependency>
-          </dependencies>
+          <version>2.22.1</version>
         </plugin>
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
-          <version>3.1.6</version>
+          <version>3.1.10</version>
           <dependencies>
             <dependency>
               <groupId>com.github.spotbugs</groupId>
@@ -108,7 +102,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.2.1</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -237,24 +231,36 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>26.0-jre</version>
+        <version>27.0.1-jre</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
-        <version>5.3.1</version>
+        <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
-        <version>5.3.1</version>
+        <version>${junit.version}</version>
         <scope>runtime</scope>
       </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>2.23.0</version>
+        <version>2.24.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -290,7 +296,7 @@
       <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
-        <version>1.18.2</version>
+        <version>1.18.4</version>
         <scope>provided</scope>
       </dependency>
     </dependencies>

diff --git a/sonar-plugin/Dockerfile b/sonar-plugin/Dockerfile
@@ -0,0 +1,15 @@
+# After `mvn clean package` in the project root dir, run following command to build:
+# docker image build . -t findbugs-slf4j
+#
+# Then you can run SonarQube instance with findbugs-slf4j:
+# docker container run -it -P findbugs-slf4j
+
+FROM sonarqube:6.7.5
+
+ENV SONAR_JAVA_VERSION=5.1.0.13090 \
+    SONAR_FINDBUGS_VERSION=3.8.0 \
+    FINDBUGS_SLF4J_VERSION=1.5.0-SNAPSHOT
+
+RUN wget -P $SONARQUBE_HOME/extensions/plugins/ --no-verbose https://github.com/spotbugs/sonar-findbugs/releases/download/$SONAR_FINDBUGS_VERSION/sonar-findbugs-plugin-$SONAR_FINDBUGS_VERSION.jar
+RUN wget -P $SONARQUBE_HOME/extensions/plugins/ --no-verbose http://central.maven.org/maven2/org/sonarsource/java/sonar-java-plugin/$SONAR_JAVA_VERSION/sonar-java-plugin-$SONAR_JAVA_VERSION.jar
+COPY target/sonar-findbugs-slf4j-plugin-$FINDBUGS_SLF4J_VERSION.jar $SONARQUBE_HOME/extensions/plugins/
diff --git a/sonar-plugin/pom.xml b/sonar-plugin/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>jp.skypencil.findbugs.slf4j</groupId>
     <artifactId>findbugs-slf4j</artifactId>
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>sonar-findbugs-slf4j-plugin</artifactId>
   <name>findbugs-slf4j sonar plugin</name>
@@ -20,7 +20,7 @@
           <pluginDescription><![CDATA[Verify usage of SLF4J]]></pluginDescription>
           <pluginClass>jp.skypencil.findbugs.slf4j.sonar.FindBugsSlf4jPlugin</pluginClass>
           <useChildFirstClassLoader>false</useChildFirstClassLoader>
-          <requirePlugins>findbugs:3.5</requirePlugins><!-- the version introduced SpotBugs 3.1 -->
+          <requirePlugins>findbugs:3.8</requirePlugins>
           <pluginUrl>https://github.com/KengoTODA/findbugs-slf4j</pluginUrl>
           <pluginSourcesUrl>https://github.com/KengoTODA/findbugs-slf4j</pluginSourcesUrl>
         </configuration>
@@ -58,13 +58,13 @@
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
-      <version>5.6.6</version><!-- LTS release -->
+      <version>6.7.1</version><!-- LTS release -->
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.java</groupId>
       <artifactId>sonar-java-plugin</artifactId>
-      <version>4.0</version>
+      <version>5.6.1.15064</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/test-case/pom.xml b/test-case/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>jp.skypencil.findbugs.slf4j</groupId>
     <artifactId>findbugs-slf4j</artifactId>
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>test-case</artifactId>
   <name>findbugs-slf4j test case</name>
@@ -96,5 +96,13 @@
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+    </dependency>
   </dependencies>
 </project>