Skip to content

Commit 5164682

Browse files
authored
chore: migrate to owlbot (googleapis#1081)
1 parent 69ac2b8 commit 5164682

22 files changed

Lines changed: 301 additions & 305 deletions

.github/.OwlBot.lock.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
docker:
2+
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
3+
digest: sha256:7f737996c88586c499f7b0c25294c760f9f5eec092289a0e08d2d3f42a069ebb

.github/.OwlBot.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
docker:
16+
image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
17+
18+
deep-remove-regex:
19+
- "/grpc-google-.*/src"
20+
- "/proto-google-.*/src"
21+
22+
deep-preserve-regex:
23+
- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
24+
25+
deep-copy-regex:
26+
- source: "/google/bigtable/(v\\d)/.*-java/proto-google-.*/src"
27+
dest: "/owl-bot-staging/$1/proto-google-cloud-bigtable-$1/src"
28+
- source: "/google/bigtable/(v\\d)/.*-java/grpc-google-.*/src"
29+
dest: "/owl-bot-staging/$1/grpc-google-cloud-bigtable-$1/src"
30+
- source: "/google/bigtable/(v\\d)/.*-java/gapic-google-.*/src"
31+
dest: "/owl-bot-staging/$1/google-cloud-bigtable/src"
32+
- source: "/google/bigtable/admin/(v\\d)/.*-java/proto-google-.*/src"
33+
dest: "/owl-bot-staging/$1/proto-google-cloud-bigtable-admin-$1/src"
34+
- source: "/google/bigtable/admin/(v\\d)/.*-java/grpc-google-.*/src"
35+
dest: "/owl-bot-staging/$1/grpc-google-cloud-bigtable-admin-$1/src"
36+
- source: "/google/bigtable/admin/(v\\d)/.*-java/gapic-google-.*/src"
37+
dest: "/owl-bot-staging/$1/google-cloud-bigtable/src"

.repo-metadata.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"repo_short": "java-bigtable",
1111
"distribution_name": "com.google.cloud:google-cloud-bigtable",
1212
"codeowner_team": "@googleapis/api-bigtable",
13+
"api_id": "bigtable.googleapis.com",
1314
"library_type": "GAPIC_COMBO",
14-
"api_id": "bigtable.googleapis.com"
15+
"extra_versioned_modules": "google-cloud-bigtable-emulator",
16+
"excluded_poms": "google-cloud-bigtable-bom"
1517
}

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>23.0.0</version>
22+
<version>24.1.2</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -41,28 +41,28 @@ If you are using Maven without BOM, add this to your dependencies:
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-bigtable</artifactId>
44-
<version>2.1.1</version>
44+
<version>2.5.1</version>
4545
</dependency>
4646

4747
```
4848

4949
If you are using Gradle 5.x or later, add this to your dependencies
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:23.0.0')
52+
implementation platform('com.google.cloud:libraries-bom:24.2.0')
5353
5454
implementation 'com.google.cloud:google-cloud-bigtable'
5555
```
5656
If you are using Gradle without BOM, add this to your dependencies
5757

5858
```Groovy
59-
implementation 'com.google.cloud:google-cloud-bigtable:2.1.1'
59+
implementation 'com.google.cloud:google-cloud-bigtable:2.5.1'
6060
```
6161

6262
If you are using SBT, add this to your dependencies
6363

6464
```Scala
65-
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.1.1"
65+
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.5.1"
6666
```
6767

6868
## Authentication
@@ -492,7 +492,7 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr
492492

493493
## Supported Java Versions
494494

495-
Java 7 or above is required for using this client.
495+
Java 8 or above is required for using this client.
496496

497497
Google's Java client libraries,
498498
[Google Cloud Client Libraries][cloudlibs]
@@ -561,7 +561,6 @@ Apache 2.0 - See [LICENSE][license] for more information.
561561

562562
Java Version | Status
563563
------------ | ------
564-
Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1]
565564
Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
566565
Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
567566
Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
@@ -570,7 +569,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
570569
Java is a registered trademark of Oracle and/or its affiliates.
571570

