Skip to content

Commit 4b057c9

Browse files
vjkoskelaBrandonArp
authored andcommitted
Convert from Findbugs to Spotbugs (#150)
* Convert from Findbugs to Spotbugs; see https://spotbugs.readthedocs.io/en/stable/migration.html
1 parent a8c3864 commit 4b057c9

File tree

3 files changed

+230
-181
lines changed

3 files changed

+230
-181
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ before_script:
2222
- gpg --import arpnetworking.key
2323
- if [ \( -n "${TRAVIS_TAG}" \) -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then export TARGET="deploy -P release --settings settings.xml"; fi;
2424
script:
25-
- ./jdk-wrapper.sh ./mvnw clean ${TARGET} -P rpm -U
25+
- ./jdk-wrapper.sh ./mvnw clean ${TARGET} -P rpm -U -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
2626
deploy:
2727
provider: releases
2828
api_key:

pom.xml

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>com.arpnetworking.build</groupId>
2020
<artifactId>arpnetworking-parent-pom</artifactId>
21-
<version>1.1.11</version>
21+
<version>2.0.0</version>
2222
<relativePath />
2323
</parent>
2424

@@ -81,7 +81,7 @@
8181
<cglib.version>3.2.10</cglib.version>
8282
<client.protocol.version>0.10.1</client.protocol.version>
8383
<fastutil.version>8.2.2</fastutil.version>
84-
<findbugs.annotations.version>3.0.1</findbugs.annotations.version>
84+
<spotbugs.annotations.version>3.1.12</spotbugs.annotations.version>
8585
<guava.version>25.1-jre</guava.version>
8686
<guice.version>4.2.2</guice.version>
8787
<jackson.version>2.9.8</jackson.version>
@@ -169,8 +169,8 @@
169169
<artifactId>maven-checkstyle-plugin</artifactId>
170170
</plugin>
171171
<plugin>
172-
<groupId>org.codehaus.mojo</groupId>
173-
<artifactId>findbugs-maven-plugin</artifactId>
172+
<groupId>com.github.spotbugs</groupId>
173+
<artifactId>spotbugs-maven-plugin</artifactId>
174174
</plugin>
175175
<plugin>
176176
<groupId>org.apache.maven.plugins</groupId>
@@ -440,21 +440,49 @@
440440
<groupId>com.arpnetworking.metrics</groupId>
441441
<artifactId>metrics-client</artifactId>
442442
<version>${metrics.client.version}</version>
443+
<exclusions>
444+
<!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete -->
445+
<exclusion>
446+
<groupId>com.google.code.findbugs</groupId>
447+
<artifactId>findbugs-annotations</artifactId>
448+
</exclusion>
449+
</exclusions>
443450
</dependency>
444451
<dependency>
445452
<groupId>com.arpnetworking.metrics.extras</groupId>
446453
<artifactId>apache-http-sink-extra</artifactId>
447454
<version>${metrics.client.http.version}</version>
455+
<exclusions>
456+
<!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete -->
457+
<exclusion>
458+
<groupId>com.google.code.findbugs</groupId>
459+
<artifactId>findbugs-annotations</artifactId>
460+
</exclusion>
461+
</exclusions>
448462
</dependency>
449463
<dependency>
450464
<groupId>com.arpnetworking.metrics.extras</groupId>
451465
<artifactId>incubator-extra</artifactId>
452466
<version>${metrics.client.incubator.version}</version>
467+
<exclusions>
468+
<!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete -->
469+
<exclusion>
470+
<groupId>com.google.code.findbugs</groupId>
471+
<artifactId>findbugs-annotations</artifactId>
472+
</exclusion>
473+
</exclusions>
453474
</dependency>
454475
<dependency>
455476
<groupId>com.arpnetworking.metrics.extras</groupId>
456477
<artifactId>jvm-extra</artifactId>
457478
<version>${metrics.jvm.extra.version}</version>
479+
<exclusions>
480+
<!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete -->
481+
<exclusion>
482+
<groupId>com.google.code.findbugs</groupId>
483+
<artifactId>findbugs-annotations</artifactId>
484+
</exclusion>
485+
</exclusions>
458486
</dependency>
459487
<!-- Google -->
460488
<dependency>
@@ -587,6 +615,13 @@
587615
<groupId>com.arpnetworking.commons</groupId>
588616
<artifactId>commons</artifactId>
589617
<version>${arpnetworking.commons.version}</version>
618+
<exclusions>
619+
<!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete -->
620+
<exclusion>
621+
<groupId>com.google.code.findbugs</groupId>
622+
<artifactId>findbugs-annotations</artifactId>
623+
</exclusion>
624+
</exclusions>
590625
</dependency>
591626
<dependency>
592627
<groupId>net.sf.oval</groupId>
@@ -610,9 +645,9 @@
610645
<version>${jsr305.version}</version>
611646
</dependency>
612647
<dependency>
613-
<groupId>com.google.code.findbugs</groupId>
614-
<artifactId>findbugs-annotations</artifactId>
615-
<version>${findbugs.annotations.version}</version>
648+
<groupId>com.github.spotbugs</groupId>
649+
<artifactId>spotbugs-annotations</artifactId>
650+
<version>${spotbugs.annotations.version}</version>
616651
</dependency>
617652
<dependency>
618653
<groupId>org.scala-lang</groupId>
@@ -739,12 +774,26 @@
739774
<artifactId>generator</artifactId>
740775
<version>${metrics.generator.version}</version>
741776
<scope>test</scope>
777+
<exclusions>
778+
<!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete -->
779+
<exclusion>
780+
<groupId>com.google.code.findbugs</groupId>
781+
<artifactId>findbugs-annotations</artifactId>
782+
</exclusion>
783+
</exclusions>
742784
</dependency>
743785
<dependency>
744786
<groupId>com.arpnetworking.test</groupId>
745787
<artifactId>performance-test</artifactId>
746788
<version>${performance.test.version}</version>
747789
<scope>test</scope>
790+
<exclusions>
791+
<!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete -->
792+
<exclusion>
793+
<groupId>com.google.code.findbugs</groupId>
794+
<artifactId>findbugs-annotations</artifactId>
795+
</exclusion>
796+
</exclusions>
748797
</dependency>
749798
<dependency>
750799
<groupId>com.carrotsearch</groupId>

0 commit comments

Comments
 (0)