Merge pull request #135 from hazendaz/spotbugs

Up support to jdk 14 / mark new support as 3.1.12.2 in preparation for release
spotbugs · Aug 1, 2019 · 05de8a5 · 05de8a5
2 parents c4c670d + f162ac8
commit 05de8a5
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,9 @@ dist: xenial
 language: java
 
 jdk:
+  - openjdk14
+  - openjdk13
+  - openjdk12
   - openjdk11
   - openjdk8
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.hazendaz</groupId>
     <artifactId>base-parent</artifactId>
-    <version>22</version>
+    <version>23</version>
     <relativePath />
   </parent>
 
@@ -176,6 +176,7 @@
     <jgit.version>5.4.0.201906121030-r</jgit.version>
 
     <!-- Targeted patches -->
+    <asm.version>7.2-beta</asm.version>
     <beanutils.version>1.9.3</beanutils.version>
     <chain.version>1.2</chain.version>
     <codec.version>1.13</codec.version>
@@ -432,6 +433,33 @@
       <artifactId>slf4j-api</artifactId>
       <version>${slf4jVersion}</version>
     </dependency>
+
+    <!-- Better jdk support -->
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>${asm.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>${asm.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>${asm.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>${asm.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>${asm.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
@@ -157,7 +157,7 @@ class SpotBugsGui extends AbstractMojo implements SpotBugsPluginsTrait {
     /**
      * Set the name of the output XML file produced
      *
-     * @since 3.1.13
+     * @since 3.1.12.2
      */
     @Parameter(property = "spotbugs.outputXmlFilename", defaultValue = "spotbugsXml.xml")
     String spotbugsXmlOutputFilename

diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -103,7 +103,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
     /**
      * Set the name of the output XML file produced
      *
-     * @since 3.1.13
+     * @since 3.1.12.2
      */
     @Parameter(property = "spotbugs.outputXmlFilename", defaultValue = "spotbugsXml.xml")
     String spotbugsXmlOutputFilename

diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
@@ -101,7 +101,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
     /**
      * Set the name of the output XML file produced
      *
-     * @since 3.1.13
+     * @since 3.1.12.2
      */
     @Parameter(property = "spotbugs.outputXmlFilename", defaultValue = "spotbugsXml.xml")
     String spotbugsXmlOutputFilename