Skip to content

Commit 36547f5

Browse files
zhtttylzzhtttylz
committed
HADOOP-19731. Fix SpotBugs warnings introduced after SpotBugs version upgrade.
1 parent dd8fd7e commit 36547f5

File tree

28 files changed

+138
-64
lines changed

28 files changed

+138
-64
lines changed

‎dev-support/findbugs-exclude-global.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<FindBugsFilter>
3+
<Match>
4+
<Bug category="EXPERIMENTAL"/>
5+
</Match>
6+
<Match>
7+
<Bug code="AT"/>
8+
</Match>
9+
<Match>
10+
<Bug code="CT"/>
11+
</Match>
12+
<Match>
13+
<Bug pattern="PA_PUBLIC_PRIMITIVE_ATTRIBUTE"/>
14+
</Match>
15+
<Match>
16+
<Bug pattern="NN_NAKED_NOTIFY"/>
17+
</Match>
18+
</FindBugsFilter>

‎hadoop-cloud-storage-project/hadoop-cos/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@
6767
<plugin>
6868
<groupId>com.github.spotbugs</groupId>
6969
<artifactId>spotbugs-maven-plugin</artifactId>
70-
<configuration>
70+
<configuration combine.children="append">
7171
<xmlOutput>true</xmlOutput>
72-
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
73-
</excludeFilterFile>
72+
<excludeFilterFiles>
73+
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
74+
</excludeFilterFile>
75+
</excludeFilterFiles>
7476
<effort>Max</effort>
7577
</configuration>
7678
</plugin>

‎hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,12 @@
6262
<plugin>
6363
<groupId>com.github.spotbugs</groupId>
6464
<artifactId>spotbugs-maven-plugin</artifactId>
65-
<configuration>
65+
<configuration combine.children="append">
6666
<xmlOutput>true</xmlOutput>
67-
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
68-
</excludeFilterFile>
67+
<excludeFilterFiles>
68+
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
69+
</excludeFilterFile>
70+
</excludeFilterFiles>
6971
<effort>Max</effort>
7072
</configuration>
7173
</plugin>

‎hadoop-cloud-storage-project/hadoop-tos/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,12 @@
182182
<plugin>
183183
<groupId>com.github.spotbugs</groupId>
184184
<artifactId>spotbugs-maven-plugin</artifactId>
185-
<configuration>
185+
<configuration combine.children="append">
186186
<xmlOutput>true</xmlOutput>
187-
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
188-
</excludeFilterFile>
187+
<excludeFilterFiles>
188+
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
189+
</excludeFilterFile>
190+
</excludeFilterFiles>
189191
<effort>Max</effort>
190192
</configuration>
191193
</plugin>

‎hadoop-common-project/hadoop-auth/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,10 @@
266266
<plugin>
267267
<groupId>com.github.spotbugs</groupId>
268268
<artifactId>spotbugs-maven-plugin</artifactId>
269-
<configuration>
270-
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
269+
<configuration combine.children="append">
270+
<excludeFilterFiles>
271+
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
272+
</excludeFilterFiles>
271273
</configuration>
272274
</plugin>
273275
</plugins>

‎hadoop-common-project/hadoop-kms/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,11 @@
243243
<plugin>
244244
<groupId>com.github.spotbugs</groupId>
245245
<artifactId>spotbugs-maven-plugin</artifactId>
246-
<configuration>
247-
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
248-
</excludeFilterFile>
246+
<configuration combine.children="append">
247+
<excludeFilterFiles>
248+
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
249+
</excludeFilterFile>
250+
</excludeFilterFiles>
249251
</configuration>
250252
</plugin>
251253
</plugins>

‎hadoop-common-project/hadoop-minikdc/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@
7575
<plugin>
7676
<groupId>com.github.spotbugs</groupId>
7777
<artifactId>spotbugs-maven-plugin</artifactId>
78-
<configuration>
79-
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
80-
</excludeFilterFile>
78+
<configuration combine.children="append">
79+
<excludeFilterFiles>
80+
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
81+
</excludeFilterFile>
82+
</excludeFilterFiles>
8183
</configuration>
8284
</plugin>
8385
</plugins>

‎hadoop-common-project/hadoop-nfs/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,11 @@
124124
<plugin>
125125
<groupId>com.github.spotbugs</groupId>
126126
<artifactId>spotbugs-maven-plugin</artifactId>
127-
<configuration>
128-
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
129-
</excludeFilterFile>
127+
<configuration combine.children="append">
128+
<excludeFilterFiles>
129+
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
130+
</excludeFilterFile>
131+
</excludeFilterFiles>
130132
</configuration>
131133
</plugin>
132134
</plugins>

‎hadoop-common-project/hadoop-registry/pom.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,12 @@
191191
<plugin>
192192
<groupId>com.github.spotbugs</groupId>
193193
<artifactId>spotbugs-maven-plugin</artifactId>
194-
<configuration>
194+
<configuration combine.children="append">
195195
<xmlOutput>true</xmlOutput>
196-
<excludeFilterFile>${project.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
196+
<excludeFilterFiles>
197+
<excludeFilterFile>${project.basedir}/dev-support/findbugs-exclude.xml
198+
</excludeFilterFile>
199+
</excludeFilterFiles>
197200
<effort>Max</effort>
198201
</configuration>
199202
</plugin>

‎hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,10 @@
364364
<plugin>
365365
<groupId>com.github.spotbugs</groupId>
366366
<artifactId>spotbugs-maven-plugin</artifactId>
367-
<configuration>
368-
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
367+
<configuration combine.children="append">
368+
<excludeFilterFiles>
369+
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
370+
</excludeFilterFiles>
369371
</configuration>
370372
</plugin>
371373
</plugins>

0 commit comments

Comments
 (0)