hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecl...@apache.org
Subject svn commit: r1528646 - in /hbase/branches/0.96: hbase-assembly/pom.xml hbase-examples/pom.xml hbase-it/pom.xml hbase-shell/pom.xml hbase-testing-util/ hbase-testing-util/pom.xml hbase-thrift/pom.xml pom.xml
Date Wed, 02 Oct 2013 21:59:44 GMT
Author: eclark
Date: Wed Oct  2 21:59:43 2013
New Revision: 1528646

URL: http://svn.apache.org/r1528646
Log:
HBASE-9699 For Downstreamers using HBaseTestingUtility is hard.

Added:
    hbase/branches/0.96/hbase-testing-util/
    hbase/branches/0.96/hbase-testing-util/pom.xml
Modified:
    hbase/branches/0.96/hbase-assembly/pom.xml
    hbase/branches/0.96/hbase-examples/pom.xml
    hbase/branches/0.96/hbase-it/pom.xml
    hbase/branches/0.96/hbase-shell/pom.xml
    hbase/branches/0.96/hbase-thrift/pom.xml
    hbase/branches/0.96/pom.xml

Modified: hbase/branches/0.96/hbase-assembly/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-assembly/pom.xml?rev=1528646&r1=1528645&r2=1528646&view=diff
==============================================================================
Binary files - no diff available.

Modified: hbase/branches/0.96/hbase-examples/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-examples/pom.xml?rev=1528646&r1=1528645&r2=1528646&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-examples/pom.xml (original)
+++ hbase/branches/0.96/hbase-examples/pom.xml Wed Oct  2 21:59:43 2013
@@ -69,42 +69,26 @@
     </dependency>
     <dependency>
         <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-common</artifactId>
-        <type>test-jar</type>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-protocol</artifactId>
-        <scope>compile</scope>
     </dependency>
     <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-client</artifactId>
-        <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-server</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
+      <artifactId>hbase-thrift</artifactId>
     </dependency>
     <dependency>
         <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-server</artifactId>
-        <type>test-jar</type>
+        <artifactId>hbase-testing-util</artifactId>
         <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-thrift</artifactId>
-    </dependency>
+
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
@@ -113,6 +97,14 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
  </dependencies>
  <profiles>
      <!-- Skip the tests in this module -->

Modified: hbase/branches/0.96/hbase-it/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-it/pom.xml?rev=1528646&r1=1528645&r2=1528646&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-it/pom.xml (original)
+++ hbase/branches/0.96/hbase-it/pom.xml Wed Oct  2 21:59:43 2013
@@ -144,16 +144,32 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-common</artifactId>
-      <type>test-jar</type>
+      <artifactId>hbase-protocol</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-protocol</artifactId>
+      <artifactId>hbase-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-client</artifactId>
+      <artifactId>hbase-shell</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-hadoop-compat</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>${compat.module}</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-testing-util</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -176,46 +192,9 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-shell</artifactId>
+      <groupId>org.cloudera.htrace</groupId>
+      <artifactId>htrace-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-      <dependency>
-          <groupId>org.apache.hbase</groupId>
-          <artifactId>hbase-hadoop-compat</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.hbase</groupId>
-          <artifactId>hbase-hadoop-compat</artifactId>
-          <version>${project.version}</version>
-          <type>test-jar</type>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.hbase</groupId>
-          <artifactId>${compat.module}</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.hbase</groupId>
-          <artifactId>${compat.module}</artifactId>
-          <version>${project.version}</version>
-          <type>test-jar</type>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.cloudera.htrace</groupId>
-        <artifactId>htrace-core</artifactId>
-      </dependency>
   </dependencies>
 
   <profiles>

Modified: hbase/branches/0.96/hbase-shell/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-shell/pom.xml?rev=1528646&r1=1528645&r2=1528646&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-shell/pom.xml (original)
+++ hbase/branches/0.96/hbase-shell/pom.xml Wed Oct  2 21:59:43 2013
@@ -177,18 +177,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-common</artifactId>
-      <type>test-jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-hadoop-compat</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-hadoop-compat</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
@@ -197,15 +186,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>${compat.module}</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
+      <artifactId>hbase-testing-util</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- General dependencies -->

