Repository: GoogleCloudPlatform/cloud-bigtable-client
Pull request #1647 (2018-02-02 18:29:32)

Renaming integration tests projects
`bigtable-hbase-integration-tests` becomes `bigtable-hbase-1-x-integration-tests` and `bigtable-hbase-integration-tests-2.x` becomes `bigtable-hbase-2.x-integration-tests`.  This makes our integration tests projects to be in line with bigtable-hbase-[12].x-[hadoop|shaded] which makes them easier to find.

sduskis: Ack.  We still don't need app profile for the import tool.  The Default profile id should be fine.
spollapally: LGTM

Patch:
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/main/java/com/google/cloud/bigtable/hbase/MavenPlaceholder.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/main/java/com/google/cloud/bigtable/hbase/MavenPlaceholder.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/main/java/com/google/cloud/bigtable/hbase/MavenPlaceholder.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/main/java/com/google/cloud/bigtable/hbase/MavenPlaceholder.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/EmulatorTests.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/EmulatorTests.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/EmulatorTests.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/EmulatorTests.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTests.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTests.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTests.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTests.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsGap.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsGap.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsGap.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsGap.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsNoKnownGap.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsNoKnownGap.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsNoKnownGap.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsNoKnownGap.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/SimpleIntegrationTests.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/SimpleIntegrationTests.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/SimpleIntegrationTests.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/SimpleIntegrationTests.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestAppend.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestAppend.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestAppend.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestAppend.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestBasicOps.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBasicOps.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestBasicOps.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBasicOps.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestBatch.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBatch.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestBatch.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBatch.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestBufferedMutator.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBufferedMutator.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestBufferedMutator.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBufferedMutator.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestCheckAndMutate.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCheckAndMutate.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestCheckAndMutate.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCheckAndMutate.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestColumnFamilyAdmin.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestColumnFamilyAdmin.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestColumnFamilyAdmin.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestColumnFamilyAdmin.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestCreateTable.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCreateTable.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestCreateTable.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCreateTable.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestDelete.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestDelete.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestDelete.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestDelete.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestFilters.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestFilters.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestFilters.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestFilters.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestGet.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGet.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestGet.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGet.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestGetTable.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGetTable.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestGetTable.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGetTable.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestImport.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestImport.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestImport.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestImport.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestIncrement.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestIncrement.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestIncrement.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestIncrement.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestListTables.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestListTables.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestListTables.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestListTables.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestPut.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestPut.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestPut.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestPut.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestPutGetDelete.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestPutGetDelete.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestPutGetDelete.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestPutGetDelete.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestSnapshots.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestSnapshots.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestSnapshots.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestSnapshots.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestTimestamp.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTimestamp.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestTimestamp.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTimestamp.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTruncateTable.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTruncateTable.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTruncateTable.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTruncateTable.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/async/TestAsyncAdmin.java b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/async/TestAsyncAdmin.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/async/TestAsyncAdmin.java
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/async/TestAsyncAdmin.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/resources/hbase-site.xml b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/resources/hbase-site.xml
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/resources/hbase-site.xml
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/resources/hbase-site.xml
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/resources/log4j.properties b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/resources/log4j.properties
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/resources/log4j.properties
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/src/test/resources/log4j.properties
diff --git a/bigtable-hbase-parent/pom.xml b/bigtable-hbase-parent/pom.xml
index 33465581f..4256dbf45 100644
--- a/bigtable-hbase-parent/pom.xml
+++ b/bigtable-hbase-parent/pom.xml
@@ -33,11 +33,11 @@ limitations under the License.
     <modules>
         <module>bigtable-hbase</module>
         <module>bigtable-hbase-integration-tests-common</module>
-        <module>bigtable-hbase-integration-tests</module>
-        <module>bigtable-hbase-integration-tests-2.x</module>
-        <module>bigtable-hbase-mapreduce</module>
         <module>bigtable-hbase-1.x</module>
