Skip to content

Commit 7b27c79

Browse files
committed
include the directory-maven-plugin to compute repo.root
1 parent 14115d7 commit 7b27c79

File tree

28 files changed

+109
-36
lines changed

28 files changed

+109
-36
lines changed

dev-support/findbugs-exclude-global.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@
99
<Match>
1010
<Bug code="CT"/>
1111
</Match>
12+
<Match>
13+
<Bug code="EI"/>
14+
</Match>
15+
<Match>
16+
<Bug code="EI2"/>
17+
</Match>
1218
<Match>
1319
<Bug pattern="PA_PUBLIC_PRIMITIVE_ATTRIBUTE"/>
1420
</Match>
1521
<Match>
1622
<Bug pattern="NN_NAKED_NOTIFY"/>
1723
</Match>
18-
</FindBugsFilter>
24+
</FindBugsFilter>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@
6969
<artifactId>spotbugs-maven-plugin</artifactId>
7070
<configuration>
7171
<xmlOutput>true</xmlOutput>
72-
<excludeFilterFiles combine.children="append">
72+
<excludeFilterFiles>
7373
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
7474
</excludeFilterFile>
75+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
76+
</excludeFilterFile>
7577
</excludeFilterFiles>
7678
<effort>Max</effort>
7779
</configuration>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,11 @@
6464
<artifactId>spotbugs-maven-plugin</artifactId>
6565
<configuration>
6666
<xmlOutput>true</xmlOutput>
67-
<excludeFilterFiles combine.children="append">
67+
<excludeFilterFiles>
6868
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
6969
</excludeFilterFile>
70+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
71+
</excludeFilterFile>
7072
</excludeFilterFiles>
7173
<effort>Max</effort>
7274
</configuration>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,11 @@
184184
<artifactId>spotbugs-maven-plugin</artifactId>
185185
<configuration>
186186
<xmlOutput>true</xmlOutput>
187-
<excludeFilterFiles combine.children="append">
187+
<excludeFilterFiles>
188188
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
189189
</excludeFilterFile>
190+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
191+
</excludeFilterFile>
190192
</excludeFilterFiles>
191193
<effort>Max</effort>
192194
</configuration>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,10 @@
267267
<groupId>com.github.spotbugs</groupId>
268268
<artifactId>spotbugs-maven-plugin</artifactId>
269269
<configuration>
270-
<excludeFilterFiles combine.children="append">
270+
<excludeFilterFiles>
271271
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
272+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
273+
</excludeFilterFile>
272274
</excludeFilterFiles>
273275
</configuration>
274276
</plugin>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,11 @@
244244
<groupId>com.github.spotbugs</groupId>
245245
<artifactId>spotbugs-maven-plugin</artifactId>
246246
<configuration>
247-
<excludeFilterFiles combine.children="append">
247+
<excludeFilterFiles>
248248
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
249249
</excludeFilterFile>
250+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
251+
</excludeFilterFile>
250252
</excludeFilterFiles>
251253
</configuration>
252254
</plugin>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@
7676
<groupId>com.github.spotbugs</groupId>
7777
<artifactId>spotbugs-maven-plugin</artifactId>
7878
<configuration>
79-
<excludeFilterFiles combine.children="append">
79+
<excludeFilterFiles>
8080
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
8181
</excludeFilterFile>
82+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
83+
</excludeFilterFile>
8284
</excludeFilterFiles>
8385
</configuration>
8486
</plugin>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,11 @@
125125
<groupId>com.github.spotbugs</groupId>
126126
<artifactId>spotbugs-maven-plugin</artifactId>
127127
<configuration>
128-
<excludeFilterFiles combine.children="append">
128+
<excludeFilterFiles>
129129
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
130130
</excludeFilterFile>
131+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
132+
</excludeFilterFile>
131133
</excludeFilterFiles>
132134
</configuration>
133135
</plugin>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,11 @@
193193
<artifactId>spotbugs-maven-plugin</artifactId>
194194
<configuration>
195195
<xmlOutput>true</xmlOutput>
196-
<excludeFilterFiles combine.children="append">
196+
<excludeFilterFiles>
197197
<excludeFilterFile>${project.basedir}/dev-support/findbugs-exclude.xml
198198
</excludeFilterFile>
199+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
200+
</excludeFilterFile>
199201
</excludeFilterFiles>
200202
<effort>Max</effort>
201203
</configuration>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,10 @@
365365
<groupId>com.github.spotbugs</groupId>
366366
<artifactId>spotbugs-maven-plugin</artifactId>
367367
<configuration>
368-
<excludeFilterFiles combine.children="append">
368+
<excludeFilterFiles>
369369
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
370+
<excludeFilterFile>${repo.root}/dev-support/findbugs-exclude-global.xml
371+
</excludeFilterFile>
370372
</excludeFilterFiles>
371373
</configuration>
372374
</plugin>
@@ -404,7 +406,7 @@
404406
</plugins>
405407
</build>
406408
</profile>
407-
409+
408410
<profile>
409411
<id>dist</id>
410412
<activation>

0 commit comments

Comments
 (0)