Skip to content

Commit 3b27d49

Browse files
Neenu1995Neenu1995
authored
chore: migrate to owlbot (googleapis#513)
1 parent 9bc604c commit 3b27d49

8 files changed

Lines changed: 58 additions & 32 deletions

File tree

‎java-datalabeling/.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+
digest: sha256:689e998ca8b33117d8607b1c3df12b9cfebd68b621ba5ab6ce17be8715506203
3+
image: gcr.io/repo-automation-bots/owlbot-java:latest

‎java-datalabeling/.github/.OwlBot.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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/repo-automation-bots/owlbot-java:latest"
17+
18+
deep-remove-regex:
19+
- "/grpc-google-.*/src"
20+
- "/proto-google-.*/src"
21+
- "/google-.*/src"
22+
23+
deep-preserve-regex:
24+
- "/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/v1beta1/it/ITSystemTest.java"
25+
26+
deep-copy-regex:
27+
- source: "/google/cloud/datalabeling/(v.*)/.*-java/proto-google-.*/src"
28+
dest: "/owl-bot-staging/$1/proto-google-cloud-datalabeling-$1/src"
29+
- source: "/google/cloud/datalabeling/(v.*)/.*-java/grpc-google-.*/src"
30+
dest: "/owl-bot-staging/$1/grpc-google-cloud-datalabeling-$1/src"
31+
- source: "/google/cloud/datalabeling/(v.*)/.*-java/gapic-google-.*/src"
32+
dest: "/owl-bot-staging/$1/google-cloud-datalabeling/src"

‎java-datalabeling/google-cloud-datalabeling-bom/pom.xml‎

Lines changed: 8 additions & 9 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>
@@ -60,21 +60,20 @@
6060

6161
<dependencyManagement>
6262
<dependencies>
63-
6463
<dependency>
65-
<groupId>com.google.api.grpc</groupId>
66-
<artifactId>proto-google-cloud-datalabeling-v1beta1</artifactId>
67-
<version>0.85.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datalabeling-v1beta1:current} -->
64+
<groupId>com.google.cloud</groupId>
65+
<artifactId>google-cloud-datalabeling</artifactId>
66+
<version>0.120.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datalabeling:current} -->
6867
</dependency>
6968
<dependency>
7069
<groupId>com.google.api.grpc</groupId>
7170
<artifactId>grpc-google-cloud-datalabeling-v1beta1</artifactId>
7271
<version>0.85.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datalabeling-v1beta1:current} -->
7372
</dependency>
7473
<dependency>
75-
<groupId>com.google.cloud</groupId>
76-
<artifactId>google-cloud-datalabeling</artifactId>
77-
<version>0.120.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datalabeling:current} -->
74+
<groupId>com.google.api.grpc</groupId>
75+
<artifactId>proto-google-cloud-datalabeling-v1beta1</artifactId>
76+
<version>0.85.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datalabeling-v1beta1:current} -->
7877
</dependency>
7978
</dependencies>
8079
</dependencyManagement>
@@ -90,4 +89,4 @@
9089
</plugin>
9190
</plugins>
9291
</build>
93-
</project>
92+
</project>

‎java-datalabeling/google-cloud-datalabeling/pom.xml‎

Lines changed: 2 additions & 2 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>
@@ -111,4 +111,4 @@
111111
</plugin>
112112
</plugins>
113113
</build>
114-
</project>
114+
</project>

java-datalabeling/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/v1beta1/it/ITSystemTest.java renamed to java-datalabeling/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java

File renamed without changes.

java-datalabeling/synth.py renamed to java-datalabeling/owlbot.py

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
# Copyright 2018 Google LLC
1+
# Copyright 2021 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
55
# You may obtain a copy of the License at
66
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
7+
# https://www.apache.org/licenses/LICENSE-2.0
88
#
99
# Unless required by applicable law or agreed to in writing, software
1010
# distributed under the License is distributed on an "AS IS" BASIS,
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
"""This script is used to synthesize generated parts of this library."""
15+
import synthtool as s
16+
from synthtool.languages import java
1617

17-
import synthtool.languages.java as java
1818

19-
AUTOSYNTH_MULTIPLE_COMMITS = True
20-
21-
service = 'datalabeling'
22-
versions = ['v1beta1']
23-
24-
for version in versions:
25-
java.bazel_library(
26-
service=service,
27-
version=version,
28-
proto_path=f'google/cloud/{service}/{version}',
29-
bazel_target=f'//google/cloud/{service}/{version}:google-cloud-{service}-{version}-java',
30-
)
19+
for library in s.get_staging_dirs():
20+
# put any special-case replacements here
21+
s.move(library)
3122

23+
s.remove_staging_dirs()
3224
java.common_templates()

‎java-datalabeling/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@
118118
</build>
119119

120120
<modules>
121-
<module>proto-google-cloud-datalabeling-v1beta1</module>
122-
<module>grpc-google-cloud-datalabeling-v1beta1</module>
123121
<module>google-cloud-datalabeling</module>
122+
<module>grpc-google-cloud-datalabeling-v1beta1</module>
123+
<module>proto-google-cloud-datalabeling-v1beta1</module>
124124
<module>google-cloud-datalabeling-bom</module>
125125
</modules>
126126

@@ -193,4 +193,4 @@
193193
</plugin>
194194
</plugins>
195195
</reporting>
196-
</project>
196+
</project>

‎java-datalabeling/versions.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Format:
22
# module:released-version:current-version
33

4-
proto-google-cloud-datalabeling-v1beta1:0.85.1:0.85.2-SNAPSHOT
5-
grpc-google-cloud-datalabeling-v1beta1:0.85.1:0.85.2-SNAPSHOT
64
google-cloud-datalabeling:0.120.1:0.120.2-SNAPSHOT
5+
grpc-google-cloud-datalabeling-v1beta1:0.85.1:0.85.2-SNAPSHOT
6+
proto-google-cloud-datalabeling-v1beta1:0.85.1:0.85.2-SNAPSHOT

0 commit comments

Comments
 (0)