Remove bigtableadmin artifact (googleapis#4533)

* Remove bigtableadmin artifact * fix merge
shollyman · Feb 22, 2019 · ed3a0c8 · ed3a0c8
1 parent 6300b45
commit ed3a0c8
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 212 deletions.
diff --git a/.kokoro/continuous/bigtableadmin-it.cfg b/.kokoro/continuous/bigtableadmin-it.cfg
diff --git a/.kokoro/nightly/bigtableadmin-it.cfg b/.kokoro/nightly/bigtableadmin-it.cfg
diff --git a/.kokoro/presubmit/bigtableadmin-it.cfg b/.kokoro/presubmit/bigtableadmin-it.cfg
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
@@ -239,11 +239,6 @@
         <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
         <version>0.46.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-bigtable-admin</artifactId>
-        <version>0.81.0-alpha</version><!-- {x-version-update:google-cloud-bigtable-admin:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/README.md b/google-cloud-clients/google-cloud-bigtable-admin/README.md
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
diff --git a/...le-admin/src/main/java/com/google/cloud/bigtable/admin/v2/internal/DeprecationMarker.java b/...le-admin/src/main/java/com/google/cloud/bigtable/admin/v2/internal/DeprecationMarker.java
diff --git a/...igtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/...igtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
@@ -29,7 +29,6 @@
 import com.google.cloud.Policy.DefaultMarshaller;
 import com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPage;
 import com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;
-import com.google.cloud.bigtable.admin.v2.internal.ArtifactDeprecationChecker;
 import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
 import com.google.cloud.bigtable.admin.v2.models.AppProfile;
 import com.google.cloud.bigtable.admin.v2.models.Cluster;
@@ -100,10 +99,6 @@
  * }</pre>
  */
 public final class BigtableInstanceAdminClient implements AutoCloseable {
-  static {
-    ArtifactDeprecationChecker.checkDeprecatedArtifactUse();
-  }
-
   private final String projectId;
   private final BigtableInstanceAdminStub stub;
 

diff --git a/...d-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/...d-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
@@ -27,7 +27,6 @@
 import com.google.bigtable.admin.v2.ListTablesRequest;
 import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPage;
 import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse;
-import com.google.cloud.bigtable.admin.v2.internal.ArtifactDeprecationChecker;
 import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
 import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
 import com.google.cloud.bigtable.admin.v2.models.ModifyColumnFamiliesRequest;
@@ -94,11 +93,6 @@
  * }</pre>
  */
 public final class BigtableTableAdminClient implements AutoCloseable {
-
-  static {
-    ArtifactDeprecationChecker.checkDeprecatedArtifactUse();
-  }
-
   private final EnhancedBigtableTableAdminStub stub;
   private final String projectId;
   private final String instanceId;

diff --git a/...src/main/java/com/google/cloud/bigtable/admin/v2/internal/ArtifactDeprecationChecker.java b/...src/main/java/com/google/cloud/bigtable/admin/v2/internal/ArtifactDeprecationChecker.java
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
@@ -423,7 +423,6 @@
     <module>google-cloud-asset</module>
     <module>google-cloud-automl</module>
     <module>google-cloud-bigtable</module>
-    <module>google-cloud-bigtable-admin</module>
     <module>google-cloud-bigquery</module>
     <module>google-cloud-bigquerydatatransfer</module>
     <module>google-cloud-bigquerystorage</module>

diff --git a/google-cloud-testing/google-cloud-bigtable-emulator/README.md b/google-cloud-testing/google-cloud-bigtable-emulator/README.md
@@ -32,11 +32,6 @@ If you are using Maven, add this to your pom.xml file
     <artifactId>google-cloud-bigtable</artifactId>
   </dependency>
 
-  <dependency>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-bigtable-admin</artifactId>
-  </dependency>
-
   <dependency>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-bigtable-emulator</artifactId>
@@ -54,14 +49,12 @@ If you are using Maven, add this to your pom.xml file
 If you are using Gradle, add this to your dependencies
 ```Groovy
 compile 'com.google.cloud:google-cloud-bigtable:0.81.0-alpha'
-compile 'com.google.cloud:google-cloud-bigtable-admin:0.81.0-alpha'
 testCompile 'com.google.cloud:google-cloud-bigtable-emulator:0.81.0-alpha'
 testCompile 'junit:junit:4.12'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
 libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "0.81.0-alpha"
-libraryDependencies += "com.google.cloud" % "google-cloud-bigtable-admin" % "0.81.0-alpha"
 libraryDependencies += "com.google.cloud" % "google-cloud-bigtable-emulator" % "0.81.0-alpha" % Test
 libraryDependencies += "junit" % "junit" % "4.12" % Test
 ```

diff --git a/versions.txt b/versions.txt
@@ -13,7 +13,6 @@ google-cloud-bigquery:1.63.0:1.63.0
 google-cloud-bigquerydatatransfer:0.81.0-beta:0.81.0-beta
 google-cloud-bigquerystorage:0.81.0-beta:0.81.0-beta
 google-cloud-bigtable:0.81.0-alpha:0.81.0-alpha
-google-cloud-bigtable-admin:0.81.0-alpha:0.81.0-alpha
 google-cloud-bigtable-emulator:0.81.0-alpha:0.81.0-alpha
 google-cloud-bom:0.81.0-alpha:0.81.0-alpha
 google-cloud-clients:0.81.0-alpha:0.81.0-alpha