Update spotbugs from 3.0.x to 4.0.x
This also fixes the rest of the modules to make sure that running `mvn clean install spotbugs:spotbugs` will work without errors. This will allow for Jenkins to pick up spotbugs reports as well.
Signed-off-by: Matt Sicker <boards@gmail.com>
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index bfc660c..0786a94 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -286,6 +286,14 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>4.0.4</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-samples/log4j-samples-configuration/pom.xml b/log4j-samples/log4j-samples-configuration/pom.xml
index dc65cb2..e1f8473 100644
--- a/log4j-samples/log4j-samples-configuration/pom.xml
+++ b/log4j-samples/log4j-samples-configuration/pom.xml
@@ -28,6 +28,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <log4jParentDir>../..</log4jParentDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-samples/log4j-samples-flume-common/pom.xml b/log4j-samples/log4j-samples-flume-common/pom.xml
index 876b9ec..a91d0ae 100644
--- a/log4j-samples/log4j-samples-flume-common/pom.xml
+++ b/log4j-samples/log4j-samples-flume-common/pom.xml
@@ -28,6 +28,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <log4jParentDir>../..</log4jParentDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-samples/log4j-samples-flume-embedded/pom.xml b/log4j-samples/log4j-samples-flume-embedded/pom.xml
index b7b501b..dfa4975 100644
--- a/log4j-samples/log4j-samples-flume-embedded/pom.xml
+++ b/log4j-samples/log4j-samples-flume-embedded/pom.xml
@@ -29,6 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<deploy.plugin.version>2.8.2</deploy.plugin.version>
+ <log4jParentDir>../..</log4jParentDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-samples/log4j-samples-flume-remote/pom.xml b/log4j-samples/log4j-samples-flume-remote/pom.xml
index b5dd23a..08a45a4 100644
--- a/log4j-samples/log4j-samples-flume-remote/pom.xml
+++ b/log4j-samples/log4j-samples-flume-remote/pom.xml
@@ -29,6 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<deploy.plugin.version>2.8.2</deploy.plugin.version>
+ <log4jParentDir>../..</log4jParentDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-samples/log4j-samples-loggerProperties/pom.xml b/log4j-samples/log4j-samples-loggerProperties/pom.xml
index 25ca5c8..6b474d0 100644
--- a/log4j-samples/log4j-samples-loggerProperties/pom.xml
+++ b/log4j-samples/log4j-samples-loggerProperties/pom.xml
@@ -28,6 +28,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <log4jParentDir>../..</log4jParentDir>
</properties>
<dependencies>
<dependency>
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index 2148957..f8bd14e 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<groupId>org.apache.logging.log4j.samples</groupId>
<artifactId>log4j-samples</artifactId>
diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml
index 06d814b..81c08c3 100644
--- a/log4j-spring-boot/pom.xml
+++ b/log4j-spring-boot/pom.xml
@@ -21,14 +21,13 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-spring-boot</artifactId>
<packaging>jar</packaging>
<name>Apache Log4j Spring Boot Support</name>
<description>Apache Log4j Spring iBoot Support</description>
<properties>
- <log4jParentDir>${basedir}/../..</log4jParentDir>
+ <log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Spring Boot Documentation</docLabel>
<projectDir>/log4j-spring-boot</projectDir>
<module.name>org.apache.logging.log4j.spring.boot</module.name>
@@ -231,16 +230,8 @@
</reportSets>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs.plugin.version}</version>
- <configuration>
- <fork>true</fork>
- <jvmArgs>-Duser.language=en</jvmArgs>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <excludeFilterFile>${log4jParentDir}/findbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
index b425cbe..fbdc371 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-spring-cloud-config</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-spring-cloud-config-client</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
index 41aaf1b..a988c0a 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
@@ -8,7 +8,6 @@
<groupId>org.apache.logging.log4j.samples</groupId>
<artifactId>log4j-spring-cloud-config-samples</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
</parent>
<artifactId>sample-app</artifactId>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
index 9dff74d..d401d14 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
@@ -8,7 +8,7 @@
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Log4j Sample Configuration Service</name>
+ <name>Apache Log4j Sample Configuration Service</name>
<description>Sample Cloud Config Server</description>
<parent>
@@ -138,6 +138,13 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
index 68dd994..b60cc4a 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-spring-cloud-config</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<groupId>org.apache.logging.log4j.samples</groupId>
<artifactId>log4j-spring-cloud-config-samples</artifactId>
@@ -103,6 +102,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 218f0ed..8cd8b3f 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-spring-cloud-config</artifactId>
<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index f71aa38..ec62097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,8 +201,8 @@
<groovy.version>2.5.6</groovy.version>
<compiler.plugin.version>3.8.1</compiler.plugin.version>
<pmd.plugin.version>3.13.0</pmd.plugin.version>
- <spotbugs.plugin.version>3.1.5</spotbugs.plugin.version>
- <spotbugs.version>3.1.7</spotbugs.version>
+ <spotbugs.plugin.version>4.0.4</spotbugs.plugin.version>
+ <spotbugs.version>4.1.2</spotbugs.version>
<changes.plugin.version>2.12.1</changes.plugin.version>
<javadoc.plugin.version>3.2.0</javadoc.plugin.version>
<!-- surefire.plugin.version 2.18 yields http://jira.codehaus.org/browse/SUREFIRE-1121, which is fixed in 2.18.1 -->