Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .kokoro/bigtable-conformance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ retry_with_backoff 3 10 \
-DskipTests=true \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dcheckstyle.skip=true \
-Dmaven.javadoc.skip=true \
-Dgcloud.download.skip=true \
-T 1C
Expand All @@ -48,7 +49,7 @@ set +e
# Build the proxy
pushd .
cd java-bigtable/test-proxy
mvn clean install -U -DskipTests
mvn clean install -U -DskipTests -Dcheckstyle.skip=true
popd

declare -a configs=("default" "enable_all")
Expand Down
445 changes: 219 additions & 226 deletions gapic-libraries-bom/pom.xml

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions java-bigtable/google-cloud-bigtable-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-bom</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pom-parent</artifactId>
<version>1.87.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
<version>1.86.0</version><!-- {x-version-update:google-cloud-java:current} -->
<relativePath>../../google-cloud-pom-parent/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -62,37 +62,37 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-emulator</artifactId>
<version>0.215.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.215.1</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
<version>0.215.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.215.1</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
8 changes: 4 additions & 4 deletions java-bigtable/google-cloud-bigtable-deps-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pom-parent</artifactId>
<version>1.87.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
<version>1.86.0</version><!-- {x-version-update:google-cloud-java:current} -->
<relativePath>../../google-cloud-pom-parent/pom.xml</relativePath>
</parent>

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

<packaging>pom</packaging>
<name>Google Cloud Bigtable Dependency BOM</name>
Expand Down Expand Up @@ -66,14 +66,14 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-monitoring-bom</artifactId>
<version>3.94.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-monitoring:current} -->
<version>3.93.0</version><!-- {x-version-update:google-cloud-monitoring:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>3.63.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<version>3.62.0</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions java-bigtable/google-cloud-bigtable-emulator-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<artifactId>google-cloud-bigtable-parent</artifactId>
<groupId>com.google.cloud</groupId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>
<name>Google Cloud Java - Bigtable Emulator Core</name>

<artifactId>google-cloud-bigtable-emulator-core</artifactId>
<version>0.215.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.215.1</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->

<description>
A Java wrapper for the Cloud Bigtable emulator.
Expand Down
10 changes: 5 additions & 5 deletions java-bigtable/google-cloud-bigtable-emulator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>google-cloud-bigtable-emulator</artifactId>
<version>0.215.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.215.1</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<name>Google Cloud Java - Bigtable Emulator</name>
<url>https://github.com/googleapis/java-bigtable</url>
<description>
Expand All @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>
<scm>
<connection>scm:git:git@github.com:googleapis/java-bigtable.git</connection>
Expand Down Expand Up @@ -81,14 +81,14 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -99,7 +99,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
<version>0.215.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
<version>0.215.1</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions java-bigtable/google-cloud-bigtable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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>
<artifactId>google-cloud-bigtable</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<packaging>jar</packaging>
<name>Google Cloud Bigtable</name>
<url>https://github.com/googleapis/java-bigtable</url>
Expand All @@ -12,7 +12,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</parent>
<properties>
<!-- The version that will be embedded in the published jar via maven-resources-plugin -->
Expand Down Expand Up @@ -54,14 +54,14 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions java-bigtable/grpc-google-cloud-bigtable-admin-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
<name>grpc-google-cloud-bigtable-admin-v2</name>
<description>GRPC library for grpc-google-cloud-bigtable-admin-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions java-bigtable/grpc-google-cloud-bigtable-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
<name>grpc-google-cloud-bigtable-v2</name>
<description>GRPC library for grpc-google-cloud-bigtable-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
14 changes: 7 additions & 7 deletions java-bigtable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<artifactId>google-cloud-bigtable-parent</artifactId>
<packaging>pom</packaging>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<name>Google Cloud Bigtable Parent</name>
<url>https://github.com/googleapis/google-cloud-java</url>
<description>
Expand All @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-jar-parent</artifactId>
<version>1.87.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
<version>1.86.0</version><!-- {x-version-update:google-cloud-java:current} -->
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -155,27 +155,27 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
Expand Down
8 changes: 4 additions & 4 deletions java-bigtable/proto-google-cloud-bigtable-admin-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
<name>proto-google-cloud-bigtable-admin-v2</name>
<description>PROTO library for proto-google-cloud-bigtable-admin-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions java-bigtable/proto-google-cloud-bigtable-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
<version>2.78.1</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
<name>proto-google-cloud-bigtable-v2</name>
<description>PROTO library for proto-google-cloud-bigtable-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable-parent</artifactId>
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</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>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<version>2.78.1</version><!-- {x-version-update:google-cloud-bigtable:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Loading
Loading