Skip to content

Commit

Permalink
chore(2.6.x): release 2.6.7 (#3997)
Browse files Browse the repository at this point in the history
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
  • Loading branch information
release-please[bot] committed Mar 9, 2023
1 parent 9eb5fee commit 4aed845
Show file tree
Hide file tree
Showing 53 changed files with 149 additions and 142 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog

## [2.6.7](https://github.com/googleapis/java-bigtable-hbase/compare/v2.6.6...v2.6.7) (2023-03-09)


### Bug Fixes

* **deps:** Re-add reload4j as a dependency in bigtable-hbase-beam on 2.6.x ([#3992](https://github.com/googleapis/java-bigtable-hbase/issues/3992)) ([3438f46](https://github.com/googleapis/java-bigtable-hbase/commit/3438f465b4d575a900676370cf6e17d93def6042))

## [2.6.6](https://github.com/googleapis/java-bigtable-hbase/compare/v2.6.5...v2.6.6) (2023-02-13)


Expand Down
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.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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
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.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

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

<executions>
<!-- TODO: Remove this once we can properly shade conscrypt:
Expand Down
Expand Up @@ -34,7 +34,7 @@ public class BigtableHBaseVersion {
private static final AtomicBoolean wasInitialized = new AtomicBoolean(false);

// {x-version-update-start:bigtable-client-parent:current}
public static final String VERSION = "2.6.7-SNAPSHOT";
public static final String VERSION = "2.6.7";
// {x-version-update-end}

/**
Expand Down
2 changes: 1 addition & 1 deletion bigtable-client-core-parent/pom.xml
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-client-core-parent</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions bigtable-dataflow-parent/bigtable-beam-import/pom.xml
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-dataflow-parent</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -147,7 +147,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-beam</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand All @@ -159,7 +159,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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 @@ -280,7 +280,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -469,7 +469,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
Expand Up @@ -16,7 +16,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-dataflow-parent</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-beam</artifactId>
Expand Down Expand Up @@ -83,7 +83,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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 @@ -300,7 +300,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-dataflow-parent/pom.xml
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-dataflow-parent</artifactId>
Expand Down
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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
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.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- hbase-shaded-client will be replaced with hbase-client -->
<exclusion>
Expand Down Expand Up @@ -234,7 +234,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
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.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-integration-tests</artifactId>
Expand Down Expand Up @@ -186,7 +186,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -200,7 +200,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -214,7 +214,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-integration-tests-common</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<type>test-jar</type>
<scope>test</scope>
<exclusions>
Expand Down
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.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- we need hbase-server instead of hbase-client -->
<exclusion>
Expand Down Expand Up @@ -125,7 +125,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -231,7 +231,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
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.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -68,7 +68,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
Expand Down Expand Up @@ -406,7 +406,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x/pom.xml
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.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x</artifactId>
Expand Down Expand Up @@ -56,7 +56,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
Expand Down Expand Up @@ -180,7 +180,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-hbase-1.x-parent/pom.xml
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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
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.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</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-2.x-shaded</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand Down Expand Up @@ -235,7 +235,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-2.x-parent</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-2.x-integration-tests</artifactId>
Expand Down Expand Up @@ -185,7 +185,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -203,7 +203,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-2.x</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -217,7 +217,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-integration-tests-common</artifactId>
<version>2.6.7-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.6.7</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<type>test-jar</type>
<scope>test</scope>
<exclusions>
Expand Down

0 comments on commit 4aed845

Please sign in to comment.