diff --git a/.kokoro/continuous/bigtableadmin-it.cfg b/.kokoro/continuous/bigtableadmin-it.cfg deleted file mode 100644 index b5129e51121e..000000000000 --- a/.kokoro/continuous/bigtableadmin-it.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "INTEGRATION_TEST_ARGS" - value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} - -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" -} diff --git a/.kokoro/nightly/bigtableadmin-it.cfg b/.kokoro/nightly/bigtableadmin-it.cfg deleted file mode 100644 index b5129e51121e..000000000000 --- a/.kokoro/nightly/bigtableadmin-it.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "INTEGRATION_TEST_ARGS" - value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} - -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" -} diff --git a/.kokoro/presubmit/bigtableadmin-it.cfg b/.kokoro/presubmit/bigtableadmin-it.cfg deleted file mode 100644 index b5129e51121e..000000000000 --- a/.kokoro/presubmit/bigtableadmin-it.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "INTEGRATION_TEST_ARGS" - value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} - -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" -} diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index ae86827feed4..d6a4b476e886 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -239,11 +239,6 @@ grpc-google-cloud-bigtable-v2 0.46.0 - - com.google.cloud - google-cloud-bigtable-admin - 0.81.0-alpha - com.google.api.grpc proto-google-cloud-bigtable-admin-v2 diff --git a/google-cloud-clients/google-cloud-bigtable-admin/README.md b/google-cloud-clients/google-cloud-bigtable-admin/README.md deleted file mode 100644 index 34e1d679997d..000000000000 --- a/google-cloud-clients/google-cloud-bigtable-admin/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Google Cloud Java Client for Bigtable Admin - -This project has been merged into google-cloud-bigtable and will soon -be deleted. \ No newline at end of file diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml deleted file mode 100644 index 3bcfed59663e..000000000000 --- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - google-cloud-bigtable-admin - 0.81.0-alpha - jar - Google Cloud Bigtable Admin - https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigtable - - Java idiomatic client for Google Cloud Bigtable Admin API. - - - com.google.cloud - google-cloud-clients - 0.81.0-alpha - - - - ${project.groupId} - google-cloud-bigtable - - - diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/internal/DeprecationMarker.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/internal/DeprecationMarker.java deleted file mode 100644 index fd1e724d123c..000000000000 --- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/internal/DeprecationMarker.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2019 Google LLC - * - * Licensed 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 - * - * https://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. - */ -package com.google.cloud.bigtable.admin.v2.internal; - -/** - * Marker class whose existence can be used to detect uses of the deprecated - * google-cloud-bigtable-admin artifact - * - *

This class is considered an internal implementation detail and not meant to be used by - * applications. - * - * @deprecated Please migrate to using the google-cloud-bigtable artifact - */ -@Deprecated -public final class DeprecationMarker {} diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java index 94d05f97ac72..ccee1af06efb 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java +++ b/google-cloud-clients/google-cloud-bigtable/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 @@ * } */ public final class BigtableInstanceAdminClient implements AutoCloseable { - static { - ArtifactDeprecationChecker.checkDeprecatedArtifactUse(); - } - private final String projectId; private final BigtableInstanceAdminStub stub; diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java index 8f5185a19396..65cebdb0f62f 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java +++ b/google-cloud-clients/google-cloud-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 @@ * } */ public final class BigtableTableAdminClient implements AutoCloseable { - - static { - ArtifactDeprecationChecker.checkDeprecatedArtifactUse(); - } - private final EnhancedBigtableTableAdminStub stub; private final String projectId; private final String instanceId; diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/internal/ArtifactDeprecationChecker.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/internal/ArtifactDeprecationChecker.java deleted file mode 100644 index ff239d13cd26..000000000000 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/internal/ArtifactDeprecationChecker.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2019 Google LLC - * - * Licensed 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 - * - * https://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. - */ -package com.google.cloud.bigtable.admin.v2.internal; - -import com.google.api.core.InternalApi; -import java.util.logging.Logger; - -/** - * This class detects usage of and notifies users that the google-cloud-bigtable-admin artifact has - * been deprecated in favor of the merged google-cloud-bigtable artifact. - * - *

This class is considered an internal implementation detail and not meant to be used by - * applications. - */ -@InternalApi -public final class ArtifactDeprecationChecker { - private static final Logger LOGGER = Logger.getLogger(ArtifactDeprecationChecker.class.getName()); - - public static void checkDeprecatedArtifactUse() { - if (isDeprecationMarkerPresent()) { - LOGGER.warning( - "google-cloud-bigtable-admin has been merged into google-cloud-bigtable." - + " Please update your build file to stop depending on google-cloud-bigtable-admin" - + " and use google-cloud-bigtable directly."); - } - } - - private static boolean isDeprecationMarkerPresent() { - try { - ArtifactDeprecationChecker.class - .getClassLoader() - .loadClass("com.google.cloud.bigtable.admin.v2.internal.DeprecationMarker"); - return true; - } catch (ClassNotFoundException e) { - return false; - } - } -} diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index 8a3298c9f468..4132e5974179 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -423,7 +423,6 @@ google-cloud-asset google-cloud-automl google-cloud-bigtable - google-cloud-bigtable-admin google-cloud-bigquery google-cloud-bigquerydatatransfer google-cloud-bigquerystorage diff --git a/google-cloud-testing/google-cloud-bigtable-emulator/README.md b/google-cloud-testing/google-cloud-bigtable-emulator/README.md index 13dcd2152c5f..8177775305db 100644 --- 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 google-cloud-bigtable - - com.google.cloud - google-cloud-bigtable-admin - - com.google.cloud google-cloud-bigtable-emulator @@ -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 index 04d939567295..c37f57e92d9b 100644 --- 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