diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 1830d09a..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:8e27e5a7297b40eca3ab46ae67f10c575813a85c673839030aa161d0818f3a24 + digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata deleted file mode 100644 index d23ee485..00000000 --- a/.github/readme/synth.metadata/synth.metadata +++ /dev/null @@ -1,18 +0,0 @@ -{ - "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/java-video-transcoder.git", - "sha": "dee9115c1e87a36e123fc72433e5d1a32796e08c" - } - }, - { - "git": { - "name": "synthtool", - "remote": "https://github.com/googleapis/synthtool.git", - "sha": "3d32990b6f4b57be77455e3ca89e6e21cd0c06b3" - } - } - ] -} \ No newline at end of file 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/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 00000000..d4ca9418 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index ffd39f6f..32e0ea5a 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -10,7 +10,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (8) @@ -26,7 +25,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (7) 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 65ae6ecd..3becb5c0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -23,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 @@ -37,28 +43,21 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh - linkage-monitor: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - name: Install artifacts to local Maven repository - run: .kokoro/build.sh - shell: bash - - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-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 @@ -70,6 +69,9 @@ jobs: runs-on: ubuntu-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 diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index 873a7cc4..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-video-transcoder/.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 787b3a4f..9f991752 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 ff96c38c..92933248 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 3b1f3dae..8bb0aea4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.4.0](https://www.github.com/googleapis/java-video-transcoder/compare/v0.3.2...v0.4.0) (2021-09-14) + + +### Features + +* Remove use of deprecated gradle command in java README ([#1196](https://www.github.com/googleapis/java-video-transcoder/issues/1196)) ([#220](https://www.github.com/googleapis/java-video-transcoder/issues/220)) ([9e27d67](https://www.github.com/googleapis/java-video-transcoder/commit/9e27d679a18abdb2294fe638cc522d2070582395)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#223](https://www.github.com/googleapis/java-video-transcoder/issues/223)) ([ab322c3](https://www.github.com/googleapis/java-video-transcoder/commit/ab322c3496d033acc8a3b55d0592ae38467f8349)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 ([#231](https://www.github.com/googleapis/java-video-transcoder/issues/231)) ([85d2e4d](https://www.github.com/googleapis/java-video-transcoder/commit/85d2e4dba2f9f3529597b3bbe159abf33279f02c)) + ### [0.3.2](https://www.github.com/googleapis/java-video-transcoder/compare/v0.3.1...v0.3.2) (2021-08-23) diff --git a/README.md b/README.md index 99e0b2b5..76679cc7 100644 --- a/README.md +++ b/README.md @@ -22,20 +22,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-video-transcoder - 0.3.1 + 0.3.2 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-video-transcoder:0.3.1' +implementation 'com.google.cloud:google-cloud-video-transcoder:0.3.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-video-transcoder" % "0.3.1" +libraryDependencies += "com.google.cloud" % "google-cloud-video-transcoder" % "0.3.2" ``` ## Authentication diff --git a/google-cloud-video-transcoder-bom/pom.xml b/google-cloud-video-transcoder-bom/pom.xml index 44149901..939e15b9 100644 --- a/google-cloud-video-transcoder-bom/pom.xml +++ b/google-cloud-video-transcoder-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-video-transcoder-bom - 0.3.2 + 0.4.0 pom com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 Google Video Transcoder BOM @@ -57,27 +57,27 @@ com.google.cloud google-cloud-video-transcoder - 0.3.2 + 0.4.0 com.google.api.grpc grpc-google-cloud-video-transcoder-v1beta1 - 0.3.2 + 0.4.0 com.google.api.grpc grpc-google-cloud-video-transcoder-v1 - 0.3.2 + 0.4.0 com.google.api.grpc proto-google-cloud-video-transcoder-v1beta1 - 0.3.2 + 0.4.0 com.google.api.grpc proto-google-cloud-video-transcoder-v1 - 0.3.2 + 0.4.0 diff --git a/google-cloud-video-transcoder/pom.xml b/google-cloud-video-transcoder/pom.xml index 7b9b905e..e75e6e93 100644 --- a/google-cloud-video-transcoder/pom.xml +++ b/google-cloud-video-transcoder/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-video-transcoder - 0.3.2 + 0.4.0 jar Google Video Transcoder https://github.com/googleapis/java-video-transcoder @@ -11,7 +11,7 @@ com.google.cloud google-cloud-video-transcoder-parent - 0.3.2 + 0.4.0 google-cloud-video-transcoder diff --git a/google-cloud-video-transcoder/src/main/java/com/google/cloud/video/transcoder/v1/stub/TranscoderServiceStubSettings.java b/google-cloud-video-transcoder/src/main/java/com/google/cloud/video/transcoder/v1/stub/TranscoderServiceStubSettings.java index ad83962d..d372681e 100644 --- a/google-cloud-video-transcoder/src/main/java/com/google/cloud/video/transcoder/v1/stub/TranscoderServiceStubSettings.java +++ b/google-cloud-video-transcoder/src/main/java/com/google/cloud/video/transcoder/v1/stub/TranscoderServiceStubSettings.java @@ -302,7 +302,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/google-cloud-video-transcoder/src/main/java/com/google/cloud/video/transcoder/v1beta1/stub/TranscoderServiceStubSettings.java b/google-cloud-video-transcoder/src/main/java/com/google/cloud/video/transcoder/v1beta1/stub/TranscoderServiceStubSettings.java index b6d7d951..3f4bc8ec 100644 --- a/google-cloud-video-transcoder/src/main/java/com/google/cloud/video/transcoder/v1beta1/stub/TranscoderServiceStubSettings.java +++ b/google-cloud-video-transcoder/src/main/java/com/google/cloud/video/transcoder/v1beta1/stub/TranscoderServiceStubSettings.java @@ -306,7 +306,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/grpc-google-cloud-video-transcoder-v1/pom.xml b/grpc-google-cloud-video-transcoder-v1/pom.xml index 32f146e1..5a558dd6 100644 --- a/grpc-google-cloud-video-transcoder-v1/pom.xml +++ b/grpc-google-cloud-video-transcoder-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-video-transcoder-v1 - 0.3.2 + 0.4.0 grpc-google-cloud-video-transcoder-v1 GRPC library for google-cloud-video-transcoder com.google.cloud google-cloud-video-transcoder-parent - 0.3.2 + 0.4.0 diff --git a/grpc-google-cloud-video-transcoder-v1beta1/pom.xml b/grpc-google-cloud-video-transcoder-v1beta1/pom.xml index 83b64180..66d6ce31 100644 --- a/grpc-google-cloud-video-transcoder-v1beta1/pom.xml +++ b/grpc-google-cloud-video-transcoder-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-video-transcoder-v1beta1 - 0.3.2 + 0.4.0 grpc-google-cloud-video-transcoder-v1beta1 GRPC library for google-cloud-video-transcoder com.google.cloud google-cloud-video-transcoder-parent - 0.3.2 + 0.4.0 diff --git a/pom.xml b/pom.xml index e8b92de2..81409e61 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-video-transcoder-parent pom - 0.3.2 + 0.4.0 Google Video Transcoder Parent https://github.com/googleapis/java- @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 @@ -61,33 +61,33 @@ com.google.cloud google-cloud-video-transcoder - 0.3.2 + 0.4.0 com.google.api.grpc proto-google-cloud-video-transcoder-v1 - 0.3.2 + 0.4.0 com.google.api.grpc grpc-google-cloud-video-transcoder-v1 - 0.3.2 + 0.4.0 com.google.api.grpc proto-google-cloud-video-transcoder-v1beta1 - 0.3.2 + 0.4.0 com.google.api.grpc grpc-google-cloud-video-transcoder-v1beta1 - 0.3.2 + 0.4.0 com.google.cloud google-cloud-shared-dependencies - 2.1.0 + 2.2.1 pom import @@ -152,7 +152,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 html diff --git a/proto-google-cloud-video-transcoder-v1/pom.xml b/proto-google-cloud-video-transcoder-v1/pom.xml index a090881b..f642e11c 100644 --- a/proto-google-cloud-video-transcoder-v1/pom.xml +++ b/proto-google-cloud-video-transcoder-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-video-transcoder-v1 - 0.3.2 + 0.4.0 proto-google-cloud-video-transcoder-v1 Proto library for google-cloud-video-transcoder com.google.cloud google-cloud-video-transcoder-parent - 0.3.2 + 0.4.0 diff --git a/proto-google-cloud-video-transcoder-v1beta1/pom.xml b/proto-google-cloud-video-transcoder-v1beta1/pom.xml index 52919e20..3512bfa8 100644 --- a/proto-google-cloud-video-transcoder-v1beta1/pom.xml +++ b/proto-google-cloud-video-transcoder-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-video-transcoder-v1beta1 - 0.3.2 + 0.4.0 proto-google-cloud-video-transcoder-v1beta1 Proto library for google-cloud-video-transcoder com.google.cloud google-cloud-video-transcoder-parent - 0.3.2 + 0.4.0 diff --git a/renovate.json b/renovate.json index ff04e8c8..216bf35d 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,8 @@ "^junit:junit", "^com.google.truth:truth", "^org.mockito:mockito-core", - "^org.objenesis:objenesis" + "^org.objenesis:objenesis", + "^com.google.cloud:google-cloud-conformance-tests" ], "semanticCommitType": "test", "semanticCommitScope": "deps" diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index db5b99a9..24b265d9 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-video-transcoder - 0.2.0 + 0.3.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 62a00098..c12dc42e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-video-transcoder - 0.3.2 + 0.4.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index b4aadac0..6f962ca4 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-video-transcoder - 0.2.0 + 0.3.2 diff --git a/versions.txt b/versions.txt index a2ee550b..3d01444c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-video-transcoder:0.3.2:0.3.2 -grpc-google-cloud-video-transcoder-v1beta1:0.3.2:0.3.2 -grpc-google-cloud-video-transcoder-v1:0.3.2:0.3.2 -proto-google-cloud-video-transcoder-v1beta1:0.3.2:0.3.2 -proto-google-cloud-video-transcoder-v1:0.3.2:0.3.2 +google-cloud-video-transcoder:0.4.0:0.4.0 +grpc-google-cloud-video-transcoder-v1beta1:0.4.0:0.4.0 +grpc-google-cloud-video-transcoder-v1:0.4.0:0.4.0 +proto-google-cloud-video-transcoder-v1beta1:0.4.0:0.4.0 +proto-google-cloud-video-transcoder-v1:0.4.0:0.4.0