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

Commit 55cbf9e

Browse files
authored
chore: migrate to owlbot (#395)
1 parent 0141e15 commit 55cbf9e

File tree

8 files changed

+80
-54
lines changed

8 files changed

+80
-54
lines changed

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

.github/.OwlBot.yaml

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

google-cloud-aiplatform-bom/pom.xml

Lines changed: 10 additions & 11 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>
@@ -64,31 +64,30 @@
6464

6565
<dependencyManagement>
6666
<dependencies>
67-
6867
<dependency>
6968
<groupId>com.google.cloud</groupId>
7069
<artifactId>google-cloud-aiplatform</artifactId>
7170
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-aiplatform:current} -->
7271
</dependency>
7372
<dependency>
7473
<groupId>com.google.api.grpc</groupId>
75-
<artifactId>proto-google-cloud-aiplatform-v1beta1</artifactId>
76-
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
74+
<artifactId>grpc-google-cloud-aiplatform-v1</artifactId>
75+
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1:current} -->
7776
</dependency>
7877
<dependency>
7978
<groupId>com.google.api.grpc</groupId>
80-
<artifactId>proto-google-cloud-aiplatform-v1</artifactId>
81-
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1:current} -->
79+
<artifactId>grpc-google-cloud-aiplatform-v1beta1</artifactId>
80+
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
8281
</dependency>
8382
<dependency>
8483
<groupId>com.google.api.grpc</groupId>
85-
<artifactId>grpc-google-cloud-aiplatform-v1beta1</artifactId>
86-
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
84+
<artifactId>proto-google-cloud-aiplatform-v1</artifactId>
85+
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1:current} -->
8786
</dependency>
8887
<dependency>
8988
<groupId>com.google.api.grpc</groupId>
90-
<artifactId>grpc-google-cloud-aiplatform-v1</artifactId>
91-
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1:current} -->
89+
<artifactId>proto-google-cloud-aiplatform-v1beta1</artifactId>
90+
<version>0.4.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
9291
</dependency>
9392
</dependencies>
9493
</dependencyManagement>
@@ -104,4 +103,4 @@
104103
</plugin>
105104
</plugins>
106105
</build>
107-
</project>
106+
</project>

google-cloud-aiplatform/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>
@@ -126,4 +126,4 @@
126126
</plugin>
127127
</plugins>
128128
</build>
129-
</project>
129+
</project>

owlbot.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
# https://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+
import synthtool as s
16+
from synthtool.languages import java
17+
18+
19+
for library in s.get_staging_dirs():
20+
# put any special-case replacements here
21+
s.move(library)
22+
23+
s.remove_staging_dirs()
24+
java.common_templates(
25+
excludes=[
26+
".kokoro/build.sh",
27+
".kokoro/nightly/samples.cfg",
28+
".kokoro/presubmit/samples.cfg",
29+
]
30+
)

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@
121121

122122
<modules>
123123
<module>google-cloud-aiplatform</module>
124-
<module>proto-google-cloud-aiplatform-v1beta1</module>
125-
<module>proto-google-cloud-aiplatform-v1</module>
126-
<module>grpc-google-cloud-aiplatform-v1beta1</module>
127124
<module>grpc-google-cloud-aiplatform-v1</module>
125+
<module>grpc-google-cloud-aiplatform-v1beta1</module>
126+
<module>proto-google-cloud-aiplatform-v1</module>
127+
<module>proto-google-cloud-aiplatform-v1beta1</module>
128128
<module>google-cloud-aiplatform-bom</module>
129129
</modules>
130130

synth.py

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

versions.txt

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

44
google-cloud-aiplatform:0.4.1:0.4.2-SNAPSHOT
5+
grpc-google-cloud-aiplatform-v1:0.4.1:0.4.2-SNAPSHOT
6+
grpc-google-cloud-aiplatform-v1beta1:0.4.1:0.4.2-SNAPSHOT
57
proto-google-cloud-aiplatform-v1:0.4.1:0.4.2-SNAPSHOT
68
proto-google-cloud-aiplatform-v1beta1:0.4.1:0.4.2-SNAPSHOT
7-
grpc-google-cloud-aiplatform-v1:0.4.1:0.4.2-SNAPSHOT
8-
grpc-google-cloud-aiplatform-v1beta1:0.4.1:0.4.2-SNAPSHOT

0 commit comments

Comments
 (0)