Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
feat: introduce google-cloud-bigtable-deps-bom (#130)
* feat: introduce google-cloud-bigtable-deps-bom

Move all of the dependency version management out of the root pom and into a separate BOM.
This will allow java-bigtable-hbase to sync on dependency versions with java-bigtable

* docs

* whitespace
  • Loading branch information
igorbernstein2 committed Jan 6, 2020
1 parent da1e6c6 commit 9289a13
Show file tree
Hide file tree
Showing 10 changed files with 387 additions and 145 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -337,7 +337,7 @@ Add the following to your project's pom.xml.
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>1.24.1</version>
<version>1.26.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
44 changes: 44 additions & 0 deletions 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
<dependencyManagement>
<dependencies>
<!-- Lock google-cloud-bigtable direct dependency versions -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>1.8.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Lock google-cloud-bigtable transitive dependency versions -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>1.8.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Declare dependency on google-cloud-client, combined with the above this will
ensure a consistent set of dependencies -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable</artifactId>
</dependency>
</dependencies>

```
[//]: # ({x-version-update-end})
221 changes: 221 additions & 0 deletions google-cloud-bigtable-deps-bom/pom.xml
@@ -0,0 +1,221 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>0.3.0</version>
</parent>

<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->

<packaging>pom</packaging>
<description>
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
</description>

<organization>
<name>Google LLC</name>
</organization>

<developers>
<developer>
<id>igorberstein</id>
<name>Igor Bernstein</name>
<email>igorbernstein@google.com</email>
<organization>Google LLC</organization>
<roles>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>kolea2</id>
<name>Kristen O'Leary</name>
<email>kaoleary@google.com</email>
<organization>Google LLC</organization>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>

<scm>
<connection>scm:git:https://github.com/googleapis/java-bigtable.git</connection>
<developerConnection>scm:git:git@github.com:googleapis/java-bigtable.git</developerConnection>
<url>https://github.com/googleapis/java-bigtable</url>
</scm>

<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<properties>
<autovalue.version>1.7</autovalue.version>
<!-- when updating, make sure to align the versions of transitive deps below -->
<gax.version>1.52.0</gax.version>
<google.api-common.version>1.8.1</google.api-common.version>
<google.common-protos.version>1.17.0</google.common-protos.version>
<google.core.version>1.92.1</google.core.version>
<google.auth.version>0.19.0</google.auth.version>
<!-- make sure to update the grpc version in README -->
<grpc.version>1.26.0</grpc.version>
<guava.version>28.2-android</guava.version>
<opencensus.version>0.24.0</opencensus.version>
<protobuf.version>3.11.1</protobuf.version>
<threeten.version>1.4.0</threeten.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- BOMs, in alphabetical order -->
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-bom</artifactId>
<version>${gax.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>${google.auth.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>${guava.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Production dependency version definitions in alphabetical order -->
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>${google.api-common.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>${google.common-protos.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
<version>0.13.0</version>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${autovalue.version}</version>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<version>${autovalue.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>${google.core.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-grpc</artifactId>
<version>${google.core.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.3.4</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>${opencensus.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<version>1.18</version>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>

<!-- Using maven site plugin only as a hook for javadoc:aggregate, don't need the reports -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>

<configuration>
<generateReports>false</generateReports>
</configuration>
</plugin>
</plugins>
</build>
</project>
19 changes: 19 additions & 0 deletions google-cloud-bigtable-emulator/pom.xml
Expand Up @@ -75,6 +75,25 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Compile deps in alphabetical order -->
<dependency>
Expand Down
20 changes: 20 additions & 0 deletions google-cloud-bigtable/pom.xml
Expand Up @@ -29,6 +29,26 @@
<bigtable.directpath-data-endpoint/>
<bigtable.directpath-admin-endpoint/>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- NOTE: Dependencies are organized into two groups, production and test.
Within a group, dependencies are sorted by (groupId, artifactId) -->
Expand Down
20 changes: 20 additions & 0 deletions grpc-google-cloud-bigtable-admin-v2/pom.xml
Expand Up @@ -12,6 +12,26 @@
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
20 changes: 20 additions & 0 deletions grpc-google-cloud-bigtable-v2/pom.xml
Expand Up @@ -12,6 +12,26 @@
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>1.8.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.grpc</groupId>
Expand Down

0 comments on commit 9289a13

Please sign in to comment.