accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/6] accumulo git commit: ACCUMULO-3479 Remove some warnings
Date Thu, 15 Jan 2015 22:42:03 GMT
ACCUMULO-3479 Remove some warnings

Remove extra warnings leftover from dropping Hadoop 1 support


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6574fab
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6574fab
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6574fab

Branch: refs/heads/master
Commit: f6574fab9da4d1d37da91c530353921b7d66d779
Parents: 7719bc5
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Jan 15 17:02:35 2015 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jan 15 17:41:27 2015 -0500

----------------------------------------------------------------------
 pom.xml                                                        | 4 ++--
 .../java/org/apache/accumulo/master/tableOps/DeleteTable.java  | 2 --
 .../test/java/org/apache/accumulo/test/AccumuloDFSBase.java    | 1 -
 test/pom.xml                                                   | 6 ++++--
 4 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6574fab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8e0f141..be8adb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -942,8 +942,8 @@
                 <module name="OuterTypeFilename" />
                 <module name="LineLength">
                   <!-- needs extra, because Eclipse formatter ignores the ending left
brace -->
-                  <property name="max" value="200"/>
-                  <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+                  <property name="max" value="200" />
+                  <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"
/>
                 </module>
                 <module name="AvoidStarImport" />
                 <module name="UnusedImports">

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6574fab/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
index 4cff0c7..873867b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
@@ -268,8 +268,6 @@ class CleanUp extends MasterRepo {
       final String childName = child.getPath().getName();
       final Path childInSrc = new Path(src, childName), childInDest = new Path(dest, childName);
 
-      boolean isFile = fs.isFile(childInSrc), isDir = child.isDir();
-
       if (child.isFile()) {
         if (fs.exists(childInDest)) {
           log.warn("File already exists in archive, ignoring. " + childInDest);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6574fab/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
----------------------------------------------------------------------
diff --git a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
index cbc8beb..3e94291 100644
--- a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
+++ b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
@@ -35,7 +35,6 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-@SuppressWarnings("deprecation")
 public class AccumuloDFSBase {
 
   protected static Configuration conf = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6574fab/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index b58df3c..a0247c6 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -159,8 +159,10 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minikdc</artifactId>
       <!-- Specifically depend on this version of minikdc to avoid having
-           to increase out normal hadoop dependency --> 
-      <version>2.3.0</version>
+           to increase out normal hadoop dependency -->
+      <?SORTPOM IGNORE?>
+      <version>2.3.0</version><!--$NO-MVN-MAN-VER$-->
+      <?SORTPOM RESUME?>
       <scope>test</scope>
       <exclusions>
         <!-- Pulls in an older bouncycastle version -->


Mime
View raw message