Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 4e7b7b2

Browse files
Neenu1995Neenu1995
authored
chore: migrate to owlbot (#557)
1 parent aa7512b commit 4e7b7b2

13 files changed

Lines changed: 69 additions & 412 deletions

File tree

‎.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:2595f321d9a9acf34c2d02e4dc5ec214ce07eecdb43978382d8a88476dec0c16
3+
image: gcr.io/repo-automation-bots/owlbot-java:latest

‎.github/.OwlBot.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/it/ITSystemTest.java"
25+
- "/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/FieldName.java"
26+
27+
deep-copy-regex:
28+
- source: "/google/cloud/datacatalog/(v.*)/.*-java/proto-google-.*/src"
29+
dest: "/owl-bot-staging/$1/proto-google-cloud-datacatalog-$1/src"
30+
- source: "/google/cloud/datacatalog/(v.*)/.*-java/grpc-google-.*/src"
31+
dest: "/owl-bot-staging/$1/grpc-google-cloud-datacatalog-$1/src"
32+
- source: "/google/cloud/datacatalog/(v.*)/.*-java/gapic-google-.*/src"
33+
dest: "/owl-bot-staging/$1/google-cloud-datacatalog/src"

‎.github/sync-repo-settings.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ branchProtectionRules:
1616
- units (11)
1717
- 'Kokoro - Test: Integration'
1818
- cla/google
19+
- OwlBot Post Processor
1920
- pattern: java7
2021
isAdminEnforced: true
2122
requiredApprovingReviewCount: 1

‎README.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datacatalog'
5656
If you are using Gradle without BOM, add this to your dependencies
5757

5858
```Groovy
59-
implementation 'com.google.cloud:google-cloud-datacatalog:1.5.3'
59+
implementation 'com.google.cloud:google-cloud-datacatalog:1.5.4'
6060
```
6161

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

6464
```Scala
65-
libraryDependencies += "com.google.cloud" % "google-cloud-datacatalog" % "1.5.3"
65+
libraryDependencies += "com.google.cloud" % "google-cloud-datacatalog" % "1.5.4"
6666
```
6767

6868
## Authentication
@@ -106,10 +106,6 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-datacatalog/t
106106

107107
| Sample | Source Code | Try it |
108108
| --------------------------- | --------------------------------- | ------ |
109-
| None | [source code](https://github.com/googleapis/java-datacatalog/blob/master/samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogGetEntry.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datacatalog&page=editor&open_in_editor=samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogGetEntry.java) |
110-
| None | [source code](https://github.com/googleapis/java-datacatalog/blob/master/samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogLookupEntry.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datacatalog&page=editor&open_in_editor=samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogLookupEntry.java) |
111-
| None | [source code](https://github.com/googleapis/java-datacatalog/blob/master/samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogLookupEntrySqlResource.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datacatalog&page=editor&open_in_editor=samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogLookupEntrySqlResource.java) |
112-
| None | [source code](https://github.com/googleapis/java-datacatalog/blob/master/samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogSearch.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datacatalog&page=editor&open_in_editor=samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogSearch.java) |
113109
| Create Custom Entry | [source code](https://github.com/googleapis/java-datacatalog/blob/master/samples/snippets/src/main/java/com/example/datacatalog/CreateCustomEntry.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datacatalog&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datacatalog/CreateCustomEntry.java) |
114110
| Create Entry | [source code](https://github.com/googleapis/java-datacatalog/blob/master/samples/snippets/src/main/java/com/example/datacatalog/CreateEntry.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datacatalog&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datacatalog/CreateEntry.java) |
115111
| Create Entry Group | [source code](https://github.com/googleapis/java-datacatalog/blob/master/samples/snippets/src/main/java/com/example/datacatalog/CreateEntryGroup.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-datacatalog&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/datacatalog/CreateEntryGroup.java) |

‎google-cloud-datacatalog-bom/pom.xml‎

Lines changed: 12 additions & 13 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>
@@ -49,17 +49,6 @@
4949

5050
<dependencyManagement>
5151
<dependencies>
52-
53-
<dependency>
54-
<groupId>com.google.api.grpc</groupId>
55-
<artifactId>proto-google-cloud-datacatalog-v1</artifactId>
56-
<version>1.5.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datacatalog-v1:current} -->
57-
</dependency>
58-
<dependency>
59-
<groupId>com.google.api.grpc</groupId>
60-
<artifactId>proto-google-cloud-datacatalog-v1beta1</artifactId>
61-
<version>0.42.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datacatalog-v1beta1:current} -->
62-
</dependency>
6352
<dependency>
6453
<groupId>com.google.cloud</groupId>
6554
<artifactId>google-cloud-datacatalog</artifactId>
@@ -75,6 +64,16 @@
7564
<artifactId>grpc-google-cloud-datacatalog-v1beta1</artifactId>
7665
<version>0.42.5-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datacatalog-v1beta1:current} -->
7766
</dependency>
67+
<dependency>
68+
<groupId>com.google.api.grpc</groupId>
69+
<artifactId>proto-google-cloud-datacatalog-v1</artifactId>
70+
<version>1.5.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datacatalog-v1:current} -->
71+
</dependency>
72+
<dependency>
73+
<groupId>com.google.api.grpc</groupId>
74+
<artifactId>proto-google-cloud-datacatalog-v1beta1</artifactId>
75+
<version>0.42.5-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datacatalog-v1beta1:current} -->
76+
</dependency>
7877
</dependencies>
7978
</dependencyManagement>
8079

@@ -89,4 +88,4 @@
8988
</plugin>
9089
</plugins>
9190
</build>
92-
</project>
91+
</project>

‎google-cloud-datacatalog/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>
@@ -125,4 +125,4 @@
125125
</plugin>
126126
</plugins>
127127
</build>
128-
</project>
128+
</project>

synth.py renamed to owlbot.py

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +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
19+
for library in s.get_staging_dirs():
20+
# put any special-case replacements here
21+
s.move(library)
2022

21-
versions = ['v1beta1', 'v1']
22-
service = 'datacatalog'
23-
24-
for version in versions:
25-
java.bazel_library(
26-
service=service,
27-
version=version,
28-
bazel_target=f'//google/cloud/{service}/{version}:google-cloud-{service}-{version}-java',
29-
)
30-
31-
java.common_templates()
23+
s.remove_staging_dirs()
24+
java.common_templates()

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@
119119
</build>
120120

121121
<modules>
122-
<module>proto-google-cloud-datacatalog-v1</module>
123-
<module>proto-google-cloud-datacatalog-v1beta1</module>
122+
<module>google-cloud-datacatalog</module>
124123
<module>grpc-google-cloud-datacatalog-v1</module>
125124
<module>grpc-google-cloud-datacatalog-v1beta1</module>
126-
<module>google-cloud-datacatalog</module>
125+
<module>proto-google-cloud-datacatalog-v1</module>
126+
<module>proto-google-cloud-datacatalog-v1beta1</module>
127127
<module>google-cloud-datacatalog-bom</module>
128128
</modules>
129129

@@ -196,4 +196,4 @@
196196
</plugin>
197197
</plugins>
198198
</reporting>
199-
</project>
199+
</project>

‎samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogGetEntry.java‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎samples/generated/src/main/java/com/google/cloud/examples/datacatalog/v1beta1/DatacatalogLookupEntry.java‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)