Added: hbase/branches/0.96/hbase-testing-util/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-testing-util/pom.xml?rev=1528646&view=auto
==============================================================================
--- hbase/branches/0.96/hbase-testing-util/pom.xml (added)
+++ hbase/branches/0.96/hbase-testing-util/pom.xml Wed Oct  2 21:59:43 2013
@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<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/xsd/maven-4.0.0.xsd">
+    <!--
+      /**
+       * 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.
+       */
+      -->
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>hbase</artifactId>
+        <groupId>org.apache.hbase</groupId>
+        <version>0.96.0</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>hbase-testing-util</artifactId>
+    <name>HBase - Testing Util</name>
+    <description>HBase Testing Utilities.</description>
+
+    <dependencies>
+        <!-- Intra-project dependencies -->
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-common</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-common</artifactId>
+            <type>test-jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-protocol</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-client</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-server</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-server</artifactId>
+            <type>test-jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-hadoop-compat</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-hadoop-compat</artifactId>
+            <type>test-jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>${compat.module}</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>${compat.module}</artifactId>
+            <type>test-jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <!-- Profiles for building against different hadoop versions -->
+        <!-- There are a lot of common dependencies used here, should investigate
+        if we can combine these profiles somehow -->
+        <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
+        activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
+        the same time. -->
+        <profile>
+            <id>hadoop-1.1</id>
+            <activation>
+                <property>
+                    <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+                    <!--h1--><name>!hadoop.profile</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-test</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>hadoop-1.0</id>
+            <activation>
+                <property>
+                    <name>hadoop.profile</name>
+                    <value>1.0</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-test</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!--
+          profile for building against Hadoop 2.0.0-alpha. Activate using:
+           mvn -Dhadoop.profile=2.0
+        -->
+        <profile>
+            <id>hadoop-2.0</id>
+            <activation>
+                <property>
+                    <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+                    <!--h2--><name>hadoop.profile</name><value>2.0</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-auth</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-client</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-mapreduce-client-core</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-hdfs</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-hdfs</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-annotations</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-minicluster</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!--
+          profile for building against Hadoop 3.0.x. Activate using:
+           mvn -Dhadoop.profile=3.0
+        -->
+        <profile>
+            <id>hadoop-3.0</id>
+            <activation>
+                <property>
+                    <name>hadoop.profile</name>
+                    <value>3.0</value>
+                </property>
+            </activation>
+            <properties>
+                <hadoop.version>3.0-SNAPSHOT</hadoop.version>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-annotations</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-minicluster</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file

Modified: hbase/branches/0.96/hbase-thrift/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/pom.xml?rev=1528646&r1=1528645&r2=1528646&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-thrift/pom.xml (original)
+++ hbase/branches/0.96/hbase-thrift/pom.xml Wed Oct  2 21:59:43 2013
@@ -144,11 +144,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-common</artifactId>
-      <type>test-jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-protocol</artifactId>
     </dependency>
     <dependency>
@@ -181,8 +176,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
-      <type>test-jar</type>
+      <artifactId>hbase-testing-util</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -191,22 +185,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-hadoop-compat</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>${compat.module}</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>${compat.module}</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.cloudera.htrace</groupId>

Modified: hbase/branches/0.96/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/pom.xml?rev=1528646&r1=1528645&r2=1528646&view=diff
==============================================================================
--- hbase/branches/0.96/pom.xml (original)
+++ hbase/branches/0.96/pom.xml Wed Oct  2 21:59:43 2013
@@ -60,6 +60,7 @@
     <module>hbase-examples</module>
     <module>hbase-prefix-tree</module>
     <module>hbase-assembly</module>
+    <module>hbase-testing-util</module>
   </modules>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/hbase/trunk</connection>
@@ -1005,6 +1006,12 @@
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-testing-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
       <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-prefix-tree</artifactId>



Mime
View raw message