diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 91c0ea20..b6721276 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:4837f2a7fdff2985b4f7432f8a6d6a87beacebf3ac071746532c0ce2e3f24b9b + digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28..00000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 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 script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c7..a0ba1f7d 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,2 +1,3 @@ trustedContributors: -- renovate-bot \ No newline at end of file +- renovate-bot +- gcf-owl-bot[bot] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e23d923e..3becb5c0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,9 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -75,4 +78,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index c50c869c..00000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 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. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-service-control/.kokoro/readme.sh" -} - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.log" - } -} - -# The github token is stored here. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - # TODO(theacodes): remove this after secrets have globally propagated - backend_type: FASTCONFIGPUSH - } - } -} - -# Common env vars for all repositories and builds. -env_vars: { - key: "GITHUB_USER" - value: "yoshi-automation" -} -env_vars: { - key: "GITHUB_EMAIL" - value: "yoshi-automation@google.com" -} diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f6599..7f78ee41 100755 --- a/.kokoro/release/common.sh +++ b/.kokoro/release/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index 5c4551ef..742ec1a8 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 1fa95fa5..3cac3d8a 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index da789356..f787c21e 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 Google Inc. +# 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. diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index fe2af16b..2ad10419 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google Inc. +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 8a103384..77dc4e8f 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 9da0f839..8b69b793 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e829a1e..7fe4cd49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.1.1](https://www.github.com/googleapis/java-service-control/compare/v1.1.0...v1.1.1) (2021-09-14) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 ([#59](https://www.github.com/googleapis/java-service-control/issues/59)) ([6807f9f](https://www.github.com/googleapis/java-service-control/commit/6807f9fa0a58d9e6f0f9a6b0d0a1e42d6e919305)) + ## [1.1.0](https://www.github.com/googleapis/java-service-control/compare/v1.0.2...v1.1.0) (2021-09-02) diff --git a/README.md b/README.md index a847677c..758e5333 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-service-control - 1.0.2 + 1.1.0 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-service-control:1.0.2' +implementation 'com.google.cloud:google-cloud-service-control:1.1.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-service-control" % "1.0.2" +libraryDependencies += "com.google.cloud" % "google-cloud-service-control" % "1.1.0" ``` ## Authentication diff --git a/google-cloud-service-control-bom/pom.xml b/google-cloud-service-control-bom/pom.xml index 71ddfb82..c0eb3fb4 100644 --- a/google-cloud-service-control-bom/pom.xml +++ b/google-cloud-service-control-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-service-control-bom - 1.1.0 + 1.1.1 pom com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 Google Service Control API BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-service-control - 1.1.0 + 1.1.1 com.google.api.grpc grpc-google-cloud-service-control-v1 - 1.1.0 + 1.1.1 com.google.api.grpc proto-google-cloud-service-control-v1 - 1.1.0 + 1.1.1 diff --git a/google-cloud-service-control/pom.xml b/google-cloud-service-control/pom.xml index cb5c0fce..6ccb52e5 100644 --- a/google-cloud-service-control/pom.xml +++ b/google-cloud-service-control/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-service-control - 1.1.0 + 1.1.1 jar Google Service Control API https://github.com/googleapis/java-service-control @@ -11,7 +11,7 @@ com.google.cloud google-cloud-service-control-parent - 1.1.0 + 1.1.1 google-cloud-service-control diff --git a/grpc-google-cloud-service-control-v1/pom.xml b/grpc-google-cloud-service-control-v1/pom.xml index ace0acc1..445b3362 100644 --- a/grpc-google-cloud-service-control-v1/pom.xml +++ b/grpc-google-cloud-service-control-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-service-control-v1 - 1.1.0 + 1.1.1 grpc-google-cloud-service-control-v1 GRPC library for google-cloud-service-control com.google.cloud google-cloud-service-control-parent - 1.1.0 + 1.1.1 diff --git a/pom.xml b/pom.xml index 6ad9a0b4..87af9079 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-service-control-parent pom - 1.1.0 + 1.1.1 Google Service Control API Parent https://github.com/googleapis/java-service-control @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 @@ -69,23 +69,23 @@ com.google.cloud google-cloud-service-control - 1.1.0 + 1.1.1 com.google.api.grpc grpc-google-cloud-service-control-v1 - 1.1.0 + 1.1.1 com.google.api.grpc proto-google-cloud-service-control-v1 - 1.1.0 + 1.1.1 com.google.cloud google-cloud-shared-dependencies - 2.2.0 + 2.2.1 pom import diff --git a/proto-google-cloud-service-control-v1/pom.xml b/proto-google-cloud-service-control-v1/pom.xml index 083f67be..1c3088f9 100644 --- a/proto-google-cloud-service-control-v1/pom.xml +++ b/proto-google-cloud-service-control-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-service-control-v1 - 1.1.0 + 1.1.1 proto-google-cloud-service-control-v1 Proto library for google-cloud-service-control com.google.cloud google-cloud-service-control-parent - 1.1.0 + 1.1.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 5e2f158f..a9fb1c70 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-service-control - 0.1.0 + 1.1.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ec67d0c7..ea30113a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-service-control - 0.1.0 + 1.1.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index c7d33fc2..68bc8def 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-service-control - 0.1.0 + 1.1.0 diff --git a/versions.txt b/versions.txt index 3a1658da..e025d920 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-service-control:1.1.0:1.1.0 -grpc-google-cloud-service-control-v1:1.1.0:1.1.0 -proto-google-cloud-service-control-v1:1.1.0:1.1.0 +google-cloud-service-control:1.1.1:1.1.1 +grpc-google-cloud-service-control-v1:1.1.1:1.1.1 +proto-google-cloud-service-control-v1:1.1.1:1.1.1