ACCUMULO-4497 Remove unnecessary excludes files * Remove "empty" findbugs exclude filter files * Activate exclude filters for findbugs only when exclude filter file exists
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0292c08e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0292c08e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0292c08e Branch: refs/heads/1.8 Commit: 0292c08e355616510e6bd3f5ec6f43b1d9a37750 Parents: 8255fc0 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Oct 11 18:47:55 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Oct 11 18:47:55 2016 -0400 ---------------------------------------------------------------------- contrib/findbugs-exclude.xml | 42 -------------------- .../src/main/findbugs/exclude-filter.xml | 18 --------- pom.xml | 12 +++++- .../src/main/findbugs/exclude-filter.xml | 18 --------- start/src/main/findbugs/exclude-filter.xml | 18 --------- 5 files changed, 11 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0292c08e/contrib/findbugs-exclude.xml ---------------------------------------------------------------------- diff --git a/contrib/findbugs-exclude.xml b/contrib/findbugs-exclude.xml deleted file mode 100644 index 89fa658..0000000 --- a/contrib/findbugs-exclude.xml +++ /dev/null @@ -1,42 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FindBugsFilter> - <Match> - <Class name="~org\.apache\.accumulo\.core\.client\.impl\.thrift\..*" /> - </Match> - <Match> - <Class name="~org\.apache\.accumulo\.core\.data\.thrift\..*" /> - </Match> - <Match> - <Class name="~org\.apache\.accumulo\.core\.gc\.thrift\..*" /> - </Match> - <Match> - <Class name="~org\.apache\.accumulo\.core\.master\.thrift\..*" /> - </Match> - <Match> - <Class name="~org\.apache\.accumulo\.core\.security\.thrift\..*" /> - </Match> - <Match> - <Class name="~org\.apache\.accumulo\.core\.tabletserver\.thrift\..*" /> - </Match> - <Match> - <Class name="~org\.apache\.accumulo\.trace\.thrift\..*" /> - </Match> - <Match> - <Class name="~org\.apache\.accumulo\.proxy\.thrift\..*" /> - </Match> -</FindBugsFilter> http://git-wip-us.apache.org/repos/asf/accumulo/blob/0292c08e/maven-plugin/src/main/findbugs/exclude-filter.xml ---------------------------------------------------------------------- diff --git a/maven-plugin/src/main/findbugs/exclude-filter.xml b/maven-plugin/src/main/findbugs/exclude-filter.xml deleted file mode 100644 index c801230..0000000 --- a/maven-plugin/src/main/findbugs/exclude-filter.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FindBugsFilter> -</FindBugsFilter> http://git-wip-us.apache.org/repos/asf/accumulo/blob/0292c08e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f7b57cf..e3ba5e2 100644 --- a/pom.xml +++ b/pom.xml @@ -558,7 +558,6 @@ <failOnError>true</failOnError> <includeTests>true</includeTests> <maxRank>16</maxRank> - <excludeFilterFile>src/main/findbugs/exclude-filter.xml</excludeFilterFile> </configuration> </plugin> <plugin> @@ -1419,5 +1418,16 @@ </pluginManagement> </build> </profile> + <profile> + <id>add-findbugs-excludes</id> + <activation> + <file> + <exists>src/main/findbugs/exclude-filter.xml</exists> + </file> + </activation> + <properties> + <findbugs.excludeFilterFile>src/main/findbugs/exclude-filter.xml</findbugs.excludeFilterFile> + </properties> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/0292c08e/server/monitor/src/main/findbugs/exclude-filter.xml ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/findbugs/exclude-filter.xml b/server/monitor/src/main/findbugs/exclude-filter.xml deleted file mode 100644 index c801230..0000000 --- a/server/monitor/src/main/findbugs/exclude-filter.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FindBugsFilter> -</FindBugsFilter> http://git-wip-us.apache.org/repos/asf/accumulo/blob/0292c08e/start/src/main/findbugs/exclude-filter.xml ---------------------------------------------------------------------- diff --git a/start/src/main/findbugs/exclude-filter.xml b/start/src/main/findbugs/exclude-filter.xml deleted file mode 100644 index c801230..0000000 --- a/start/src/main/findbugs/exclude-filter.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FindBugsFilter> -</FindBugsFilter>