572571
[product-docs]: https://cloud.google.com/bigtable
573-
[javadocs]: https://googleapis.dev/java/google-cloud-bigtable/latest/index.html
572+
[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-bigtable/latest/history
574573
[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java7.svg
575574
[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java7.html
576575
[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java8.svg

google-cloud-bigtable-bom/pom.xml

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version='1.0' encoding='UTF-8'?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
@@ -14,103 +14,103 @@
1414
<name>Google Cloud Bigtable BOM</name>
1515
<url>https://github.com/googleapis/java-bigtable</url>
1616
<description>
17-
BOM for Google Cloud Bigtable
17+
BOM for Google Cloud Bigtable
1818
</description>
1919

2020
<organization>
21-
<name>Google LLC</name>
21+
<name>Google LLC</name>
2222
</organization>
2323

2424
<developers>
25-
<developer>
26-
<id>chingor13</id>
27-
<name>Jeff Ching</name>
28-
<email>chingor@google.com</email>
29-
<organization>Google LLC</organization>
30-
<roles>
31-
<role>Developer</role>
32-
</roles>
33-
</developer>
34-
<developer>
35-
<id>igorberstein</id>
36-
<name>Igor Bernstein</name>
37-
<email>igorbernstein@google.com</email>
38-
<organization>Google LLC</organization>
39-
<roles>
40-
<role>Developer</role>
41-
</roles>
42-
</developer>
25+
<developer>
26+
<id>chingor13</id>
27+
<name>Jeff Ching</name>
28+
<email>chingor@google.com</email>
29+
<organization>Google LLC</organization>
30+
<roles>
31+
<role>Developer</role>
32+
</roles>
33+
</developer>
34+
<developer>
35+
<id>igorberstein</id>
36+
<name>Igor Bernstein</name>
37+
<email>igorbernstein@google.com</email>
38+
<organization>Google LLC</organization>
39+
<roles>
40+
<role>Developer</role>
41+
</roles>
42+
</developer>
4343
</developers>
4444

4545
<scm>
46-
<connection>scm:git:https://github.com/googleapis/java-bigtable.git</connection>
47-
<developerConnection>scm:git:git@github.com:googleapis/java-bigtable.git</developerConnection>
48-
<url>https://github.com/googleapis/java-bigtable</url>
46+
<connection>scm:git:https://github.com/googleapis/java-bigtable.git</connection>
47+
<developerConnection>scm:git:git@github.com:googleapis/java-bigtable.git</developerConnection>
48+
<url>https://github.com/googleapis/java-bigtable</url>
4949
</scm>
5050

5151

5252
<licenses>
53-
<license>
54-
<name>The Apache Software License, Version 2.0</name>
55-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
56-
<distribution>repo</distribution>
57-
</license>
53+
<license>
54+
<name>The Apache Software License, Version 2.0</name>
55+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
56+
<distribution>repo</distribution>
57+
</license>
5858
</licenses>
5959

6060
<dependencyManagement>
61-
<dependencies>
62-
<dependency>
63-
<groupId>com.google.cloud</groupId>
64-
<artifactId>google-cloud-bigtable</artifactId>
65-
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66-
</dependency>
67-
<dependency>
68-
<groupId>com.google.cloud</groupId>
69-
<artifactId>google-cloud-bigtable-emulator</artifactId>
70-
<version>0.142.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71-
</dependency>
72-
<dependency>
73-
<groupId>com.google.api.grpc</groupId>
74-
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
75-
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
76-
</dependency>
77-
<dependency>
78-
<groupId>com.google.api.grpc</groupId>
79-
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
80-
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
81-
</dependency>
82-
<dependency>
83-
<groupId>com.google.api.grpc</groupId>
84-
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
85-
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
86-
</dependency>
87-
<dependency>
88-
<groupId>com.google.api.grpc</groupId>
89-
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
90-
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
91-
</dependency>
92-
</dependencies>
61+
<dependencies>
62+
<dependency>
63+
<groupId>com.google.cloud</groupId>
64+
<artifactId>google-cloud-bigtable</artifactId>
65+
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
</dependency>
67+
<dependency>
68+
<groupId>com.google.cloud</groupId>
69+
<artifactId>google-cloud-bigtable-emulator</artifactId>
70+
<version>0.142.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
</dependency>
72+
<dependency>
73+
<groupId>com.google.api.grpc</groupId>
74+
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
75+
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
76+
</dependency>
77+
<dependency>
78+
<groupId>com.google.api.grpc</groupId>
79+
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
80+
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
81+
</dependency>
82+
<dependency>
83+
<groupId>com.google.api.grpc</groupId>
84+
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
85+
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
86+
</dependency>
87+
<dependency>
88+
<groupId>com.google.api.grpc</groupId>
89+
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
90+
<version>2.5.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
91+
</dependency>
92+
</dependencies>
9393
</dependencyManagement>
9494

9595
<build>
96-
<plugins>
97-
<plugin>
98-
<groupId>org.apache.maven.plugins</groupId>
99-
<artifactId>maven-checkstyle-plugin</artifactId>
100-
<configuration>
101-
<skip>true</skip>
102-
</configuration>
103-
</plugin>
96+
<plugins>
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-checkstyle-plugin</artifactId>
100+
<configuration>
101+
<skip>true</skip>
102+
</configuration>
103+
</plugin>
104104

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

110-
<configuration>
111-
<generateReports>false</generateReports>
112-
</configuration>
113-
</plugin>
114-
</plugins>
110+
<configuration>
111+
<generateReports>false</generateReports>
112+
</configuration>
113+
</plugin>
114+
</plugins>
115115
</build>
116-
</project>
116+
</project>

google-cloud-bigtable/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version='1.0' encoding='UTF-8'?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-bigtable</artifactId>

0 commit comments

Comments
 (0)