Repository: gora Updated Branches: refs/heads/master eedcfed9d -> e1eb90a36
GORA-375 Upgrade HBase to 0.98 Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/30bb3af9 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/30bb3af9 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/30bb3af9 Branch: refs/heads/master Commit: 30bb3af96d5c70ba2e70dca183c62fb6a49c343c Parents: eedcfed Author: Lewis John McGibbney <[email protected]> Authored: Thu Jan 8 17:55:18 2015 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Thu Jan 8 17:55:18 2015 -0800 ---------------------------------------------------------------------- gora-accumulo/pom.xml | 2 +- gora-cassandra/pom.xml | 2 +- gora-core/pom.xml | 4 +- .../gora/mapreduce/TestGoraInputFormat.java | 9 +- gora-goraci/pom.xml | 2 +- gora-hbase/pom.xml | 6 +- .../apache/gora/hbase/store/HBaseMapping.java | 13 +- .../org/apache/gora/hbase/store/HBaseStore.java | 2 +- .../gora/hbase/store/HBaseTableConnection.java | 140 ++++++++++------ .../gora/hbase/util/HBaseByteInterface.java | 1 - gora-mongodb/pom.xml | 2 +- gora-shims-hadoop/pom.xml | 4 +- gora-shims-hadoop1/pom.xml | 2 +- gora-shims-hadoop2/pom.xml | 6 + gora-tutorial/pom.xml | 2 +- pom.xml | 160 ++++++++++++------- 16 files changed, 232 insertions(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/gora-accumulo/pom.xml b/gora-accumulo/pom.xml index de1ed0a..f1d0209 100644 --- a/gora-accumulo/pom.xml +++ b/gora-accumulo/pom.xml @@ -157,7 +157,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> + <artifactId>hadoop-minicluster</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/gora-cassandra/pom.xml b/gora-cassandra/pom.xml index e5661c9..3fc5a46 100644 --- a/gora-cassandra/pom.xml +++ b/gora-cassandra/pom.xml @@ -184,7 +184,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> + <artifactId>hadoop-minicluster</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-core/pom.xml ---------------------------------------------------------------------- diff --git a/gora-core/pom.xml b/gora-core/pom.xml index 175a067..49e9a3d 100644 --- a/gora-core/pom.xml +++ b/gora-core/pom.xml @@ -112,7 +112,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-client</artifactId> </dependency> <dependency> @@ -161,7 +161,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> + <artifactId>hadoop-minicluster</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java ---------------------------------------------------------------------- diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java b/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java index e9a7b22..74512b0 100644 --- a/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java +++ b/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java @@ -28,17 +28,24 @@ import org.apache.gora.mock.persistency.MockPersistent; import org.apache.gora.mock.query.MockQuery; import org.apache.gora.mock.store.MockDataStore; import org.apache.gora.query.PartitionQuery; +import org.apache.gora.shims.hadoop.HadoopShim; +import org.apache.gora.shims.hadoop.HadoopShimFactory; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.Job; import org.junit.Test; + import static org.junit.Assert.assertTrue; public class TestGoraInputFormat { + + private static final HadoopShim hadoopShim = HadoopShimFactory.INSTANCE().getHadoopShim(); public List<InputSplit> getInputSplits() throws IOException, InterruptedException { - Job job = new Job(); + //Job job = new Job(); + Job job = hadoopShim.createJob(new Configuration()); MockDataStore store = MockDataStore.get(); MockQuery query = store.newQuery(); http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-goraci/pom.xml ---------------------------------------------------------------------- diff --git a/gora-goraci/pom.xml b/gora-goraci/pom.xml index 0922967..002b2d7 100644 --- a/gora-goraci/pom.xml +++ b/gora-goraci/pom.xml @@ -273,7 +273,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-client</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/gora-hbase/pom.xml b/gora-hbase/pom.xml index f1392e5..7cdc4e4 100644 --- a/gora-hbase/pom.xml +++ b/gora-hbase/pom.xml @@ -110,7 +110,7 @@ <dependency> <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> + <artifactId>hbase-client</artifactId> <scope>compile</scope> <exclusions> <exclusion> @@ -173,13 +173,13 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> + <artifactId>hadoop-minicluster</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> + <artifactId>hbase-testing-util</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java ---------------------------------------------------------------------- diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java index f8ad9d7..dbf02c4 100644 --- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java +++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java @@ -23,8 +23,9 @@ import java.util.Map; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.io.hfile.Compression.Algorithm; -import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; +import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.hadoop.hbase.util.Bytes; /** @@ -69,14 +70,14 @@ public class HBaseMapping { private Map<String, HBaseColumn> columnMap = new HashMap<String, HBaseColumn>(); - private String tableName; + private TableName tableName; public String getTableName() { - return tableName; + return tableName.getNameAsString(); } public void setTableName(String tableName) { - this.tableName = tableName; + this.tableName = TableName.valueOf(tableName); } public void addFamilyProps(String tableName, String familyName, @@ -165,7 +166,7 @@ public class HBaseMapping { public HBaseMapping build() { if (tableName == null) throw new IllegalStateException("tableName is not specified"); - Map<String, HColumnDescriptor> families = tableToFamilies.get(tableName); + Map<String, HColumnDescriptor> families = tableToFamilies.get(tableName.getNameAsString()); if (families == null) throw new IllegalStateException("no families for table " + tableName); HTableDescriptor tableDescriptors = new HTableDescriptor(tableName); http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java ---------------------------------------------------------------------- diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java index 3400a34..bc4b838 100644 --- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java +++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java @@ -412,7 +412,7 @@ implements Configurable { } List<PartitionQuery<K,T>> partitions = new ArrayList<PartitionQuery<K,T>>(keys.getFirst().length); for (int i = 0; i < keys.getFirst().length; i++) { - String regionLocation = table.getRegionLocation(keys.getFirst()[i]).getServerAddress().getHostname(); + String regionLocation = table.getRegionLocation(keys.getFirst()[i]).getHostname(); byte[] startRow = query.getStartKey() != null ? toBytes(query.getStartKey()) : HConstants.EMPTY_START_ROW; byte[] stopRow = query.getEndKey() != null ? toBytes(query.getEndKey()) http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseTableConnection.java ---------------------------------------------------------------------- diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseTableConnection.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseTableConnection.java index 5f549b3..8c52d6a 100644 --- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseTableConnection.java +++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseTableConnection.java @@ -18,6 +18,7 @@ package org.apache.gora.hbase.store; import java.io.IOException; +import java.io.InterruptedIOException; import java.util.List; import java.util.Map; import java.util.concurrent.BlockingQueue; @@ -26,8 +27,10 @@ import java.util.concurrent.LinkedBlockingQueue; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.Delete; +import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HTableInterface; @@ -35,16 +38,21 @@ import org.apache.hadoop.hbase.client.Increment; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; +import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException; import org.apache.hadoop.hbase.client.Row; -import org.apache.hadoop.hbase.client.RowLock; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.coprocessor.Batch.Call; import org.apache.hadoop.hbase.client.coprocessor.Batch.Callback; -import org.apache.hadoop.hbase.ipc.CoprocessorProtocol; -import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; +import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; import org.apache.hadoop.hbase.util.Pair; +import com.google.protobuf.Descriptors.MethodDescriptor; +import com.google.protobuf.Message; +import com.google.protobuf.Service; +import com.google.protobuf.ServiceException; + /** * Thread safe implementation to connect to a HBase table. * @@ -62,8 +70,8 @@ public class HBaseTableConnection implements HTableInterface { private final Configuration conf; private final ThreadLocal<HTable> tables; private final BlockingQueue<HTable> pool = new LinkedBlockingQueue<HTable>(); - private final boolean autoflush; - private final String tableName; + private final boolean autoFlush; + private final TableName tableName; /** * Instantiate new connection. @@ -77,8 +85,8 @@ public class HBaseTableConnection implements HTableInterface { throws IOException { this.conf = conf; this.tables = new ThreadLocal<HTable>(); - this.tableName = tableName; - this.autoflush = autoflush; + this.tableName = TableName.valueOf(tableName); + this.autoFlush = autoflush; } private HTable getTable() throws IOException { @@ -86,11 +94,11 @@ public class HBaseTableConnection implements HTableInterface { if (table == null) { table = new HTable(conf, tableName) { @Override - public synchronized void flushCommits() throws IOException { + public synchronized void flushCommits() throws RetriesExhaustedWithDetailsException, InterruptedIOException { super.flushCommits(); } }; - table.setAutoFlush(autoflush); + table.setAutoFlushTo(autoFlush); pool.add(table); //keep track tables.set(table); } @@ -111,7 +119,7 @@ public class HBaseTableConnection implements HTableInterface { @Override public byte[] getTableName() { - return Bytes.toBytes(tableName); + return tableName.getName(); } @Override @@ -121,7 +129,7 @@ public class HBaseTableConnection implements HTableInterface { @Override public boolean isAutoFlush() { - return autoflush; + return autoFlush; } /** @@ -225,6 +233,7 @@ public class HBaseTableConnection implements HTableInterface { return getTable().incrementColumnValue(row, family, qualifier, amount); } + @Deprecated @Override public long incrementColumnValue(byte[] row, byte[] family, byte[] qualifier, long amount, boolean writeToWAL) throws IOException { @@ -240,86 +249,123 @@ public class HBaseTableConnection implements HTableInterface { } @Override - public RowLock lockRow(byte[] row) throws IOException { - return getTable().lockRow(row); + public void batch(List<? extends Row> actions, Object[] results) + throws IOException, InterruptedException { + getTable().batch(actions, results); + } @Override - public void unlockRow(RowLock rl) throws IOException { - getTable().unlockRow(rl); + public void mutateRow(RowMutations rm) throws IOException { + getTable().mutateRow(rm); } @Override - public void batch(List<? extends Row> actions, Object[] results) - throws IOException, InterruptedException { + public Result append(Append append) throws IOException { + return getTable().append(append); + } + + @Override + public void setAutoFlush(boolean autoFlush) { // TODO Auto-generated method stub - getTable().batch(actions, results); } @Override - public Object[] batch(List<? extends Row> actions) throws IOException, - InterruptedException { + public void setAutoFlush(boolean autoFlush, boolean clearBufferOnFail){ // TODO Auto-generated method stub - return getTable().batch(actions); } @Override - public void mutateRow(RowMutations rm) throws IOException { + public long getWriteBufferSize() { // TODO Auto-generated method stub - + return 0; } @Override - public Result append(Append append) throws IOException { + public void setWriteBufferSize(long writeBufferSize) throws IOException { // TODO Auto-generated method stub - return null; } @Override - public <T extends CoprocessorProtocol> T coprocessorProxy(Class<T> protocol, - byte[] row) { - // TODO Auto-generated method stub - return null; + public TableName getName() { + return tableName; } @Override - public <T extends CoprocessorProtocol, R> Map<byte[], R> coprocessorExec( - Class<T> protocol, byte[] startKey, byte[] endKey, Call<T, R> callable) - throws IOException, Throwable { - // TODO Auto-generated method stub - return null; + public Boolean[] exists(List<Get> gets) throws IOException { + return getTable().exists(gets); } @Override - public <T extends CoprocessorProtocol, R> void coprocessorExec( - Class<T> protocol, byte[] startKey, byte[] endKey, Call<T, R> callable, - Callback<R> callback) throws IOException, Throwable { - // TODO Auto-generated method stub + public <R> void + batchCallback(List<? extends Row> actions, Object[] results, Callback<R> callback) + throws IOException, InterruptedException { + getTable().batchCallback(actions, results, callback); } + @Deprecated @Override - public void setAutoFlush(boolean autoFlush) { - // TODO Auto-generated method stub - + public <R> Object[] batchCallback(List<? extends Row> actions, Callback<R> callback) + throws IOException, InterruptedException { + return getTable().batchCallback(actions, callback); } @Override - public void setAutoFlush(boolean autoFlush, boolean clearBufferOnFail) { + public long incrementColumnValue(byte[] row, byte[] family, byte[] qualifier, long amount, + Durability durability) throws IOException { + return getTable().incrementColumnValue(row, family, qualifier, amount,durability); + } + + @Override + public CoprocessorRpcChannel coprocessorService(byte[] row) { // TODO Auto-generated method stub + return null; + } + + @Override + public <T extends Service, R> Map<byte[], R> coprocessorService(Class<T> service, + byte[] startKey, byte[] endKey, Call<T, R> callable) throws ServiceException, Throwable { + return getTable().coprocessorService(service, startKey, endKey, callable); + } + + @Override + public <T extends Service, R> void coprocessorService(Class<T> service, byte[] startKey, + byte[] endKey, Call<T, R> callable, Callback<R> callback) throws ServiceException, Throwable { + getTable().coprocessorService(service, startKey, endKey, callable, callback);; + } + + @Override + public void setAutoFlushTo(boolean autoFlush) { + // TODO Auto-generated method stub + } + + @Override + public <R extends Message> Map<byte[], R> batchCoprocessorService( + MethodDescriptor methodDescriptor, Message request, byte[] startKey, byte[] endKey, + R responsePrototype) throws ServiceException, Throwable { + return getTable().batchCoprocessorService(methodDescriptor, request, startKey, endKey, responsePrototype); + } + + @Override + public <R extends Message> void batchCoprocessorService(MethodDescriptor methodDescriptor, + Message request, byte[] startKey, byte[] endKey, R responsePrototype, Callback<R> callback) + throws ServiceException, Throwable { + getTable().batchCoprocessorService(methodDescriptor, request, startKey, endKey, responsePrototype, callback); } + @Deprecated @Override - public long getWriteBufferSize() { - // TODO Auto-generated method stub - return 0; + public Object[] batch(List<? extends Row> actions) throws IOException, InterruptedException { + return getTable().batch(actions); } @Override - public void setWriteBufferSize(long writeBufferSize) throws IOException { + public boolean checkAndMutate(byte[] arg0, byte[] arg1, byte[] arg2, CompareOp arg3, byte[] arg4, + RowMutations arg5) throws IOException { // TODO Auto-generated method stub - + return false; } } http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-hbase/src/main/java/org/apache/gora/hbase/util/HBaseByteInterface.java ---------------------------------------------------------------------- diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/util/HBaseByteInterface.java b/gora-hbase/src/main/java/org/apache/gora/hbase/util/HBaseByteInterface.java index 03dc339..e9b415f 100644 --- a/gora-hbase/src/main/java/org/apache/gora/hbase/util/HBaseByteInterface.java +++ b/gora-hbase/src/main/java/org/apache/gora/hbase/util/HBaseByteInterface.java @@ -25,7 +25,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.avro.Schema; import org.apache.avro.Schema.Type; -import org.apache.avro.generic.GenericData; import org.apache.avro.io.BinaryDecoder; import org.apache.avro.io.BinaryEncoder; import org.apache.avro.io.DecoderFactory; http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-mongodb/pom.xml ---------------------------------------------------------------------- diff --git a/gora-mongodb/pom.xml b/gora-mongodb/pom.xml index e5659a6..7546295 100644 --- a/gora-mongodb/pom.xml +++ b/gora-mongodb/pom.xml @@ -170,7 +170,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> + <artifactId>hadoop-minicluster</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-shims-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/gora-shims-hadoop/pom.xml b/gora-shims-hadoop/pom.xml index a9ea04b..f630e2c 100644 --- a/gora-shims-hadoop/pom.xml +++ b/gora-shims-hadoop/pom.xml @@ -61,8 +61,8 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop-1.version}</version> + <artifactId>hadoop-client</artifactId> + <version>${hadoop-2.version}</version> <optional>true</optional> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-shims-hadoop1/pom.xml ---------------------------------------------------------------------- diff --git a/gora-shims-hadoop1/pom.xml b/gora-shims-hadoop1/pom.xml index 5a53c49..5146a3f 100644 --- a/gora-shims-hadoop1/pom.xml +++ b/gora-shims-hadoop1/pom.xml @@ -68,7 +68,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>${hadoop-1.version}</version> + <version>${hadoop-1.test.version}</version> <optional>true</optional> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-shims-hadoop2/pom.xml ---------------------------------------------------------------------- diff --git a/gora-shims-hadoop2/pom.xml b/gora-shims-hadoop2/pom.xml index cd6a22a..29c377c 100644 --- a/gora-shims-hadoop2/pom.xml +++ b/gora-shims-hadoop2/pom.xml @@ -64,6 +64,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop-2.test.version}</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.apache.gora</groupId> <artifactId>gora-shims-hadoop</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/gora-tutorial/pom.xml ---------------------------------------------------------------------- diff --git a/gora-tutorial/pom.xml b/gora-tutorial/pom.xml index 0190c1c..db00319 100644 --- a/gora-tutorial/pom.xml +++ b/gora-tutorial/pom.xml @@ -115,7 +115,7 @@ <!-- Hadoop Dependencies --> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> + <artifactId>hadoop-client</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/30bb3af9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2f83b25..e89a4eb 100644 --- a/pom.xml +++ b/pom.xml @@ -615,10 +615,12 @@ <avro.version>1.7.6</avro.version> <jackson.version>1.6.9</jackson.version> <!-- Hadoop Dependencies --> - <hadoop-1.version>1.0.1</hadoop-1.version> - <hadoop-2.version>2.4.0</hadoop-2.version> - <hadoop.test.version>1.0.1</hadoop.test.version> - <hbase.version>0.94.14</hbase.version> + <hadoop-1.version>1.2.1</hadoop-1.version> + <hadoop-2.version>2.5.2</hadoop-2.version> + <hadoop-1.test.version>1.2.1</hadoop-1.test.version> + <hadoop-2.test.version>2.5.2</hadoop-2.test.version> + <hbase.version>0.98.8-hadoop2</hbase.version> + <hbase.test.version>0.98.8-hadoop2</hbase.test.version> <cxf-rt-frontend-jaxrs.version>2.5.2</cxf-rt-frontend-jaxrs.version> <!-- Amazon Dependencies --> <amazon.version>1.3.12</amazon.version> @@ -787,57 +789,63 @@ <version>${jackson.version}</version> </dependency> - <!-- Hadoop Dependencies --> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop-1.version}</version> - <exclusions> - <!-- jackson is conflicting with the Avro dep --> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.kosmos</groupId> - <artifactId>kfs</artifactId> - </exclusion> - <exclusion> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop-2.version}</version> - <classifier>tests</classifier> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop-2.version}</version> - <classifier>tests</classifier> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop-2.version}</version> + <artifactId>hadoop-client</artifactId> + <version>${hadoop-2.version}</version> </dependency> + <!-- Hadoop Dependencies --> +<!-- <dependency> --> +<!-- <groupId>org.apache.hadoop</groupId> --> +<!-- <artifactId>hadoop-core</artifactId> --> +<!-- <version>${hadoop-1.version}</version> --> +<!-- <exclusions> --> +<!-- jackson is conflicting with the Avro dep --> +<!-- <exclusion> --> +<!-- <groupId>org.codehaus.jackson</groupId> --> +<!-- <artifactId>jackson-core-asl</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>org.codehaus.jackson</groupId> --> +<!-- <artifactId>jackson-mapper-asl</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>hsqldb</groupId> --> +<!-- <artifactId>hsqldb</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>net.sf.kosmos</groupId> --> +<!-- <artifactId>kfs</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>net.java.dev.jets3t</groupId> --> +<!-- <artifactId>jets3t</artifactId> --> +<!-- </exclusion> --> +<!-- <exclusion> --> +<!-- <groupId>org.eclipse.jdt</groupId> --> +<!-- <artifactId>core</artifactId> --> +<!-- </exclusion> --> +<!-- </exclusions> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>org.apache.hadoop</groupId> --> +<!-- <artifactId>hadoop-common</artifactId> --> +<!-- <version>${hadoop-2.version}</version> --> +<!-- <classifier>tests</classifier> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>org.apache.hadoop</groupId> --> +<!-- <artifactId>hadoop-mapreduce-client-jobclient</artifactId> --> +<!-- <version>${hadoop-2.version}</version> --> +<!-- <classifier>tests</classifier> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>org.apache.hadoop</groupId> --> +<!-- <artifactId>hadoop-mapreduce-client-core</artifactId> --> +<!-- <version>${hadoop-2.version}</version> --> +<!-- </dependency> --> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> @@ -882,25 +890,65 @@ <dependency> <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> + <artifactId>hbase-client</artifactId> <version>${hbase.version}</version> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> <artifactId>avro</artifactId> </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-common</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-yarn-common</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-auth</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>${hbase.version}</version> + <artifactId>hbase-testing-util</artifactId> + <version>${hbase.test.version}</version> <type>test-jar</type> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> <artifactId>avro</artifactId> </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-common</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-yarn-common</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-auth</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> </exclusions> </dependency> @@ -1354,8 +1402,8 @@ <!-- Testing Dependencies --> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>${hadoop.test.version}</version> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop-2.test.version}</version> </dependency> <dependency>
