Preparations for release v1.1.6-beta-04

dvimont · Sep 8, 2016 · cd22660 · cd22660
1 parent 7211436
commit cd22660
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 52 deletions.
diff --git a/1.2.2/pom.xml → 1.1.6/pom.xml b/1.2.2/pom.xml → 1.1.6/pom.xml
@@ -23,14 +23,14 @@
   <parent>
     <groupId>org.commonvox</groupId>
     <artifactId>hbase-column-manager-parent-pom</artifactId>
-    <version>1.x-SNAPSHOT</version>
+    <version>1.1.6-beta-04</version>
   </parent>
 
   <properties>
-    <hbaseVersion>1.2.2</hbaseVersion>
+    <hbaseVersion>1.1.6</hbaseVersion>
   </properties>
   <artifactId>hbase-column-manager</artifactId>
-  <version>1.2.2-beta-SNAPSHOT</version>
+  <version>1.1.6-beta-04</version>
   <packaging>jar</packaging>
 
   <name>CommonVox tools for HBase™ - ColumnManagerAPI for HBase™</name>

diff --git a/master/pom.xml b/master/pom.xml
@@ -23,15 +23,15 @@
   <parent>
     <groupId>org.commonvox</groupId>
     <artifactId>hbase-column-manager-parent-pom</artifactId>
-    <version>1.x-SNAPSHOT</version>
+    <version>1.1.6-beta-04</version>
   </parent>
 
   <properties>
-    <hbaseVersion>1.2.2</hbaseVersion>
+    <hbaseVersion>1.1.6</hbaseVersion>
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
   <artifactId>hbase-column-manager</artifactId>
-  <version>1.2-master-beta-SNAPSHOT</version>
+  <version>1.1.6.master-beta-04</version>
   <packaging>jar</packaging>
 
   <name>CommonVox tools for HBase™ - ColumnManagerAPI for HBase™</name>

diff --git a/master/src/main/java/org/commonvox/hbase_column_manager/MAdmin.java b/master/src/main/java/org/commonvox/hbase_column_manager/MAdmin.java
@@ -34,7 +34,7 @@
 import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.security.SecurityCapability;
+//import org.apache.hadoop.hbase.client.security.SecurityCapability;
 import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;
 import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
@@ -876,24 +876,24 @@ public Future<Boolean> abortProcedureAsync(long l, boolean bln) throws IOExcepti
   // end of overrides of methods introduced in HBase 1.1.3
 
   // beginning of overrides of methods introduced in HBase 1.2.0
-  @Override
-  public boolean normalize() throws IOException {
-    return wrappedHbaseAdmin.normalize();
-  }
-
-  @Override
-  public boolean isNormalizerEnabled() throws IOException {
-    return wrappedHbaseAdmin.isNormalizerEnabled();
-  }
-
-  @Override
-  public boolean setNormalizerRunning(boolean bln) throws IOException {
-    return wrappedHbaseAdmin.setNormalizerRunning(bln);
-  }
-
-  @Override
-  public List<SecurityCapability> getSecurityCapabilities() throws IOException {
-    return wrappedHbaseAdmin.getSecurityCapabilities();
-  }
+//  @Override
+//  public boolean normalize() throws IOException {
+//    return wrappedHbaseAdmin.normalize();
+//  }
+//
+//  @Override
+//  public boolean isNormalizerEnabled() throws IOException {
+//    return wrappedHbaseAdmin.isNormalizerEnabled();
+//  }
+//
+//  @Override
+//  public boolean setNormalizerRunning(boolean bln) throws IOException {
+//    return wrappedHbaseAdmin.setNormalizerRunning(bln);
+//  }
+//
+//  @Override
+//  public List<SecurityCapability> getSecurityCapabilities() throws IOException {
+//    return wrappedHbaseAdmin.getSecurityCapabilities();
+//  }
   // end of overrides of methods introduced in HBase 1.2.0
 }
diff --git a/master/src/main/java/org/commonvox/hbase_column_manager/MTable.java b/master/src/main/java/org/commonvox/hbase_column_manager/MTable.java
@@ -676,26 +676,26 @@ public int hashCode() {
     return wrappedTable.hashCode();
   }
 
-  // beginning of overrides of methods introduced in HBase 1.2.2
-  @Override
-  public void setOperationTimeout(int i) {
-    wrappedTable.setOperationTimeout(i);
-  }
-
-  @Override
-  public int getOperationTimeout() {
-    return wrappedTable.getOperationTimeout();
-  }
-
-  @Override
-  public void setRpcTimeout(int i) {
-    wrappedTable.setRpcTimeout(i);
-  }
-
-  @Override
-  public int getRpcTimeout() {
-    return wrappedTable.getRpcTimeout();
-  }
+  // beginning of overrides of methods introduced in HBase 1.1.5 (removed in 1.1.6!) & 1.2.2
+//  @Override
+//  public void setOperationTimeout(int i) {
+//    wrappedTable.setOperationTimeout(i);
+//  }
+//
+//  @Override
+//  public int getOperationTimeout() {
+//    return wrappedTable.getOperationTimeout();
+//  }
+//
+//  @Override
+//  public void setRpcTimeout(int i) {
+//    wrappedTable.setRpcTimeout(i);
+//  }
+//
+//  @Override
+//  public int getRpcTimeout() {
+//    return wrappedTable.getRpcTimeout();
+//  }
   // end of overrides of methods introduced in HBase 1.2.2
 
   /**

diff --git a/master/src/main/java/org/commonvox/hbase_column_manager/Repository.java b/master/src/main/java/org/commonvox/hbase_column_manager/Repository.java
@@ -2653,10 +2653,10 @@ Get cloneGetWithoutFamilyMap(Get originalGet) throws IOException {
     for (Map.Entry<String, byte[]> attr : originalGet.getAttributesMap().entrySet()) {
       convertedGet.setAttribute(attr.getKey(), attr.getValue());
     }
-    for (Map.Entry<byte[], TimeRange> entry : originalGet.getColumnFamilyTimeRange().entrySet()) {
-      TimeRange tr = entry.getValue();
-      convertedGet.setColumnFamilyTimeRange(entry.getKey(), tr.getMin(), tr.getMax());
-    }
+//    for (Map.Entry<byte[], TimeRange> entry : originalGet.getColumnFamilyTimeRange().entrySet()) {
+//      TimeRange tr = entry.getValue();
+//      convertedGet.setColumnFamilyTimeRange(entry.getKey(), tr.getMin(), tr.getMax());
+//    }
     return convertedGet;
   }
 

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>org.commonvox</groupId>
   <artifactId>hbase-column-manager-parent-pom</artifactId>
-  <version>1.x-SNAPSHOT</version>
+  <version>1.1.6-beta-04</version>
   <packaging>pom</packaging>
 
   <name>CommonVox tools for HBase™ - ColumnManagerAPI for HBase™ parent POM</name>
@@ -38,7 +38,7 @@
          TESTING should be done separately for each build after having started up an instance of hbase
          using that build's corresponding hbase release.  -->
     <module>master</module>
-    <module>1.2.2</module>
+    <module>1.1.6</module>
   </modules>
 
   <licenses>