diff --git a/README.md b/README.md index 206acbb55..f380596ed 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ Add the following to your project's pom.xml. io.grpc grpc-bom - 1.24.1 + 1.26.0 pom import diff --git a/google-cloud-bigtable-deps-bom/README.md b/google-cloud-bigtable-deps-bom/README.md new file mode 100644 index 000000000..6889c82d1 --- /dev/null +++ b/google-cloud-bigtable-deps-bom/README.md @@ -0,0 +1,44 @@ +# Dependency BOM for Google Cloud Bigtable Client + +This module contains a BOM that lists all of Cloud Bigtable's dependency versions. Please note that +this BOM is complementary to google-cloud-bigtable-bom. This BOM only contains transitive dependencies, +while google-cloud-bigtable-bom contains versions for direct google-cloud-bigtable artifacts. + +This BOM is primarily intended to be used by java-bigtable-hbase to keep the dependencies in sync. + +Example usage: + +[//]: # ({x-version-update-start:google-cloud-bigtable:released}) +```xml + + + + + com.google.cloud + google-cloud-bigtable-bom + 1.8.0 + pom + import + + + + com.google.cloud + google-cloud-bigtable-deps-bom + 1.8.0 + pom + import + + + + + + + + com.google.cloud + google-cloud-bigtable + + + +``` +[//]: # ({x-version-update-end}) diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml new file mode 100644 index 000000000..2f47bde82 --- /dev/null +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -0,0 +1,221 @@ + + + 4.0.0 + + + com.google.cloud + google-cloud-shared-config + 0.3.0 + + + com.google.cloud + google-cloud-bigtable-deps-bom + 1.8.1-SNAPSHOT + + pom + + A BOM that describes all of the dependencies used by google-cloud-bigtable. It's + mainly intended to be used by java-bigtable-hbase to align dependencies + + + + Google LLC + + + + + igorberstein + Igor Bernstein + igorbernstein@google.com + Google LLC + + Developer + + + + kolea2 + Kristen O'Leary + kaoleary@google.com + Google LLC + + Developer + + + + + + scm:git:https://github.com/googleapis/java-bigtable.git + scm:git:git@github.com:googleapis/java-bigtable.git + https://github.com/googleapis/java-bigtable + + + + + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + 1.7 + + 1.52.0 + 1.8.1 + 1.17.0 + 1.92.1 + 0.19.0 + + 1.26.0 + 28.2-android + 0.24.0 + 3.11.1 + 1.4.0 + + + + + + + com.google.api + gax-bom + ${gax.version} + pom + import + + + com.google.auth + google-auth-library-bom + ${google.auth.version} + pom + import + + + com.google.guava + guava-bom + ${guava.version} + pom + import + + + io.grpc + grpc-bom + ${grpc.version} + pom + import + + + + + com.google.api + api-common + ${google.api-common.version} + + + com.google.api.grpc + proto-google-common-protos + ${google.common-protos.version} + + + com.google.api.grpc + proto-google-iam-v1 + 0.13.0 + + + com.google.auto.value + auto-value + ${autovalue.version} + + + com.google.auto.value + auto-value-annotations + ${autovalue.version} + + + com.google.cloud + google-cloud-core + ${google.core.version} + + + com.google.cloud + google-cloud-core-grpc + ${google.core.version} + + + com.google.errorprone + error_prone_annotations + 2.3.4 + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.google.protobuf + protobuf-java-util + ${protobuf.version} + + + io.opencensus + opencensus-api + ${opencensus.version} + + + javax.annotation + javax.annotation-api + 1.3.2 + + + org.codehaus.mojo + animal-sniffer-annotations + 1.18 + + + org.threeten + threetenbp + ${threeten.version} + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + true + + + + + + org.apache.maven.plugins + maven-site-plugin + + + false + + + + + diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 92da8ff08..4b84a41bb 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -75,6 +75,25 @@ + + + + com.google.cloud + google-cloud-bigtable-deps-bom + 1.8.1-SNAPSHOT + pom + import + + + com.google.cloud + google-cloud-bigtable-bom + 1.8.1-SNAPSHOT + pom + import + + + + diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index d2a51356f..1d454bc30 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -29,6 +29,26 @@ + + + + + com.google.cloud + google-cloud-bigtable-deps-bom + 1.8.1-SNAPSHOT + pom + import + + + com.google.cloud + google-cloud-bigtable-bom + 1.8.1-SNAPSHOT + pom + import + + + + diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index fa54305aa..e0011abfb 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -12,6 +12,26 @@ google-cloud-bigtable-parent 1.8.1-SNAPSHOT + + + + + com.google.cloud + google-cloud-bigtable-deps-bom + 1.8.1-SNAPSHOT + pom + import + + + com.google.cloud + google-cloud-bigtable-bom + 1.8.1-SNAPSHOT + pom + import + + + + io.grpc diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index 2db453b72..26db09f39 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -12,6 +12,26 @@ google-cloud-bigtable-parent 1.8.1-SNAPSHOT + + + + + com.google.cloud + google-cloud-bigtable-deps-bom + 1.8.1-SNAPSHOT + pom + import + + + com.google.cloud + google-cloud-bigtable-bom + 1.8.1-SNAPSHOT + pom + import + + + + io.grpc diff --git a/pom.xml b/pom.xml index ede7144a5..838cbcc68 100644 --- a/pom.xml +++ b/pom.xml @@ -152,156 +152,13 @@ github google-cloud-bigtable-parent https://googleapis.dev/java/google-api-grpc/latest - - 1.7 - 1.52.0 - 1.8.1 - 1.17.0 - 1.92.1 - - 1.26.0 - 28.2-android - 0.24.0 - 3.11.1 - 1.4.0 - - - com.google.api - gax-bom - ${gax.version} - pom - import - - - com.google.guava - guava-bom - ${guava.version} - pom - import - - - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - - - com.google.cloud - google-cloud-bigtable-emulator - 0.117.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-bigtable-admin-v2 - 1.8.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-bigtable-v2 - 1.8.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-bigtable-admin-v2 - 1.8.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-bigtable-v2 - 1.8.1-SNAPSHOT - - - - - com.google.api - api-common - ${google.api-common.version} - - - com.google.api.grpc - proto-google-common-protos - ${google.common-protos.version} - - - com.google.api.grpc - proto-google-iam-v1 - 0.13.0 - - - com.google.auto.value - auto-value - ${autovalue.version} - - - com.google.auto.value - auto-value-annotations - ${autovalue.version} - - - com.google.cloud - google-cloud-core - ${google.core.version} - - - com.google.cloud - google-cloud-core-grpc - ${google.core.version} - - - com.google.errorprone - error_prone_annotations - 2.3.4 - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.protobuf - protobuf-java-util - ${protobuf.version} - - - io.opencensus - opencensus-api - ${opencensus.version} - - - javax.annotation - javax.annotation-api - 1.3.2 - - - org.codehaus.mojo - animal-sniffer-annotations - 1.18 - - - org.threeten - threetenbp - ${threeten.version} - + - - com.google.api - gax-grpc - ${gax.version} - testlib - com.google.cloud google-cloud-conformance-tests @@ -462,5 +319,6 @@ google-cloud-bigtable google-cloud-bigtable-emulator google-cloud-bigtable-bom + google-cloud-bigtable-deps-bom diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 45af07a79..d9f6f597a 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -12,6 +12,26 @@ google-cloud-bigtable-parent 1.8.1-SNAPSHOT + + + + + com.google.cloud + google-cloud-bigtable-deps-bom + 1.8.1-SNAPSHOT + pom + import + + + com.google.cloud + google-cloud-bigtable-bom + 1.8.1-SNAPSHOT + pom + import + + + + com.google.api diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index dc6c8aa13..74f35339e 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -12,6 +12,26 @@ google-cloud-bigtable-parent 1.8.1-SNAPSHOT + + + + + com.google.cloud + google-cloud-bigtable-deps-bom + 1.8.1-SNAPSHOT + pom + import + + + com.google.cloud + google-cloud-bigtable-bom + 1.8.1-SNAPSHOT + pom + import + + + + com.google.api