Skip to content

Commit

Permalink
chore: use a single version for all modules (main branch) (#3148)
Browse files Browse the repository at this point in the history 
This is port of #3061 for the main branch
  • Loading branch information
@igorbernstein2
igorbernstein2 committed Jul 13, 2021
1 parent 10a6ce8 commit 8405b50
Show file tree
Hide file tree
Showing 33 changed files with 78 additions and 83 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Note: Please use [google-cloud-bigtable][google-cloud-bigtable] to access Bigtab
* `bigtable-hbase-2.x-hadoop`: use in hadoop environments.
* `bigtable-hbase-2.x-shaded`: use in environments (other than hadoop) that require older versions of protobuf, guava, etc.

[//]: # ({x-version-update-start:bigtable-hbase-1x-parent:released})
[//]: # ({x-version-update-start:bigtable-client-parent:released})
Maven:
```xml
<dependency>
Expand Down Expand Up @@ -75,7 +75,7 @@ The code example below shows how to enable metrics. For more details, see the [g

If you are _not_ using the shaded Bigtable HBase Client artifact, you need to define the OpenCensus dependencies.

[//]: # ({x-version-update-start:bigtable-hbase-1x-parent:released})
[//]: # ({x-version-update-start:bigtable-client-parent:released})
```xml
<!-- OpenCensus dependencies -->
<dependency>
Expand Down Expand Up @@ -187,7 +187,7 @@ The code example below shows how to enable tracing. For more details, see [here]

If you are _not_ using the shaded Bigtable HBase Client artifact, you need to define the OpenCensus dependencies.

[//]: # ({x-version-update-start:bigtable-hbase-1x-parent:released})
[//]: # ({x-version-update-start:bigtable-client-parent:released})
```xml
<!-- OpenCensus dependencies -->
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-client-core-parent/bigtable-client-core/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-core-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-client-core</artifactId>
Expand Down Expand Up @@ -194,7 +194,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-metrics-api</artifactId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-core-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>

<dependency>
Expand All @@ -217,7 +217,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-core-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-integration-tests-common</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions bigtable-client-core-parent/bigtable-hbase/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-core-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase</artifactId>
Expand Down Expand Up @@ -55,13 +55,13 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-client-core</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-metrics-api</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -178,7 +178,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -244,7 +244,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-test:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<!-- TODO: Remove this once we can properly shade conscrypt:
Expand Down
2 changes: 1 addition & 1 deletion bigtable-client-core-parent/bigtable-metrics-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-core-parent</artifactId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-core-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-dataflow-parent/bigtable-beam-import/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ To use the tools in this folder, you can download them from the maven repository
you can build them using Maven.


[//]: # ({x-version-update-start:bigtable-dataflow-parent:released})
[//]: # ({x-version-update-start:bigtable-client-parent:released})
### Download the jars
Download [the import/export jars](http://search.maven.org/remotecontent?filepath=com/google/cloud/bigtable/bigtable-beam-import/1.20.0/bigtable-beam-import-1.20.0-shaded.jar), which is an aggregation of all required jars.

Expand Down
8 changes: 4 additions & 4 deletions bigtable-dataflow-parent/bigtable-beam-import/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-dataflow-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -103,7 +103,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-beam</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand All @@ -115,7 +115,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- exclude hbase-shaded-client since we are using hbase-shaded-server -->
<exclusion>
Expand Down Expand Up @@ -408,7 +408,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-test:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
10 changes: 5 additions & 5 deletions bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-dataflow-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-beam</artifactId>
Expand Down Expand Up @@ -68,7 +68,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- Let the beam pipeline choose the appropriate slf4j impl.
Since this is the beam universe, we don't have be a drop in replacement
Expand Down Expand Up @@ -216,10 +216,10 @@ limitations under the License.
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<windowtitle>
Apache Beam + Cloud Bigtable Connector ${project.version} API
Apache Beam + Cloud Bigtable Connector API
</windowtitle>
<doctitle>
Apache Beam + Cloud Bigtable Connector ${project.version} API
Apache Beam + Cloud Bigtable Connector API
</doctitle>
<overview>../overview.html</overview>
<bottom><![CDATA[<br>]]></bottom>
Expand Down Expand Up @@ -274,7 +274,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-test:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-hbase-1.x-parent/bigtable-hbase-1.x-benchmarks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-hbase-1x-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-hbase-1x-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

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

<executions>
<execution>
Expand Down
12 changes: 6 additions & 6 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-hbase-1x-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-integration-tests</artifactId>
Expand Down Expand Up @@ -126,7 +126,7 @@ limitations under the License.
<plugin>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-emulator-maven-plugin</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -203,14 +203,14 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-core</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -224,7 +224,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -238,7 +238,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-integration-tests-common</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<type>test-jar</type>
<scope>test</scope>
<exclusions>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ from/to Cloud Bigtable and import HBase snapshots using a Map Reduce cluster (ie

## Expected Usage

[//]: # ({x-version-update-start:bigtable-hbase-1x-parent:released})
[//]: # ({x-version-update-start:bigtable-client-parent:released})
### On-prem Hadoop

1. Download or build bigtable-hbase-1.x-mapreduce-1.14.0-shaded-byo-hadoop.jar
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-hbase-1x-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-mapreduce</artifactId>
Expand Down Expand Up @@ -65,7 +65,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-hadoop</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- we need hbase-server instead of hbase-client -->
<exclusion>
Expand Down Expand Up @@ -225,7 +225,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-test:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
8 changes: 4 additions & 4 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
View file
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.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-hbase-1x-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -68,12 +68,12 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-metrics-api</artifactId>
<version>${project.version}</version>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>
<!-- Since opencensus-api is a transitive dep, we have to shade its impl as well.
Otherwise the -api will be permanently severed from the impl and exporters -->
Expand Down Expand Up @@ -338,7 +338,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-test:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pipelines to import and export data are under [bigtable-beam-import](bigtable-da
To use the tools in this folder, you can download them from the maven repository, or
you can build them using Maven.

[//]: # ({x-version-update-start:bigtable-dataflow-parent:released})
[//]: # ({x-version-update-start:bigtable-client-parent:released})
### Download the jars

Download [the Bigtable tools jars](http://search.maven.org/remotecontent?filepath=com/google/cloud/bigtable/bigtable-hbase-1.x-tools/1.20.0/bigtable-hbase-1.x-tools-1.20.0-shaded.jar), which is an aggregation of all required jars.
Expand Down
4 changes: 2 additions & 2 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-hbase-1x-parent:current} -->
<version>2.0.0-alpha-1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>${project.version}</version><!-- {x-version-update:bigtable-hbase-1x-parent:current} -->
<version>2.0.0-alpha-1-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
Loading

0 comments on commit 8405b50

Please sign in to comment.