You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2018/05/08 18:50:55 UTC
[GitHub] ctubbsii closed pull request #466: Remove the fate module by
combining it into core
ctubbsii closed pull request #466: Remove the fate module by combining it into core
URL: https://github.com/apache/accumulo/pull/466
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/assemble/bin/accumulo-util b/assemble/bin/accumulo-util
index 71aea89a81..fe62ad31ec 100755
--- a/assemble/bin/accumulo-util
+++ b/assemble/bin/accumulo-util
@@ -218,7 +218,6 @@ function hadoop_jar() {
ZOOKEEPER_LIB=$(eval "$ZOOKEEPER_CMD")
CORE_LIB="${lib}/accumulo-core.jar"
- FATE_LIB="${lib}/accumulo-fate.jar"
THRIFT_LIB="${lib}/libthrift.jar"
JCOMMANDER_LIB="${lib}/jcommander.jar"
COMMONS_VFS_LIB="${lib}/commons-vfs2.jar"
@@ -244,8 +243,8 @@ function hadoop_jar() {
fi
done
- LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB,$GUAVA_LIB,$HTRACE_LIB"
- H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB:$GUAVA_LIB:$HTRACE_LIB"
+ LIB_JARS="$THRIFT_LIB,$CORE_LIB,$ZOOKEEPER_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB,$GUAVA_LIB,$HTRACE_LIB"
+ H_JARS="$THRIFT_LIB:$CORE_LIB:$ZOOKEEPER_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB:$GUAVA_LIB:$HTRACE_LIB"
for jar in $USERJARS; do
LIB_JARS="$LIB_JARS,$jar"
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 0aba9cbcb2..31f9a9915a 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -120,11 +120,6 @@
<artifactId>accumulo-core</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
diff --git a/client/mapreduce/pom.xml b/client/mapreduce/pom.xml
index 2ecce2d556..acfe3f51ac 100644
--- a/client/mapreduce/pom.xml
+++ b/client/mapreduce/pom.xml
@@ -43,10 +43,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 87dcd282c7..53e32cec62 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -79,10 +79,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
diff --git a/core/src/main/findbugs/exclude-filter.xml b/core/src/main/findbugs/exclude-filter.xml
index 56d3659c2b..a3db72f205 100644
--- a/core/src/main/findbugs/exclude-filter.xml
+++ b/core/src/main/findbugs/exclude-filter.xml
@@ -94,7 +94,10 @@
</Match>
<Match>
<!-- admin classes can call System.exit -->
- <Class name="org.apache.accumulo.core.file.rfile.PrintInfo" />
+ <Or>
+ <Class name="org.apache.accumulo.core.file.rfile.PrintInfo" />
+ <Class name="org.apache.accumulo.fate.AdminUtil" />
+ </Or>
<Bug code="DM" pattern="DM_EXIT" />
</Match>
<Match>
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AcceptableException.java b/core/src/main/java/org/apache/accumulo/fate/AcceptableException.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/AcceptableException.java
rename to core/src/main/java/org/apache/accumulo/fate/AcceptableException.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java b/core/src/main/java/org/apache/accumulo/fate/AdminUtil.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
rename to core/src/main/java/org/apache/accumulo/fate/AdminUtil.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
rename to core/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java b/core/src/main/java/org/apache/accumulo/fate/Fate.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/Fate.java
rename to core/src/main/java/org/apache/accumulo/fate/Fate.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
rename to core/src/main/java/org/apache/accumulo/fate/ReadOnlyRepo.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
rename to core/src/main/java/org/apache/accumulo/fate/ReadOnlyStore.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java b/core/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java
rename to core/src/main/java/org/apache/accumulo/fate/ReadOnlyTStore.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Repo.java b/core/src/main/java/org/apache/accumulo/fate/Repo.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/Repo.java
rename to core/src/main/java/org/apache/accumulo/fate/Repo.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/StackOverflowException.java b/core/src/main/java/org/apache/accumulo/fate/StackOverflowException.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/StackOverflowException.java
rename to core/src/main/java/org/apache/accumulo/fate/StackOverflowException.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/core/src/main/java/org/apache/accumulo/fate/TStore.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/TStore.java
rename to core/src/main/java/org/apache/accumulo/fate/TStore.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/core/src/main/java/org/apache/accumulo/fate/ZooStore.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
rename to core/src/main/java/org/apache/accumulo/fate/ZooStore.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java b/core/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
rename to core/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java b/core/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
rename to core/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/Retry.java b/core/src/main/java/org/apache/accumulo/fate/util/Retry.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/util/Retry.java
rename to core/src/main/java/org/apache/accumulo/fate/util/Retry.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java b/core/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
rename to core/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactory.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
similarity index 100%
rename from fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
rename to core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java b/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
rename to core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java b/core/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
rename to core/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java b/core/src/test/java/org/apache/accumulo/fate/SimpleStore.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/SimpleStore.java
rename to core/src/test/java/org/apache/accumulo/fate/SimpleStore.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java b/core/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
rename to core/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/util/RetryTest.java b/core/src/test/java/org/apache/accumulo/fate/util/RetryTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/util/RetryTest.java
rename to core/src/test/java/org/apache/accumulo/fate/util/RetryTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactoryTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactoryTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactoryTest.java
rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheFactoryTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java
rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooCacheTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooKeeperConnectionInfoTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooKeeperConnectionInfoTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooKeeperConnectionInfoTest.java
rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooKeeperConnectionInfoTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java b/core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java
similarity index 100%
rename from fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java
rename to core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java
diff --git a/fate/.gitignore b/fate/.gitignore
deleted file mode 100644
index e77a822fe7..0000000000
--- a/fate/.gitignore
+++ /dev/null
@@ -1,28 +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.
-
-# Maven ignores
-/target/
-
-# IDE ignores
-/.settings/
-/.project
-/.classpath
-/.pydevproject
-/.idea
-/*.iml
-/nbproject/
-/nbactions.xml
-/nb-configuration.xml
diff --git a/fate/pom.xml b/fate/pom.xml
deleted file mode 100644
index 2c8bb6fb96..0000000000
--- a/fate/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>accumulo-fate</artifactId>
- <name>Apache Accumulo Fate</name>
- <description>A FAult-Tolerant Executor library used by Apache Accumulo.</description>
- <dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/fate/src/main/findbugs/exclude-filter.xml b/fate/src/main/findbugs/exclude-filter.xml
deleted file mode 100644
index 249da12235..0000000000
--- a/fate/src/main/findbugs/exclude-filter.xml
+++ /dev/null
@@ -1,23 +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>
- <!-- admin classes can call System.exit -->
- <Class name="org.apache.accumulo.fate.AdminUtil" />
- <Bug code="DM" pattern="DM_EXIT" />
- </Match>
-</FindBugsFilter>
diff --git a/fate/src/test/resources/log4j.properties b/fate/src/test/resources/log4j.properties
deleted file mode 100644
index 651049d728..0000000000
--- a/fate/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,24 +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.
-
-log4j.rootLogger=INFO, CA
-log4j.appender.CA=org.apache.log4j.ConsoleAppender
-log4j.appender.CA.layout=org.apache.log4j.PatternLayout
-log4j.appender.CA.layout.ConversionPattern=[%t] %-5p %c %x - %m%n
-
-log4j.logger.org.apache.zookeeper=ERROR,CA
-log4j.logger.org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock=WARN
-log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR
-
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 5fa8e319c6..df7a972ce3 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -55,10 +55,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
diff --git a/pom.xml b/pom.xml
index 733602e379..6f0c6ba9ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,6 @@
<module>assemble</module>
<module>client/mapreduce</module>
<module>core</module>
- <module>fate</module>
<module>iterator-test-harness</module>
<module>maven-plugin</module>
<module>minicluster</module>
@@ -320,11 +319,6 @@
<artifactId>accumulo-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 7e4c5c0282..d2e31d380c 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -76,10 +76,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index ff0367fba4..e5de5a3c5d 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -48,10 +48,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
diff --git a/server/master/pom.xml b/server/master/pom.xml
index d686b5b007..ab84144137 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -52,10 +52,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 61a2d34131..4c889d05ad 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -64,10 +64,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index 6ccb113e10..d7ca49d020 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -48,10 +48,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 4fce901f40..aee011c672 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -68,10 +68,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
diff --git a/shell/pom.xml b/shell/pom.xml
index 1cb11e613a..75f63cdf9a 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -71,10 +71,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
diff --git a/test/pom.xml b/test/pom.xml
index 82f2c09168..02ded2a0ea 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -86,10 +86,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services