Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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
8 changes: 8 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>com.google.cloud.artifactregistry</groupId>
<artifactId>artifactregistry-maven-wagon</artifactId>
<version>2.2.5</version>
</extension>
</extensions>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-core-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-integration-tests-common</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-client-core-parent/bigtable-hbase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-core-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase</artifactId>
Expand Down Expand Up @@ -85,7 +85,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -149,7 +149,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-client-core-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-client-core-parent</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-dataflow-parent/bigtable-beam-import/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-dataflow-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -83,7 +83,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-beam</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand Down Expand Up @@ -156,7 +156,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-dataflow-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-beam</artifactId>
Expand Down Expand Up @@ -75,7 +75,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-2.x-shaded</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- Workaround MNG-5899 & MSHADE-206. Maven >= 3.3.0 doesn't use the dependency reduced
pom.xml files when invoking the build from a parent project. So we have to manually exclude
Expand Down Expand Up @@ -271,7 +271,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps-beam</id>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-dataflow-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-dataflow-parent</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -35,7 +35,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- hbase-shaded-client will be replaced with hbase-client -->
<exclusion>
Expand Down Expand Up @@ -170,7 +170,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-integration-tests</artifactId>
Expand Down Expand Up @@ -79,7 +79,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand Down Expand Up @@ -117,7 +117,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand Down Expand Up @@ -146,8 +146,7 @@ limitations under the License.
missing deps until the integration tests pass.

The HBase & Hadoop have large set of transitive deps, so we explicitly exclude all of them
add them manually. All hbase deps are pinned to hbase < 2.0. Everything else is using the latest available version.
-->
add them manually. All hbase deps are pinned to hbase < 2.0. Everything else is using the latest available version. -->

<dependencies>
<dependency>
Expand Down Expand Up @@ -285,7 +284,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand Down Expand Up @@ -375,7 +374,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>hbase-minicluster-maven-plugin</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down Expand Up @@ -466,7 +465,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-integration-tests-common</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<type>test-jar</type>
<scope>test</scope>
<exclusions>
Expand Down Expand Up @@ -587,7 +586,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>hbase-minicluster-maven-plugin</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-mapreduce</artifactId>
Expand Down Expand Up @@ -60,7 +60,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-hadoop</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- we need hbase-server instead of hbase-client -->
<exclusion>
Expand Down Expand Up @@ -120,7 +120,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -186,7 +186,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps-hbase</id>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -113,7 +113,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>

<!-- This isnt strictly necessary as it will be pulled in by bigtable-hbase-1.x. However, it helps to resolve
Expand Down Expand Up @@ -387,7 +387,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
4 changes: 2 additions & 2 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -21,7 +21,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- Workaround MNG-5899 & MSHADE-206. Maven >= 3.3.0 doesn't use the dependency reduced
pom.xml files when invoking the build from a parent project. So we have to manually exclude
Expand Down
8 changes: 4 additions & 4 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x</artifactId>
Expand Down Expand Up @@ -73,7 +73,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>

<dependency>
Expand All @@ -86,7 +86,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -131,7 +131,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-hbase-1.x-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-parent</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<artifactId>bigtable-hbase-2.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -35,7 +35,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-2.x-shaded</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- hbase-shaded-client will be replaced with hbase-client -->
<exclusion>
Expand Down Expand Up @@ -152,7 +152,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.16.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.16.2-session-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
Loading
Loading