From 7b0efd1c2eebdb043031923ce723b3888df22108 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 16:14:23 +0000
Subject: [PATCH 1/6] chore: release 2.4.2-SNAPSHOT (#209)
:robot: I have created a release \*beep\* \*boop\*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
grpc-google-common-protos/pom.xml | 4 ++--
pom.xml | 4 ++--
proto-google-common-protos/pom.xml | 4 ++--
versions.txt | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/grpc-google-common-protos/pom.xml b/grpc-google-common-protos/pom.xml
index 9c06ed52..a474ea6b 100644
--- a/grpc-google-common-protos/pom.xml
+++ b/grpc-google-common-protos/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-common-protos
- 2.4.1
+ 2.4.2-SNAPSHOT
grpc-google-common-protos
GRPC library for grpc-google-common-protos
com.google.api.grpc
google-common-protos-parent
- 2.4.1
+ 2.4.2-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index acecd657..606b489a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.api.grpc
google-common-protos-parent
pom
- 2.4.1
+ 2.4.2-SNAPSHOT
Google Common Protos Parent
https://github.com/googleapis/java-iam
@@ -88,7 +88,7 @@
com.google.api.grpc
proto-google-common-protos
- 2.4.1
+ 2.4.2-SNAPSHOT
com.google.guava
diff --git a/proto-google-common-protos/pom.xml b/proto-google-common-protos/pom.xml
index 8c262a70..66c904c1 100644
--- a/proto-google-common-protos/pom.xml
+++ b/proto-google-common-protos/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-common-protos
- 2.4.1
+ 2.4.2-SNAPSHOT
proto-google-common-protos
PROTO library for proto-google-common-protos
com.google.api.grpc
google-common-protos-parent
- 2.4.1
+ 2.4.2-SNAPSHOT
diff --git a/versions.txt b/versions.txt
index 1494d265..6e29fdf2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-proto-google-common-protos:2.4.1:2.4.1
+proto-google-common-protos:2.4.1:2.4.2-SNAPSHOT
From a72f73fbd2936bf1ec52f3c1d395033bf7d06161 Mon Sep 17 00:00:00 2001
From: Neenu Shaji
Date: Mon, 30 Aug 2021 15:15:03 -0400
Subject: [PATCH 2/6] feat: remove unused common_resources.proto (#214)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes #210 ☕️
---
.../proto/google/cloud/common_resources.proto | 52 -------------------
synth.py | 1 +
2 files changed, 1 insertion(+), 52 deletions(-)
delete mode 100644 proto-google-common-protos/src/main/proto/google/cloud/common_resources.proto
diff --git a/proto-google-common-protos/src/main/proto/google/cloud/common_resources.proto b/proto-google-common-protos/src/main/proto/google/cloud/common_resources.proto
deleted file mode 100644
index 56c9f800..00000000
--- a/proto-google-common-protos/src/main/proto/google/cloud/common_resources.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2019 Google LLC.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This file contains stub messages for common resources in GCP.
-// It is not intended to be directly generated, and is instead used by
-// other tooling to be able to match common resource patterns.
-syntax = "proto3";
-
-package google.cloud;
-
-import "google/api/resource.proto";
-
-
-option (google.api.resource_definition) = {
- type: "cloudresourcemanager.googleapis.com/Project"
- pattern: "projects/{project}"
-};
-
-
-option (google.api.resource_definition) = {
- type: "cloudresourcemanager.googleapis.com/Organization"
- pattern: "organizations/{organization}"
-};
-
-
-option (google.api.resource_definition) = {
- type: "cloudresourcemanager.googleapis.com/Folder"
- pattern: "folders/{folder}"
-};
-
-
-option (google.api.resource_definition) = {
- type: "cloudbilling.googleapis.com/BillingAccount"
- pattern: "billingAccounts/{billing_account}"
-};
-
-option (google.api.resource_definition) = {
- type: "locations.googleapis.com/Location"
- pattern: "projects/{project}/locations/{location}"
-};
-
diff --git a/synth.py b/synth.py
index ff68d5d5..bd68d39c 100644
--- a/synth.py
+++ b/synth.py
@@ -100,6 +100,7 @@ def build_grpc(target):
os.remove("proto-google-common-protos/src/main/java/com/google/cloud/audit/BigQueryAuditMetadataOrBuilder.java")
os.remove("proto-google-common-protos/src/main/java/com/google/cloud/audit/BigQueryAuditMetadataProto.java")
os.remove("proto-google-common-protos/src/main/proto/google/cloud/audit/bigquery_audit_metadata.proto")
+os.remove("proto-google-common-protos/src/main/proto/google/cloud/common_resources.proto")
java.common_templates(excludes=[
'README.md',
From da1868310827cbdf18fc600e8952e1b5dd835e2c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Mon, 30 Aug 2021 21:15:27 +0200
Subject: [PATCH 3/6] deps: update dependency io.grpc:grpc-stub to v1.40.1
(#213)
---
grpc-google-common-protos/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grpc-google-common-protos/build.gradle b/grpc-google-common-protos/build.gradle
index 8945378b..b10f04b9 100644
--- a/grpc-google-common-protos/build.gradle
+++ b/grpc-google-common-protos/build.gradle
@@ -18,7 +18,7 @@ repositories {
}
dependencies {
- compile 'io.grpc:grpc-stub:1.23.0'
+ compile 'io.grpc:grpc-stub:1.40.1'
compile 'io.grpc:grpc-protobuf:1.23.0'
compile project(':proto-google-common-protos')
}
From 5b14ce1f3af13c3f3afb919fe531f8ef5d70dccd Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Mon, 30 Aug 2021 21:17:06 +0200
Subject: [PATCH 4/6] deps: update dependency com.google.protobuf:protobuf-java
to v3.17.3 (#211)
---
proto-google-common-protos/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proto-google-common-protos/build.gradle b/proto-google-common-protos/build.gradle
index b2f295c6..ef6eb1a1 100644
--- a/proto-google-common-protos/build.gradle
+++ b/proto-google-common-protos/build.gradle
@@ -18,7 +18,7 @@ repositories {
}
dependencies {
- compile 'com.google.protobuf:protobuf-java:3.7.1'
+ compile 'com.google.protobuf:protobuf-java:3.17.3'
}
sourceSets {
From a36de7220b35377bfb7240d0de2113d9fbad4372 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Mon, 30 Aug 2021 21:46:24 +0200
Subject: [PATCH 5/6] deps: update dependency io.grpc:grpc-protobuf to v1.40.1
(#212)
---
grpc-google-common-protos/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grpc-google-common-protos/build.gradle b/grpc-google-common-protos/build.gradle
index b10f04b9..cda8ea41 100644
--- a/grpc-google-common-protos/build.gradle
+++ b/grpc-google-common-protos/build.gradle
@@ -19,7 +19,7 @@ repositories {
dependencies {
compile 'io.grpc:grpc-stub:1.40.1'
- compile 'io.grpc:grpc-protobuf:1.23.0'
+ compile 'io.grpc:grpc-protobuf:1.40.1'
compile project(':proto-google-common-protos')
}
From e293d9ef7ca155b853d0f3ce88fd8b0ba1da9a6a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 20:02:17 +0000
Subject: [PATCH 6/6] chore: release 2.5.0 (#215)
:robot: I have created a release \*beep\* \*boop\*
---
## [2.5.0](https://www.github.com/googleapis/java-common-protos/compare/v2.4.1...v2.5.0) (2021-08-30)
### Features
* remove unused common_resources.proto ([#214](https://www.github.com/googleapis/java-common-protos/issues/214)) ([a72f73f](https://www.github.com/googleapis/java-common-protos/commit/a72f73fbd2936bf1ec52f3c1d395033bf7d06161))
### Dependencies
* update dependency com.google.protobuf:protobuf-java to v3.17.3 ([#211](https://www.github.com/googleapis/java-common-protos/issues/211)) ([5b14ce1](https://www.github.com/googleapis/java-common-protos/commit/5b14ce1f3af13c3f3afb919fe531f8ef5d70dccd))
* update dependency io.grpc:grpc-protobuf to v1.40.1 ([#212](https://www.github.com/googleapis/java-common-protos/issues/212)) ([a36de72](https://www.github.com/googleapis/java-common-protos/commit/a36de7220b35377bfb7240d0de2113d9fbad4372))
* update dependency io.grpc:grpc-stub to v1.40.1 ([#213](https://www.github.com/googleapis/java-common-protos/issues/213)) ([da18683](https://www.github.com/googleapis/java-common-protos/commit/da1868310827cbdf18fc600e8952e1b5dd835e2c))
---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
CHANGELOG.md | 14 ++++++++++++++
grpc-google-common-protos/pom.xml | 4 ++--
pom.xml | 4 ++--
proto-google-common-protos/pom.xml | 4 ++--
versions.txt | 2 +-
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96620a93..b7792f22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+## [2.5.0](https://www.github.com/googleapis/java-common-protos/compare/v2.4.1...v2.5.0) (2021-08-30)
+
+
+### Features
+
+* remove unused common_resources.proto ([#214](https://www.github.com/googleapis/java-common-protos/issues/214)) ([a72f73f](https://www.github.com/googleapis/java-common-protos/commit/a72f73fbd2936bf1ec52f3c1d395033bf7d06161))
+
+
+### Dependencies
+
+* update dependency com.google.protobuf:protobuf-java to v3.17.3 ([#211](https://www.github.com/googleapis/java-common-protos/issues/211)) ([5b14ce1](https://www.github.com/googleapis/java-common-protos/commit/5b14ce1f3af13c3f3afb919fe531f8ef5d70dccd))
+* update dependency io.grpc:grpc-protobuf to v1.40.1 ([#212](https://www.github.com/googleapis/java-common-protos/issues/212)) ([a36de72](https://www.github.com/googleapis/java-common-protos/commit/a36de7220b35377bfb7240d0de2113d9fbad4372))
+* update dependency io.grpc:grpc-stub to v1.40.1 ([#213](https://www.github.com/googleapis/java-common-protos/issues/213)) ([da18683](https://www.github.com/googleapis/java-common-protos/commit/da1868310827cbdf18fc600e8952e1b5dd835e2c))
+
### [2.4.1](https://www.github.com/googleapis/java-common-protos/compare/v2.4.0...v2.4.1) (2021-08-27)
diff --git a/grpc-google-common-protos/pom.xml b/grpc-google-common-protos/pom.xml
index a474ea6b..d4b06cd2 100644
--- a/grpc-google-common-protos/pom.xml
+++ b/grpc-google-common-protos/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-common-protos
- 2.4.2-SNAPSHOT
+ 2.5.0
grpc-google-common-protos
GRPC library for grpc-google-common-protos
com.google.api.grpc
google-common-protos-parent
- 2.4.2-SNAPSHOT
+ 2.5.0
diff --git a/pom.xml b/pom.xml
index 606b489a..b3259f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.api.grpc
google-common-protos-parent
pom
- 2.4.2-SNAPSHOT
+ 2.5.0
Google Common Protos Parent
https://github.com/googleapis/java-iam
@@ -88,7 +88,7 @@
com.google.api.grpc
proto-google-common-protos
- 2.4.2-SNAPSHOT
+ 2.5.0
com.google.guava
diff --git a/proto-google-common-protos/pom.xml b/proto-google-common-protos/pom.xml
index 66c904c1..89add025 100644
--- a/proto-google-common-protos/pom.xml
+++ b/proto-google-common-protos/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-common-protos
- 2.4.2-SNAPSHOT
+ 2.5.0
proto-google-common-protos
PROTO library for proto-google-common-protos
com.google.api.grpc
google-common-protos-parent
- 2.4.2-SNAPSHOT
+ 2.5.0
diff --git a/versions.txt b/versions.txt
index 6e29fdf2..b10f89ef 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-proto-google-common-protos:2.4.1:2.4.2-SNAPSHOT
+proto-google-common-protos:2.5.0:2.5.0