This is an automated email from the ASF dual-hosted git repository. aengineer pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push: new 9bf7a6e HDDS-2149. Replace findbugs with spotbugs 9bf7a6e is described below commit 9bf7a6e5b26a361fd08552793852208d817fdfbd Author: Doroszlai, Attila <adorosz...@apache.org> AuthorDate: Tue Sep 24 09:23:48 2019 +0200 HDDS-2149. Replace findbugs with spotbugs Signed-off-by: Anu Engineer <aengin...@apache.org> --- hadoop-hdds/common/pom.xml | 4 ++-- hadoop-hdds/container-service/pom.xml | 9 ++++----- hadoop-hdds/pom.xml | 15 --------------- hadoop-hdds/server-scm/pom.xml | 4 ++-- hadoop-ozone/common/pom.xml | 4 ++-- hadoop-ozone/csi/pom.xml | 4 ++-- hadoop-ozone/dev-support/checks/findbugs.sh | 12 +++++++++--- hadoop-ozone/insight/pom.xml | 9 ++++----- hadoop-ozone/ozone-manager/pom.xml | 5 ++--- hadoop-ozone/ozonefs-lib-current/pom.xml | 4 ++-- hadoop-ozone/ozonefs-lib-legacy/pom.xml | 4 ++-- hadoop-ozone/ozonefs/pom.xml | 5 ++--- hadoop-ozone/pom.xml | 8 -------- hadoop-ozone/recon/pom.xml | 4 ++-- hadoop-ozone/s3gateway/pom.xml | 5 ++--- hadoop-ozone/tools/pom.xml | 9 ++++----- hadoop-ozone/upgrade/pom.xml | 5 ++--- pom.ozone.xml | 29 ++++++++++++++--------------- 18 files changed, 57 insertions(+), 82 deletions(-) diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index 2a6d44a..9af807f 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -274,8 +274,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile> </configuration> diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index 2f89fa2..0eef961 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -55,9 +55,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <version>1.16</version> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>3.0.1</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> <scope>provided</scope> </dependency> </dependencies> @@ -93,8 +92,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile> </configuration> diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index 5c98e38..a1efb5b 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -195,13 +195,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>3.0.1</version> - <scope>provided</scope> - </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -308,14 +301,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.4</version> - <configuration> - <excludeFilterFile combine.self="override"></excludeFilterFile> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 99d5922..68a5cd8 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -101,8 +101,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <artifactId>bcprov-jdk15on</artifactId> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> <scope>provided</scope> </dependency> </dependencies> diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index 9cbee56..09ac27a 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -154,8 +154,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile> </configuration> diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index fb04d8c..6e7b807 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -176,8 +176,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml </excludeFilterFile> diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh b/hadoop-ozone/dev-support/checks/findbugs.sh index 3108bdd..ccbf2ed 100755 --- a/hadoop-ozone/dev-support/checks/findbugs.sh +++ b/hadoop-ozone/dev-support/checks/findbugs.sh @@ -16,7 +16,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR/../../.." || exit 1 -mvn -B compile -fn findbugs:check -Dfindbugs.failOnError=false -f pom.ozone.xml +if ! type unionBugs >/dev/null 2>&1 || ! type convertXmlToText >/dev/null 2>&1; then + mvn -B -fae compile spotbugs:check -f pom.ozone.xml + exit $? +fi + +mvn -B -fae compile spotbugs:spotbugs -f pom.ozone.xml REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/findbugs"} mkdir -p "$REPORT_DIR" @@ -24,8 +29,9 @@ REPORT_FILE="$REPORT_DIR/summary.txt" touch "$REPORT_FILE" -find hadoop-ozone -name findbugsXml.xml -print0 | xargs -0 -n1 convertXmlToText | tee -a "${REPORT_FILE}" -find hadoop-hdds -name findbugsXml.xml -print0 | xargs -0 -n1 convertXmlToText | tee -a "${REPORT_FILE}" +find hadoop-hdds hadoop-ozone -name spotbugsXml.xml -print0 | xargs -0 unionBugs -output "${REPORT_DIR}"/summary.xml +convertXmlToText "${REPORT_DIR}"/summary.xml | tee -a "${REPORT_FILE}" +convertXmlToText -html:fancy-hist.xsl "${REPORT_DIR}"/summary.xml "${REPORT_DIR}"/summary.html wc -l "$REPORT_FILE" | awk '{print $1}'> "$REPORT_DIR/failures" diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 80b2f8f..8287334 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -92,9 +92,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <version>1.19</version> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>3.0.1</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -118,8 +117,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml </excludeFilterFile> diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index fa68398..653209b 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -57,9 +57,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <scope>test</scope> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>3.0.1</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/hadoop-ozone/ozonefs-lib-current/pom.xml b/hadoop-ozone/ozonefs-lib-current/pom.xml index 9d77a78..5953acb 100644 --- a/hadoop-ozone/ozonefs-lib-current/pom.xml +++ b/hadoop-ozone/ozonefs-lib-current/pom.xml @@ -58,8 +58,8 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <skip>true</skip> </configuration> diff --git a/hadoop-ozone/ozonefs-lib-legacy/pom.xml b/hadoop-ozone/ozonefs-lib-legacy/pom.xml index fedd26b..c248308 100644 --- a/hadoop-ozone/ozonefs-lib-legacy/pom.xml +++ b/hadoop-ozone/ozonefs-lib-legacy/pom.xml @@ -120,8 +120,8 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <skip>true</skip> </configuration> diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml index a945f40..4f85070 100644 --- a/hadoop-ozone/ozonefs/pom.xml +++ b/hadoop-ozone/ozonefs/pom.xml @@ -136,9 +136,8 @@ <artifactId>httpclient</artifactId> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>3.0.1</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> <scope>provided</scope> </dependency> diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index b2d143e..18a1422 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -297,14 +297,6 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.4</version> - <configuration> - <excludeFilterFile combine.self="override"/> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 4eed468..55318a5 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -77,8 +77,8 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile> </configuration> diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index cbbba1f..32c9587 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -210,9 +210,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>3.0.1</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> <scope>provided</scope> </dependency> </dependencies> diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index b4a6bc2..d1ee9d5 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -101,9 +101,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <version>1.11.615</version> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>3.0.1</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -133,8 +132,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml </excludeFilterFile> diff --git a/hadoop-ozone/upgrade/pom.xml b/hadoop-ozone/upgrade/pom.xml index 5721102..0a4bd7f 100644 --- a/hadoop-ozone/upgrade/pom.xml +++ b/hadoop-ozone/upgrade/pom.xml @@ -34,9 +34,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <artifactId>hadoop-hdds-common</artifactId> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>findbugs</artifactId> - <version>3.0.1</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/pom.ozone.xml b/pom.ozone.xml index 55c0205..f83c55c 100644 --- a/pom.ozone.xml +++ b/pom.ozone.xml @@ -144,7 +144,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <curator.version>2.12.0</curator.version> <findbugs.version>3.0.0</findbugs.version> - <spotbugs.version>3.1.0-RC1</spotbugs.version> + <spotbugs.version>3.1.12</spotbugs.version> <dnsjava.version>2.1.7</dnsjava.version> <guava.version>11.0.2</guava.version> @@ -1211,6 +1211,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <version>${hadoop.version}</version> </dependency> <dependency> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs</artifactId> + <version>${spotbugs.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <version>${findbugs.version}</version> @@ -1571,16 +1577,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <version>${maven-war-plugin.version}</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugs.version}</version> - <dependencies> - <dependency> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs</artifactId> - <version>${spotbugs.version}</version> - </dependency> - </dependencies> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> + <version>${spotbugs.version}</version> + <configuration> + <maxHeap>1024</maxHeap> + <xmlOutput>true</xmlOutput> + </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -1675,10 +1678,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> <version>${maven-remote-resources-plugin.version}</version> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org