diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9786771c..426cf83e 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b + digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1ec52a1b..7d3626fb 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ + +If you write sample code, please follow the [samples format]( +https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb18232..f5fc7d51 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 18e23230..7a106d00 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b5e56aa..83ef7f9c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -39,8 +39,8 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 @@ -54,8 +54,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -64,8 +64,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 11 @@ -76,8 +76,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 diff --git a/.kokoro/build.bat b/.kokoro/build.bat index cc602c9e..067cf4a4 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,18 +1,18 @@ +:: Copyright 2022 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. +:: Github action job to test core java library features on +:: downstream client libraries before they are released. :: See documentation in type-shell-output.bat -# Copyright 2022 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. -# Github action job to test core java library features on -# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index e51c7b4c..a2907a25 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -13,12 +13,12 @@ env_vars: { # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { diff --git a/CHANGELOG.md b/CHANGELOG.md index f2af183f..9b7ed3dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [2.8.0](https://github.com/googleapis/java-common-protos/compare/v2.7.4...v2.8.0) (2022-03-11) + + +### Features + +* KMS configuration in settings ([#322](https://github.com/googleapis/java-common-protos/issues/322)) ([14ca04e](https://github.com/googleapis/java-common-protos/commit/14ca04e78d547cc643f419984747781c8915a261)) + + +### Dependencies + +* update dependency io.grpc:grpc-bom to v1.45.0 ([#323](https://github.com/googleapis/java-common-protos/issues/323)) ([ac71fd9](https://github.com/googleapis/java-common-protos/commit/ac71fd90e50498386c559b1e764c948677696ab9)) +* update dependency io.grpc:grpc-protobuf to v1.44.1 ([#324](https://github.com/googleapis/java-common-protos/issues/324)) ([7be56a8](https://github.com/googleapis/java-common-protos/commit/7be56a87aadcbebc98d3136d8c7f4a54a8fe802d)) +* update dependency io.grpc:grpc-protobuf to v1.45.0 ([#336](https://github.com/googleapis/java-common-protos/issues/336)) ([4bbd7a5](https://github.com/googleapis/java-common-protos/commit/4bbd7a5d8a57b0f171893e7f1ece6bee9f778f4e)) +* update dependency io.grpc:grpc-stub to v1.44.1 ([#325](https://github.com/googleapis/java-common-protos/issues/325)) ([bf00d6a](https://github.com/googleapis/java-common-protos/commit/bf00d6a3067df2a6f057be601b27b29accc9d0fb)) +* update dependency io.grpc:grpc-stub to v1.45.0 ([#335](https://github.com/googleapis/java-common-protos/issues/335)) ([3dd8e8f](https://github.com/googleapis/java-common-protos/commit/3dd8e8f4f9c56e4673b428b4ff43dfc30475c50c)) + ### [2.7.4](https://github.com/googleapis/java-common-protos/compare/v2.7.3...v2.7.4) (2022-02-11) diff --git a/grpc-google-common-protos/build.gradle b/grpc-google-common-protos/build.gradle index eb868368..947b3421 100644 --- a/grpc-google-common-protos/build.gradle +++ b/grpc-google-common-protos/build.gradle @@ -18,8 +18,8 @@ repositories { } dependencies { - compile 'io.grpc:grpc-stub:1.44.0' - compile 'io.grpc:grpc-protobuf:1.44.0' + compile 'io.grpc:grpc-stub:1.45.0' + compile 'io.grpc:grpc-protobuf:1.45.0' compile project(':proto-google-common-protos') } diff --git a/grpc-google-common-protos/pom.xml b/grpc-google-common-protos/pom.xml index 7118d76b..078e4281 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.7.4 + 2.8.0 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.7.4 + 2.8.0 diff --git a/pom.xml b/pom.xml index 9f9d98ab..a2d97333 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.7.4 + 2.8.0 Google Common Protos Parent https://github.com/googleapis/java-iam @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.7 + 1.3.0 @@ -65,7 +65,7 @@ google-iam-parent 3.19.4 4.13.2 - 1.44.0 + 1.45.0 31.0.1-android @@ -81,7 +81,7 @@ com.google.api.grpc grpc-google-common-protos - 2.7.4 + 2.8.0 io.grpc @@ -93,7 +93,7 @@ com.google.api.grpc proto-google-common-protos - 2.7.4 + 2.8.0 com.google.guava @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.2.1 + 3.2.2 diff --git a/proto-google-common-protos/pom.xml b/proto-google-common-protos/pom.xml index 69d578ba..c34a18c5 100644 --- a/proto-google-common-protos/pom.xml +++ b/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.7.4 + 2.8.0 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.7.4 + 2.8.0 diff --git a/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java b/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java index bc29a446..39fdf748 100644 --- a/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java +++ b/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java @@ -42,29 +42,27 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n&google/logging/type/http_request.proto" + "\022\023google.logging.type\032\036google/protobuf/d" - + "uration.proto\032\034google/api/annotations.pr" - + "oto\"\357\002\n\013HttpRequest\022\026\n\016request_method\030\001 " - + "\001(\t\022\023\n\013request_url\030\002 \001(\t\022\024\n\014request_size" - + "\030\003 \001(\003\022\016\n\006status\030\004 \001(\005\022\025\n\rresponse_size\030" - + "\005 \001(\003\022\022\n\nuser_agent\030\006 \001(\t\022\021\n\tremote_ip\030\007" - + " \001(\t\022\021\n\tserver_ip\030\r \001(\t\022\017\n\007referer\030\010 \001(\t" - + "\022*\n\007latency\030\016 \001(\0132\031.google.protobuf.Dura" - + "tion\022\024\n\014cache_lookup\030\013 \001(\010\022\021\n\tcache_hit\030" - + "\t \001(\010\022*\n\"cache_validated_with_origin_ser" - + "ver\030\n \001(\010\022\030\n\020cache_fill_bytes\030\014 \001(\003\022\020\n\010p" - + "rotocol\030\017 \001(\tB\276\001\n\027com.google.logging.typ" - + "eB\020HttpRequestProtoP\001Z8google.golang.org" - + "/genproto/googleapis/logging/type;ltype\252" - + "\002\031Google.Cloud.Logging.Type\312\002\031Google\\Clo" - + "ud\\Logging\\Type\352\002\034Google::Cloud::Logging" - + "::Typeb\006proto3" + + "uration.proto\"\357\002\n\013HttpRequest\022\026\n\016request" + + "_method\030\001 \001(\t\022\023\n\013request_url\030\002 \001(\t\022\024\n\014re" + + "quest_size\030\003 \001(\003\022\016\n\006status\030\004 \001(\005\022\025\n\rresp" + + "onse_size\030\005 \001(\003\022\022\n\nuser_agent\030\006 \001(\t\022\021\n\tr" + + "emote_ip\030\007 \001(\t\022\021\n\tserver_ip\030\r \001(\t\022\017\n\007ref" + + "erer\030\010 \001(\t\022*\n\007latency\030\016 \001(\0132\031.google.pro" + + "tobuf.Duration\022\024\n\014cache_lookup\030\013 \001(\010\022\021\n\t" + + "cache_hit\030\t \001(\010\022*\n\"cache_validated_with_" + + "origin_server\030\n \001(\010\022\030\n\020cache_fill_bytes\030" + + "\014 \001(\003\022\020\n\010protocol\030\017 \001(\tB\276\001\n\027com.google.l" + + "ogging.typeB\020HttpRequestProtoP\001Z8google." + + "golang.org/genproto/googleapis/logging/t" + + "ype;ltype\252\002\031Google.Cloud.Logging.Type\312\002\031" + + "Google\\Cloud\\Logging\\Type\352\002\034Google::Clou" + + "d::Logging::Typeb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.protobuf.DurationProto.getDescriptor(), - com.google.api.AnnotationsProto.getDescriptor(), }); internal_static_google_logging_type_HttpRequest_descriptor = getDescriptor().getMessageTypes().get(0); @@ -89,7 +87,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Protocol", }); com.google.protobuf.DurationProto.getDescriptor(); - com.google.api.AnnotationsProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java b/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java index 9843f955..3f205fc5 100644 --- a/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java +++ b/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java @@ -36,24 +36,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { "\n&google/logging/type/log_severity.proto" - + "\022\023google.logging.type\032\034google/api/annota" - + "tions.proto*\202\001\n\013LogSeverity\022\013\n\007DEFAULT\020\000" - + "\022\t\n\005DEBUG\020d\022\t\n\004INFO\020\310\001\022\013\n\006NOTICE\020\254\002\022\014\n\007W" - + "ARNING\020\220\003\022\n\n\005ERROR\020\364\003\022\r\n\010CRITICAL\020\330\004\022\n\n\005" - + "ALERT\020\274\005\022\016\n\tEMERGENCY\020\240\006B\276\001\n\027com.google." - + "logging.typeB\020LogSeverityProtoP\001Z8google" - + ".golang.org/genproto/googleapis/logging/" - + "type;ltype\252\002\031Google.Cloud.Logging.Type\312\002" - + "\031Google\\Cloud\\Logging\\Type\352\002\034Google::Clo" - + "ud::Logging::Typeb\006proto3" + + "\022\023google.logging.type*\202\001\n\013LogSeverity\022\013\n" + + "\007DEFAULT\020\000\022\t\n\005DEBUG\020d\022\t\n\004INFO\020\310\001\022\013\n\006NOTI" + + "CE\020\254\002\022\014\n\007WARNING\020\220\003\022\n\n\005ERROR\020\364\003\022\r\n\010CRITI" + + "CAL\020\330\004\022\n\n\005ALERT\020\274\005\022\016\n\tEMERGENCY\020\240\006B\305\001\n\027c" + + "om.google.logging.typeB\020LogSeverityProto" + + "P\001Z8google.golang.org/genproto/googleapi" + + "s/logging/type;ltype\242\002\004GLOG\252\002\031Google.Clo" + + "ud.Logging.Type\312\002\031Google\\Cloud\\Logging\\T" + + "ype\352\002\034Google::Cloud::Logging::Typeb\006prot" + + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.api.AnnotationsProto.getDescriptor(), - }); - com.google.api.AnnotationsProto.getDescriptor(); + descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto b/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto index d34fe7be..b878d60d 100644 --- a/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto +++ b/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ syntax = "proto3"; package google.logging.type; import "google/protobuf/duration.proto"; -import "google/api/annotations.proto"; option csharp_namespace = "Google.Cloud.Logging.Type"; option go_package = "google.golang.org/genproto/googleapis/logging/type;ltype"; diff --git a/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto b/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto index 0762b5c9..bed71935 100644 --- a/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto +++ b/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,13 +16,12 @@ syntax = "proto3"; package google.logging.type; -import "google/api/annotations.proto"; - option csharp_namespace = "Google.Cloud.Logging.Type"; option go_package = "google.golang.org/genproto/googleapis/logging/type;ltype"; option java_multiple_files = true; option java_outer_classname = "LogSeverityProto"; option java_package = "com.google.logging.type"; +option objc_class_prefix = "GLOG"; option php_namespace = "Google\\Cloud\\Logging\\Type"; option ruby_package = "Google::Cloud::Logging::Type"; diff --git a/versions.txt b/versions.txt index 795dda5c..2e4f1733 100644 --- a/versions.txt +++ b/versions.txt @@ -1,5 +1,5 @@ # Format: # module:released-version:current-version -proto-google-common-protos:2.7.4:2.7.4 -grpc-google-common-protos:2.7.4:2.7.4 +proto-google-common-protos:2.8.0:2.8.0 +grpc-google-common-protos:2.8.0:2.8.0