+        <module>bigtable-hbase-1.x-integration-tests</module>
         <module>bigtable-hbase-2.x</module>
+        <module>bigtable-hbase-2.x-integration-tests</module>
+        <module>bigtable-hbase-mapreduce</module>
     </modules>
 
     <profiles>


Test patch:
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/pom.xml b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/pom.xml
similarity index 99%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/pom.xml
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/pom.xml
index 64a749c9e..730d1100e 100644
--- a/bigtable-hbase-parent/bigtable-hbase-integration-tests/pom.xml
+++ b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
         <version>1.1.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>bigtable-hbase-integration-tests</artifactId>
+    <artifactId>bigtable-hbase-1.x-integration-tests</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/main/java/com/google/cloud/bigtable/hbase/MavenPlaceholder.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/main/java/com/google/cloud/bigtable/hbase/MavenPlaceholder.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/main/java/com/google/cloud/bigtable/hbase/MavenPlaceholder.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/main/java/com/google/cloud/bigtable/hbase/MavenPlaceholder.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/EmulatorTests.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/EmulatorTests.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/EmulatorTests.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/EmulatorTests.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTests.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTests.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTests.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTests.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsGap.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsGap.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsGap.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsGap.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsNoKnownGap.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsNoKnownGap.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsNoKnownGap.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/IntegrationTestsNoKnownGap.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/SimpleIntegrationTests.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/SimpleIntegrationTests.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/SimpleIntegrationTests.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/SimpleIntegrationTests.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestAppend.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestAppend.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestAppend.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestAppend.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBasicOps.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBasicOps.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBasicOps.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBasicOps.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBatch.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBatch.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBatch.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBatch.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBufferedMutator.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBufferedMutator.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBufferedMutator.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestBufferedMutator.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCheckAndMutate.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCheckAndMutate.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCheckAndMutate.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCheckAndMutate.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestColumnFamilyAdmin.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestColumnFamilyAdmin.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestColumnFamilyAdmin.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestColumnFamilyAdmin.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCreateTable.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCreateTable.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCreateTable.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestCreateTable.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestDelete.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestDelete.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestDelete.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestDelete.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestFilters.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestFilters.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestFilters.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestFilters.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGet.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGet.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGet.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGet.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGetTable.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGetTable.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGetTable.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestGetTable.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestImport.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestImport.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestImport.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestImport.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestIncrement.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestIncrement.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestIncrement.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestIncrement.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestListTables.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestListTables.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestListTables.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestListTables.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestPut.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestPut.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestPut.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestPut.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestSnapshots.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestSnapshots.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestSnapshots.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestSnapshots.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTimestamp.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTimestamp.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTimestamp.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTimestamp.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestTruncateTable.java b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTruncateTable.java
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/java/com/google/cloud/bigtable/hbase/TestTruncateTable.java
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/java/com/google/cloud/bigtable/hbase/TestTruncateTable.java
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/resources/hbase-site.xml b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/resources/hbase-site.xml
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/src/test/resources/hbase-site.xml
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/resources/hbase-site.xml
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/resources/log4j.properties b/bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/resources/log4j.properties
similarity index 100%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests/src/test/resources/log4j.properties
rename to bigtable-hbase-parent/bigtable-hbase-1.x-integration-tests/src/test/resources/log4j.properties
diff --git a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/pom.xml b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/pom.xml
similarity index 99%
rename from bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/pom.xml
rename to bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/pom.xml
index ff8b9152b..dd27564ff 100644
--- a/bigtable-hbase-parent/bigtable-hbase-integration-tests-2.x/pom.xml
+++ b/bigtable-hbase-parent/bigtable-hbase-2.x-integration-tests/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
         <version>1.1.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>bigtable-hbase-integration-tests-2.x</artifactId>
+    <artifactId>bigtable-hbase-2.x-integration-tests</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>