diff --git a/pom.xml b/pom.xml index e6658921..60d6c180 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,77 @@ 1.2.14.1-SNAPSHOT + + + + com.google.guava + guava + 11.0.2 + + + com.google.protobuf + protobuf-java + 3.11.4 + + + commons-lang + commons-lang + 2.6 + + + commons-codec + commons-codec + 1.9 + + + org.codehaus.jackson + jackson-core-asl + 1.9.13 + + + commons-logging + commons-logging + 1.2 + + + log4j + log4j + 1.2.17 + + + io.netty + netty-all + 4.1.100.Final + + + org.slf4j + slf4j-api + ${slf4j.version} + + + io.netty + netty + 3.7.0.Final + + + junit + junit + ${junit.version} + test + + + com.alipay.sofa.common + sofa-common-tools + 1.3.12 + + + org.objenesis + objenesis + 3.0.1 + + + + org.apache.hadoop @@ -173,22 +244,11 @@ - - org.slf4j - slf4j-api - ${slf4j.version} - org.slf4j slf4j-nop ${slf4j.version} - - junit - junit - ${junit.version} - test - org.powermock powermock-api-mockito2 @@ -405,6 +465,24 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M3 + + + enforce-dependency-convergence + + enforce + + + + + + + + + diff --git a/src/main/java/com/alipay/oceanbase/hbase/OHTable.java b/src/main/java/com/alipay/oceanbase/hbase/OHTable.java index 48bb3ccb..db047840 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/OHTable.java +++ b/src/main/java/com/alipay/oceanbase/hbase/OHTable.java @@ -1023,8 +1023,8 @@ public Result increment(Increment increment) throws IOException { List qualifiers = new ArrayList(); byte[] rowKey = increment.getRow(); - Map.Entry> entry = increment.getFamilyCellMap() - .entrySet().iterator().next(); + Map.Entry> entry = increment.getFamilyCellMap().entrySet() + .iterator().next(); byte[] f = entry.getKey();