diff --git a/docker/owlbot/java/Dockerfile b/docker/owlbot/java/Dockerfile deleted file mode 100644 index 97d3e7063..000000000 --- a/docker/owlbot/java/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -# 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. -# You may obtain a copy of the License at -# -# https://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. - -# build from the root of this repo: -FROM gcr.io/cloud-devrel-public-resources/java8 - -# The OwlBot Java postprocessor does not rely on project's Java formatter. -# When you upgrade the formatter version, see the issue below for the required -# changes: -# https://github.com/googleapis/synthtool/issues/1502 -ARG JAVA_FORMAT_VERSION=1.7 - -RUN apt-get install -y --no-install-recommends jq - -COPY docker/owlbot/java/bin /owlbot/bin -COPY docker/owlbot/java/src /owlbot/src -COPY docker/owlbot/java/templates /owlbot/templates -COPY post-processor-changes.txt /post-processor-changes.txt -RUN cd /owlbot/src && \ - python3 -m pip install --require-hashes -r requirements.txt -ADD https://repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/${JAVA_FORMAT_VERSION}/google-java-format-${JAVA_FORMAT_VERSION}-all-deps.jar /owlbot/google-java-format.jar - -###################### Install synthtool's requirements. -COPY . /synthtool/ - -WORKDIR /synthtool -RUN python3 -m pip install --no-deps -e . -RUN python3 -m pip install --require-hashes -r docker/owlbot/java/src/requirements.txt - -# Allow non-root users to run python -RUN chmod +rx /root/ /root/.pyenv && chmod +r /owlbot/google-java-format.jar - -# Tell synthtool to pull templates from this docker image instead of from -# the live repo. -ENV SYNTHTOOL_TEMPLATES="/synthtool/synthtool/gcp/templates" \ - PYTHON_PATH="/owlbot/src" - -WORKDIR /workspace - -CMD [ "/owlbot/bin/entrypoint.sh" ] diff --git a/docker/owlbot/java/README.md b/docker/owlbot/java/README.md deleted file mode 100644 index 55b8a1f12..000000000 --- a/docker/owlbot/java/README.md +++ /dev/null @@ -1,84 +0,0 @@ -# Java Post-Processing Docker Image - -Docker image used for bootstrapping/post-processing. Running this on -should: - -1. Generate common templates -2. Write any missing `pom.xml` files or update with new detected modules -3. Restore or create `clirr-ignored-differences.xml` files after a new release -4. Restore license header years on generated files. -5. Run our standard `google-java-format` plugin. - -## Usage - -### Running locally - -```bash -docker run --rm -v $(pwd):/workspace --user "$(id -u):$(id -g)" gcr.io/repo-automation-bots/owlbot-java -``` - -### Building the image - -#### Local Docker - -From the root of the synthtool repository, run: - -```bash -synthtool$ docker build -f docker/owlbot/java/Dockerfile . -... -Removing intermediate container e6d071e39d1b - ---> a7d7e0c80b00 -Successfully built a7d7e0c80b00 -``` - -"a7d7e0c80b00" is the ID of the container image build. Try running the -postprocessor image with a target repository. -Here is an example with java-aiplatform repository below: - -```bash -java-aiplatform$ git checkout -b test_postprocessor origin/main -branch 'test_postprocessor' set up to track 'origin/main'. -Switched to a new branch 'test_postprocessor' -java-aiplatform$ docker run --rm -v $(pwd):/workspace a7d7e0c80b00 -... -Reformatting source... -...done -java-aiplatform$ git diff -... (shows the generated file differences) ... -``` - -This manual confirmation identifies syntax errors in Python scripts and the -templates. - -#### Cloud Build -This image is built via Cloud Build. From the root of this repository, run: - -```bash -gcloud builds submit --config=docker/owlbot/java/cloudbuild.yaml -``` - -### Rebuilding Golden Test Fixtures - -To rebuild the golden test fixtures: - -1. Delete the `golden` directory. -2. Copy the `input` directory recursively to `golden` -3. [Run the latest owlbot image](#running-locally) against the `golden` directory. - -### Lint error - -When you modify Python scripts, you may encounter lint errors -Kokoro build: - -``` -nox > black --check synthtool tests -would reformat synthtool/languages/java.py - -Oh no! 💥 💔 💥 -1 file would be reformatted, 78 files would be left unchanged. -``` - -In this case, install [nox](https://nox.thea.codes/en/stable/) and run -`nox -s lint` to reproduce the lint problems and `black synthtool` applies -the suggested formatting. - diff --git a/docker/owlbot/java/bin/entrypoint.sh b/docker/owlbot/java/bin/entrypoint.sh deleted file mode 100755 index b54e127da..000000000 --- a/docker/owlbot/java/bin/entrypoint.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# 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. -# You may obtain a copy of the License at -# -# https://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. - -set -e - -# Runs template and etc in current working directory -function processModule() { - # templates as well as retrieving files from owl-bot-staging - echo "Generating templates and retrieving files from owl-bot-staging directory..." - /owlbot/bin/write_templates.sh - echo "...done" - - # write or restore pom.xml files - echo "Generating missing pom.xml..." - /owlbot/bin/write_missing_pom_files.sh - echo "...done" - - # write or restore clirr-ignored-differences.xml - echo "Generating clirr-ignored-differences.xml..." - /owlbot/bin/write_clirr_ignore.sh - echo "...done" - - # fix license headers - echo "Fixing missing license headers..." - /owlbot/bin/fix_license_headers.sh - echo "...done" - - # TODO: re-enable this once we resolve thrashing - # restore license headers years - # echo "Restoring copyright years..." - # /owlbot/bin/restore_license_headers.sh - # echo "...done" - - # ensure formatting on all .java files in the repository - echo "Reformatting source..." - /owlbot/bin/format_source.sh - echo "...done" -} - -if [ "$(ls */.OwlBot.yaml|wc -l)" -gt 1 ];then - # Monorepo (googleapis/google-cloud-java) has multiple OwlBot.yaml config - # files in the modules. - echo "Processing monorepo" - if [ -d owl-bot-staging ]; then - # The content of owl-bot-staging is controlled by Owlbot.yaml files in - # each module in the monorepo - echo "Extracting contents from owl-bot-staging" - for module in $(ls owl-bot-staging); do - if [ ! -d "$module" ]; then - continue - fi - # This relocation allows us continue to use owlbot.py without modification - # after monorepo migration. - mv "owl-bot-staging/$module" "$module/owl-bot-staging" - pushd "$module" - processModule - popd - done - rm -r owl-bot-staging - else - echo "In monorepo but no owl-bot-staging." \ - "Formatting changes in the last commit" - # Find the files that were touched by the last commit. - last_commit=$(git log -1 --format=%H) - # [A]dded, [C]reated, [M]odified, and [R]enamed - changed_files=$(git show --name-only --no-renames --diff-filter=ACMR \ - "${last_commit}") - changed_modules=$(echo "$changed_files" |grep -E '.java$' |cut -d '/' -f 1 \ - |sort -u) - for module in ${changed_modules}; do - if [ ! -f "$module/.OwlBot.yaml" ]; then - # Changes irrelevant to Owlbot-generated module (such as .github) do not - # need formatting - continue - fi - pushd "$module" - processModule - popd - done - fi -else - # Split repository - echo "Processing a split repo" - processModule -fi \ No newline at end of file diff --git a/docker/owlbot/java/bin/fix_license_headers.sh b/docker/owlbot/java/bin/fix_license_headers.sh deleted file mode 100755 index bc3c5a962..000000000 --- a/docker/owlbot/java/bin/fix_license_headers.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# 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. -# You may obtain a copy of the License at -# -# https://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. - -set -e - -python3 /owlbot/src/fix-license-headers.py diff --git a/docker/owlbot/java/bin/format_source.sh b/docker/owlbot/java/bin/format_source.sh deleted file mode 100755 index 7b9c9fb4a..000000000 --- a/docker/owlbot/java/bin/format_source.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# 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. -# You may obtain a copy of the License at -# -# https://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. - -set -e - -# Why OwlBot Java postprocessor does not use the formatter defined in pom.xml? -# It's because the postprocessor runs in a privileged (albeit limited) -# environment. We limit the risk of running somebody else's malicious Maven -# plugin code in the environment. - -# Find all the java files relative to the current directory and format them -# using google-java-format -list="$(find . -name '*.java' -not -path ".*/samples/snippets/generated/**/*" )" -tmpfile=$(mktemp) - -for file in $list; -do - if [[ $file =~ .*/samples/snippets/src/main/java/com/example/firestore/Quickstart.java ]]; - then - echo "File skipped formatting: $file" - elif [[ $file =~ .*/samples/snippets/src/.*/java/com/example/spanner/.*.java ]]; - then - echo "File skipped formatting: $file" - else - echo $file >> $tmpfile - fi -done - -# This JAR file is downloaded by Dockerfile -cat $tmpfile | xargs java -jar /owlbot/google-java-format.jar --replace - -rm $tmpfile diff --git a/docker/owlbot/java/bin/restore_license_headers.sh b/docker/owlbot/java/bin/restore_license_headers.sh deleted file mode 100755 index eb3165468..000000000 --- a/docker/owlbot/java/bin/restore_license_headers.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# 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. -# You may obtain a copy of the License at -# -# https://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. - -set -e - -# list the modified files in the current commit -last_commit_files=$(git diff-tree --no-commit-id -r $(git rev-parse HEAD) --name-only --diff-filter=M) - -# list the modified, uncommited files -current_modified_files=$(git diff --name-only HEAD) - -# join and deduplicate the list -all_files=$(echo ${last_commit_files} ${current_modified_files} | sort -u) - -for file in ${all_files} -do - # look for the Copyright YYYY line within the first 10 lines - old_copyright=$(git show HEAD~1:${file} | head -n 10 | egrep -o -e "Copyright ([[:digit:]]{4})" || echo "") - new_copyright=$(cat ${file} | head -n 10 | egrep -o -e "Copyright ([[:digit:]]{4})" || echo "") - # if the header year changed in the last diff, then restore the previous year - if [ ! -z "${old_copyright}" ] && [ ! -z "${new_copyright}" ] && [ "${old_copyright}" != "${new_copyright}" ] - then - echo "Restoring copyright in ${file} to '${old_copyright}'" - # replace the first instance of the old copyright header with the new - sed -i "s/${new_copyright}/${old_copyright}/1" ${file} - fi -done diff --git a/docker/owlbot/java/bin/write_clirr_ignore.sh b/docker/owlbot/java/bin/write_clirr_ignore.sh deleted file mode 100755 index 0b2e5ada3..000000000 --- a/docker/owlbot/java/bin/write_clirr_ignore.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# 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. -# You may obtain a copy of the License at -# -# https://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. - -set -e - -templates_dir=$(realpath $(dirname "${BASH_SOURCE[0]}")/../templates/clirr) - -# restore default clirr-ignored-differences.xml for protos if the file does not exist -for dir in `ls -d proto-google-*` -do - if [ ! -f "${dir}/clirr-ignored-differences.xml" ] - then - tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX) - pushd ${dir} - pushd src/main/java - find * -name *OrBuilder.java | xargs dirname | sort -u | jq -Rns ' (inputs | rtrimstr("\n") | split("\n") ) as $data | {proto_paths: $data}' > ${tmp_dir}/paths.json - popd - python3 /owlbot/src/gen-template.py --data=${tmp_dir}/paths.json --folder=${templates_dir} - popd - fi -done diff --git a/docker/owlbot/java/bin/write_missing_pom_files.sh b/docker/owlbot/java/bin/write_missing_pom_files.sh deleted file mode 100755 index a3831ac12..000000000 --- a/docker/owlbot/java/bin/write_missing_pom_files.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# 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. -# You may obtain a copy of the License at -# -# https://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. - -set -e - -python3 /owlbot/src/fix-poms.py diff --git a/docker/owlbot/java/bin/write_templates.sh b/docker/owlbot/java/bin/write_templates.sh deleted file mode 100755 index 7782bbab3..000000000 --- a/docker/owlbot/java/bin/write_templates.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# 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. -# You may obtain a copy of the License at -# -# https://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. - -set -e - -if [ -f "owlbot.py" ] -then - python3 owlbot.py -fi diff --git a/docker/owlbot/java/cloudbuild.yaml b/docker/owlbot/java/cloudbuild.yaml deleted file mode 100644 index 1028c18b6..000000000 --- a/docker/owlbot/java/cloudbuild.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# 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. -# 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. -steps: - # Write the latest commit message to a file in the workspace. - - name: 'gcr.io/cloud-builders/git' - entrypoint: '/bin/sh' - args: - - '-c' - - 'git log -1 --format="%s%n%n%b%nSource-Link: https://github.com/googleapis/synthtool/commit/%H" > post-processor-changes.txt' - # Build the docker image. - - name: "gcr.io/cloud-builders/docker" - args: [ "build", - "-t", "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA", - "-t", "gcr.io/$PROJECT_ID/owlbot-java:latest", - "-t", "gcr.io/cloud-devrel-public-resources/owlbot-java:$SHORT_SHA", - "-t", "gcr.io/cloud-devrel-public-resources/owlbot-java:infrastructure-public-image-$SHORT_SHA", - "-t", "gcr.io/cloud-devrel-public-resources/owlbot-java:latest", - "-f", "docker/owlbot/java/Dockerfile", "." ] - id: "build" - - name: gcr.io/gcp-runtimes/container-structure-test - args: - ["test", "--image", "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA", "--config", "docker/owlbot/java/container_test.yaml"] - waitFor: ["build"] - - # end-to-end tests - - name: "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA" - dir: docker/owlbot/java/tests/new-client/input - id: "new-client-run" - waitFor: ["build"] - - name: "bash" - args: ["diff", "-rw", "input", "golden"] - dir: docker/owlbot/java/tests/new-client - waitFor: ["new-client-run"] - -images: - - gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA - - gcr.io/$PROJECT_ID/owlbot-java:latest - - gcr.io/cloud-devrel-public-resources/owlbot-java:$SHORT_SHA - - gcr.io/cloud-devrel-public-resources/owlbot-java:latest - - gcr.io/cloud-devrel-public-resources/owlbot-java:infrastructure-public-image-$SHORT_SHA - diff --git a/docker/owlbot/java/cloudbuild_test.yaml b/docker/owlbot/java/cloudbuild_test.yaml deleted file mode 100644 index 5b4ba2bcd..000000000 --- a/docker/owlbot/java/cloudbuild_test.yaml +++ /dev/null @@ -1,70 +0,0 @@ -# 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. -# 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. -steps: - # Write the latest commit message to a file in the workspace. - - name: 'gcr.io/cloud-builders/git' - entrypoint: '/bin/sh' - args: - - '-c' - - 'git log -1 --format="%s%n%n%b%nSource-Link: https://github.com/googleapis/synthtool/commit/%H" > post-processor-changes.txt' - # Build the docker image. - - name: "gcr.io/cloud-builders/docker" - args: [ "build", - "-t", "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA", - "-t", "gcr.io/$PROJECT_ID/owlbot-java:latest", - "-f", "docker/owlbot/java/Dockerfile", "." ] - id: "build" - - name: gcr.io/gcp-runtimes/container-structure-test - args: - ["test", "--image", "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA", "--config", "docker/owlbot/java/container_test.yaml"] - waitFor: ["build"] - - # end-to-end tests - - name: "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA" - dir: docker/owlbot/java/tests/new-client/input - id: "new-client-run" - waitFor: ["build"] - - name: "bash" - args: ["diff", "-rw", "input", "golden"] - dir: docker/owlbot/java/tests/new-client - waitFor: ["new-client-run"] - - name: "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA" - dir: docker/owlbot/java/tests/new-client-maps/input - id: "new-client-maps-run" - waitFor: [ "build" ] - - name: "bash" - args: [ "diff", "-rw", "input", "golden" ] - dir: docker/owlbot/java/tests/new-client-maps - waitFor: [ "new-client-maps-run" ] - - name: "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA" - dir: docker/owlbot/java/tests/new-version/input - id: "new-version-run" - waitFor: ["build"] - - name: "bash" - args: ["diff", "-rw", "input", "golden"] - dir: docker/owlbot/java/tests/new-version - waitFor: ["new-version-run"] - - name: "gcr.io/$PROJECT_ID/owlbot-java:$SHORT_SHA" - dir: docker/owlbot/java/tests/fix-poms/input - id: "fix-poms-run" - waitFor: ["build"] - - name: "bash" - args: ["diff", "-rw", "input", "golden"] - dir: docker/owlbot/java/tests/fix-poms - waitFor: ["fix-poms-run"] - - name: "gcr.io/cloud-devrel-public-resources/java8" - dir: synthtool/gcp/templates/java_library/.kokoro - waitFor: ["-"] - entrypoint: 'python' - args: [ "-m", "pip", "install", "-r", "requirements.txt" ] diff --git a/docker/owlbot/java/container_test.yaml b/docker/owlbot/java/container_test.yaml deleted file mode 100644 index b6022cf43..000000000 --- a/docker/owlbot/java/container_test.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# 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. -# 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. - -schemaVersion: 2.0.0 -commandTests: -- name: "version" - command: "java" - args: ["-version"] - # java -version outputs to stderr... - expectedError: ["(java|openjdk) version \"1.8.*\""] -- name: "formatter" - command: "java" - args: ["-jar", "/owlbot/google-java-format.jar", "--version"] - expectedError: ["google-java-format: Version 1.7"] -- name: "python" - command: "python" - args: ["--version"] - expectedOutput: ["Python 3.9.13"] -- name: "java synthtool validation" - command: "python" - # Use YAML List Style for this command - # Having to use backslash for quotes (\") was resulting in an invalid test - args: - - -c - - 'import synthtool.languages.java; print("import success")' - expectedOutput: ["import success"] diff --git a/docker/owlbot/java/src/fix-license-headers.py b/docker/owlbot/java/src/fix-license-headers.py deleted file mode 100644 index 7cc8a264f..000000000 --- a/docker/owlbot/java/src/fix-license-headers.py +++ /dev/null @@ -1,30 +0,0 @@ -# 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. -# You may obtain a copy of the License at -# -# https://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. - -from pathlib import Path -import glob -from synthtool.languages import java - - -root = Path(".").resolve() - -# Until the generator generates license headers on generated proto -# classes, add the license headers in -for path in glob.glob("proto-google-*"): - java.fix_proto_headers(root / path) - -# Until the generator generates license headers on generated grpc -# classes, add the license headers in -for path in glob.glob("grpc-google-*"): - java.fix_grpc_headers(root / path, "unused") diff --git a/docker/owlbot/java/src/fix-poms.py b/docker/owlbot/java/src/fix-poms.py deleted file mode 100644 index b8bdd4f09..000000000 --- a/docker/owlbot/java/src/fix-poms.py +++ /dev/null @@ -1,530 +0,0 @@ -# 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. -# You may obtain a copy of the License at -# -# https://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. - -import glob -import inspect -import itertools -import json -from lxml import etree -import os -import re -from typing import List, Mapping -from poms import module, templates - - -def load_versions(filename: str, default_group_id: str) -> Mapping[str, module.Module]: - if not os.path.isfile(filename): - return {} - modules = {} - with open(filename, "r") as fp: - for line in fp: - line = line.strip() - if line.startswith("#"): - continue - - parts = line.split(":") - if len(parts) == 3: - artifact_id = parts[0] - group_id = ( - default_group_id - if artifact_id.startswith("google-") - else _proto_group_id(default_group_id) - ) - modules[artifact_id] = module.Module( - group_id=group_id, - artifact_id=artifact_id, - release_version=parts[1], - version=parts[2], - ) - return modules - - -def _find_dependency_index(dependencies, group_id, artifact_id) -> int: - try: - return next( - i - for i, x in enumerate(dependencies.getchildren()) - if _dependency_matches(x, group_id, artifact_id) - ) - except StopIteration: - return -1 - - -def _dependency_matches(node, group_id, artifact_id) -> bool: - artifact_node = node.find("{http://maven.apache.org/POM/4.0.0}artifactId") - group_node = node.find("{http://maven.apache.org/POM/4.0.0}groupId") - - if artifact_node is None or group_node is None: - return False - - return artifact_node.text.startswith(artifact_id) and group_node.text.startswith( - group_id - ) - - -def _is_cloud_client(existing_modules: List[module.Module]) -> bool: - proto_modules_len = 0 - grpc_modules_len = 0 - for artifact in existing_modules: - if artifact.startswith("proto-"): - proto_modules_len += 1 - if artifact.startswith("grpc-"): - grpc_modules_len += 1 - return proto_modules_len > 0 or grpc_modules_len > 0 - - -def update_cloud_pom( - filename: str, proto_modules: List[module.Module], grpc_modules: List[module.Module] -): - tree = etree.parse(filename) - root = tree.getroot() - dependencies = root.find("{http://maven.apache.org/POM/4.0.0}dependencies") - - existing_dependencies = [ - m.find("{http://maven.apache.org/POM/4.0.0}artifactId").text - for m in dependencies - if m.find("{http://maven.apache.org/POM/4.0.0}artifactId") is not None - ] - - try: - grpc_index = _find_dependency_index( - dependencies, "com.google.api.grpc", "grpc-" - ) - except StopIteration: - grpc_index = _find_dependency_index(dependencies, "junit", "junit") - # insert grpc dependencies after junit - for m in grpc_modules: - if m.artifact_id not in existing_dependencies: - print(f"adding new test dependency {m.artifact_id}") - new_dependency = etree.Element( - "{http://maven.apache.org/POM/4.0.0}dependency" - ) - new_dependency.tail = "\n " - new_dependency.text = "\n " - new_group = etree.Element("{http://maven.apache.org/POM/4.0.0}groupId") - new_group.text = m.group_id - new_group.tail = "\n " - new_artifact = etree.Element( - "{http://maven.apache.org/POM/4.0.0}artifactId" - ) - new_artifact.text = m.artifact_id - new_artifact.tail = "\n " - new_scope = etree.Element("{http://maven.apache.org/POM/4.0.0}scope") - new_scope.text = "test" - new_scope.tail = "\n " - new_dependency.append(new_group) - new_dependency.append(new_artifact) - new_dependency.append(new_scope) - dependencies.insert(grpc_index + 1, new_dependency) - - try: - proto_index = _find_dependency_index( - dependencies, "com.google.api.grpc", "proto-" - ) - except StopIteration: - print("after protobuf") - proto_index = _find_dependency_index( - dependencies, "com.google.protobuf", "protobuf-java" - ) - # insert proto dependencies after protobuf-java - for m in proto_modules: - if m.artifact_id not in existing_dependencies: - if re.match(r"proto-.*-v\d+.*", m.artifact_id): - print(f"adding new dependency {m.artifact_id}") - new_dependency = etree.Element( - "{http://maven.apache.org/POM/4.0.0}dependency" - ) - new_dependency.tail = "\n " - new_dependency.text = "\n " - new_group = etree.Element("{http://maven.apache.org/POM/4.0.0}groupId") - new_group.text = m.group_id - new_group.tail = "\n " - new_artifact = etree.Element( - "{http://maven.apache.org/POM/4.0.0}artifactId" - ) - new_artifact.text = m.artifact_id - new_artifact.tail = "\n " - new_dependency.append(new_group) - new_dependency.append(new_artifact) - dependencies.insert(proto_index + 1, new_dependency) - - tree.write(filename, pretty_print=True, xml_declaration=True, encoding="utf-8") - - -def update_parent_pom(filename: str, modules: List[module.Module]): - tree = etree.parse(filename) - root = tree.getroot() - - # BEGIN: update modules - existing = root.find("{http://maven.apache.org/POM/4.0.0}modules") - - module_names = [m.artifact_id for m in modules] - extra_modules = [ - m.text for i, m in enumerate(existing) if m.text not in module_names - ] - - modules_to_write = module_names + extra_modules - num_modules = len(modules_to_write) - - existing.clear() - existing.text = "\n " - for index, m in enumerate(modules_to_write): - new_module = etree.Element("{http://maven.apache.org/POM/4.0.0}module") - new_module.text = m - if index == num_modules - 1: - new_module.tail = "\n " - else: - new_module.tail = "\n " - existing.append(new_module) - - existing.tail = "\n\n " - # END: update modules - - # BEGIN: update versions in dependencyManagement - dependencies = root.find( - "{http://maven.apache.org/POM/4.0.0}dependencyManagement" - ).find("{http://maven.apache.org/POM/4.0.0}dependencies") - - existing_dependencies = [ - m.find("{http://maven.apache.org/POM/4.0.0}artifactId").text - for m in dependencies - if m.find("{http://maven.apache.org/POM/4.0.0}artifactId") is not None - ] - insert_index = 1 - - num_modules = len(modules) - - for index, m in enumerate(modules): - if m.artifact_id in existing_dependencies: - continue - - new_dependency = etree.Element("{http://maven.apache.org/POM/4.0.0}dependency") - new_dependency.tail = "\n " - new_dependency.text = "\n " - new_group = etree.Element("{http://maven.apache.org/POM/4.0.0}groupId") - new_group.text = m.group_id - new_group.tail = "\n " - new_artifact = etree.Element("{http://maven.apache.org/POM/4.0.0}artifactId") - new_artifact.text = m.artifact_id - new_artifact.tail = "\n " - new_version = etree.Element("{http://maven.apache.org/POM/4.0.0}version") - new_version.text = m.version - comment = etree.Comment(" {x-version-update:" + m.artifact_id + ":current} ") - comment.tail = "\n " - new_dependency.append(new_group) - new_dependency.append(new_artifact) - new_dependency.append(new_version) - new_dependency.append(comment) - new_dependency.tail = "\n " - dependencies.insert(1, new_dependency) - - # END: update versions in dependencyManagement - - tree.write(filename, pretty_print=True, xml_declaration=True, encoding="utf-8") - - -def update_bom_pom(filename: str, modules: List[module.Module]): - tree = etree.parse(filename) - root = tree.getroot() - existing = root.find( - "{http://maven.apache.org/POM/4.0.0}dependencyManagement" - ).find("{http://maven.apache.org/POM/4.0.0}dependencies") - - num_modules = len(modules) - - existing.clear() - existing.text = "\n " - for index, m in enumerate(modules): - new_dependency = etree.Element("{http://maven.apache.org/POM/4.0.0}dependency") - new_dependency.tail = "\n " - new_dependency.text = "\n " - new_group = etree.Element("{http://maven.apache.org/POM/4.0.0}groupId") - new_group.text = m.group_id - new_group.tail = "\n " - new_artifact = etree.Element("{http://maven.apache.org/POM/4.0.0}artifactId") - new_artifact.text = m.artifact_id - new_artifact.tail = "\n " - new_version = etree.Element("{http://maven.apache.org/POM/4.0.0}version") - new_version.text = m.version - comment = etree.Comment(" {x-version-update:" + m.artifact_id + ":current} ") - comment.tail = "\n " - new_dependency.append(new_group) - new_dependency.append(new_artifact) - new_dependency.append(new_version) - new_dependency.append(comment) - - if index == num_modules - 1: - new_dependency.tail = "\n " - else: - new_dependency.tail = "\n " - existing.append(new_dependency) - - existing.tail = "\n " - - tree.write(filename, pretty_print=True, xml_declaration=True, encoding="utf-8") - - -# When generating non-cloud client library, the group id of proto/grpc artifacts -# is prefixed with `{main_artifact_group_id}.api.grpc`, rather than -# `com.google.api.grpc`. -# https://github.com/googleapis/google-cloud-java/issues/9125 -# However, some exceptions are com.google.area120 and com.google.analytics. -# https://github.com/googleapis/google-cloud-java/issues/9304 -def _proto_group_id(main_artifact_group_id: str) -> str: - prefix = "com.google" - list_of_group_id = ["com.google.cloud", - "com.google.area120", - "com.google.analytics"] - if main_artifact_group_id not in list_of_group_id: - prefix = main_artifact_group_id - return f"{prefix}.api.grpc" - - -def main(): - print(f"working directory: {os.getcwd()}") - with open(".repo-metadata.json", "r") as fp: - repo_metadata = json.load(fp) - group_id, artifact_id = repo_metadata["distribution_name"].split(":") - name = repo_metadata["name_pretty"] - existing_modules = load_versions("versions.txt", group_id) - monorepo = False - if not existing_modules: - # For single-component Release Please setup, the root versions.txt - # manages the versions of all submodules. - existing_modules = load_versions("../versions.txt", group_id) - if existing_modules: - monorepo = True - print(f"monorepo? {monorepo}") - - # extra modules that need to be manages in versions.txt - if "extra_versioned_modules" in repo_metadata: - extra_managed_modules = repo_metadata["extra_versioned_modules"].split(",") - else: - extra_managed_modules = "" - - # list of modules to be excluded from added to poms - if "excluded_dependencies" in repo_metadata: - excluded_dependencies_list = repo_metadata["excluded_dependencies"].split(",") - else: - excluded_dependencies_list = "" - - # list of poms that have to be excluded from post processing - if "excluded_poms" in repo_metadata: - excluded_poms_list = repo_metadata["excluded_poms"].split(",") - else: - excluded_poms_list = "" - - # Missing Case 1: When this library ('java-XXX' module) is new. - if artifact_id not in existing_modules: - existing_modules[artifact_id] = module.Module( - group_id=group_id, - artifact_id=artifact_id, - version="0.0.1-SNAPSHOT", - release_version="0.0.0", - ) - main_module = existing_modules[artifact_id] - - # Artifact ID is part of distribution name field in .repo-metadata.json - if artifact_id in ["grafeas", "google-cloud-dns", - "google-cloud-notification", "google-iam-policy"]: - # There are special libraries that are not automatically generated - print(f"Skipping a special case library {artifact_id} that do not have " - " the standard module structure.") - return - - parent_artifact_id = f"{artifact_id}-parent" - - if parent_artifact_id not in existing_modules: - existing_modules[parent_artifact_id] = module.Module( - group_id=group_id, - artifact_id=parent_artifact_id, - version=main_module.version, - release_version=main_module.release_version, - ) - parent_module = existing_modules[parent_artifact_id] - - required_dependencies = {} - for dependency_module in existing_modules: - if dependency_module in excluded_dependencies_list: - continue - dep_artifact_id = existing_modules[dependency_module].artifact_id - if monorepo and not os.path.isdir(dep_artifact_id): - # In monorepo, existing_modules are loaded from the root - # versions.txt and thus includes irrelevant artifacts - continue - required_dependencies[dependency_module] = existing_modules[dependency_module] - - # Missing Case 2: There's a new proto-XXX and grpc-XXX directory. It's a new - # version in the proto file to a library. Both a new library and existing - # library. - for path in glob.glob("proto-google-*"): - if not path in existing_modules: - existing_modules[path] = module.Module( - group_id=_proto_group_id(group_id), - artifact_id=path, - version=main_module.version, - release_version=main_module.release_version, - ) - if path not in excluded_dependencies_list \ - and path not in main_module.artifact_id: - required_dependencies[path] = module.Module( - group_id=_proto_group_id(group_id), - artifact_id=path, - version=main_module.version, - release_version=main_module.release_version, - ) - if not os.path.isfile(f"{path}/pom.xml"): - print(f"creating missing proto pom: {path}") - templates.render( - template_name="proto_pom.xml.j2", - output_name=f"{path}/pom.xml", - module=required_dependencies[path], - parent_module=parent_module, - main_module=main_module, - ) - if path not in excluded_dependencies_list \ - and path not in main_module.artifact_id: - required_dependencies[path] = module.Module( - group_id=_proto_group_id(group_id), - artifact_id=path, - version=main_module.version, - release_version=main_module.release_version, - ) - - for path in glob.glob("grpc-google-*"): - if not path in existing_modules: - existing_modules[path] = module.Module( - group_id=_proto_group_id(group_id), - artifact_id=path, - version=main_module.version, - release_version=main_module.release_version, - ) - if path not in excluded_dependencies_list \ - and path not in main_module.artifact_id: - required_dependencies[path] = module.Module( - group_id=_proto_group_id(group_id), - artifact_id=path, - version=main_module.version, - release_version=main_module.release_version, - ) - - if not os.path.isfile(f"{path}/pom.xml"): - proto_artifact_id = path.replace("grpc-", "proto-") - print(f"creating missing grpc pom: {path}") - templates.render( - template_name="grpc_pom.xml.j2", - output_name=f"{path}/pom.xml", - module=required_dependencies[path], - parent_module=parent_module, - main_module=main_module, - proto_module=existing_modules[proto_artifact_id], - ) - if path not in excluded_dependencies_list \ - and path not in main_module.artifact_id: - required_dependencies[path] = module.Module( - group_id=_proto_group_id(group_id), - artifact_id=path, - version=main_module.version, - release_version=main_module.release_version, - ) - proto_modules = [ - module - for module in required_dependencies.values() - if module.artifact_id.startswith("proto-") - and module.artifact_id not in parent_artifact_id - ] - grpc_modules = [ - module - for module in required_dependencies.values() - if module.artifact_id.startswith("grpc-") \ - and module.artifact_id not in parent_artifact_id - ] - if main_module in grpc_modules or main_module in proto_modules: - modules = grpc_modules + proto_modules - else: - modules = [main_module] + grpc_modules + proto_modules - - if not _is_cloud_client(existing_modules): - print("no proto or grpc modules - probably not a cloud client") - return - - if os.path.isfile(f"{artifact_id}/pom.xml"): - print("updating modules in cloud pom.xml") - if artifact_id not in excluded_poms_list: - update_cloud_pom(f"{artifact_id}/pom.xml", proto_modules, grpc_modules) - elif artifact_id not in excluded_poms_list: - print("creating missing cloud pom.xml") - templates.render( - template_name="cloud_pom.xml.j2", - output_name=f"{artifact_id}/pom.xml", - module=main_module, - parent_module=parent_module, - repo=repo_metadata["repo"], - name=name, - description=repo_metadata["api_description"], - proto_modules=proto_modules, - grpc_modules=grpc_modules, - ) - - if os.path.isfile(f"{artifact_id}-bom/pom.xml"): - print("updating modules in bom pom.xml") - if artifact_id+"-bom" not in excluded_poms_list: - update_bom_pom(f"{artifact_id}-bom/pom.xml", modules) - elif artifact_id+"-bom" not in excluded_poms_list: - print("creating missing bom pom.xml") - templates.render( - template_name="bom_pom.xml.j2", - output_name=f"{artifact_id}-bom/pom.xml", - repo=repo_metadata["repo"], - name=name, - modules=modules, - main_module=main_module, - ) - - if os.path.isfile("pom.xml"): - print("updating modules in parent pom.xml") - update_parent_pom("pom.xml", modules) - else: - print("creating missing parent pom.xml") - templates.render( - template_name="parent_pom.xml.j2", - output_name="./pom.xml", - repo=repo_metadata["repo"], - modules=modules, - main_module=main_module, - name=name, - ) - - # For monorepo, we use the versions.txt at the root. The "./" is needed - # for the templates.render(), which tries to create a directory. - versions_txt_file = "../versions.txt" if monorepo else "./versions.txt" - print(f"updating modules in {versions_txt_file}") - existing_modules.pop(parent_artifact_id) - - # add extra modules to versions.txt - for dependency_module in extra_managed_modules: - if dependency_module not in existing_modules: - existing_modules[dependency_module] = module.Module( - group_id=_proto_group_id(group_id), - artifact_id=dependency_module, - version=main_module.version, - release_version=main_module.release_version, - ) - templates.render( - template_name="versions.txt.j2", output_name=versions_txt_file, modules=existing_modules.values(), - ) - - -if __name__ == "__main__": - main() diff --git a/docker/owlbot/java/src/gen-template.py b/docker/owlbot/java/src/gen-template.py deleted file mode 100644 index 95334b963..000000000 --- a/docker/owlbot/java/src/gen-template.py +++ /dev/null @@ -1,81 +0,0 @@ -# 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. -# You may obtain a copy of the License at -# -# https://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. - -import glob -import json -from typing import List -import os -from pathlib import Path - -import click -import jinja2 - - -@click.command() -@click.option( - "--folder", help="Path to folder of templates", -) -@click.option("--file", help="Path to template file") -@click.option( - "--data", - help="Path to JSON file with template values", - multiple=True, - required=True, -) -@click.option( - "--output", help="Path to output", default=".", -) -def main(folder: str, file: str, data: List[str], output: str): - """Generate templates""" - variables = {} - for data_file in data: - with open(data_file, "r") as fp: - variables = {**variables, **json.load(fp)} - - if folder is not None: - location = Path(folder) - filenames = glob.glob(f"{folder}/**/*.j2", recursive=True) - elif file is not None: - location = Path(file).parent - filenames = [f"{file}.j2"] - else: - raise Exception("Need to specify either folder or file") - - output_path = Path(output) - - env = jinja2.Environment( - loader=jinja2.FileSystemLoader(str(location)), - autoescape=False, - keep_trailing_newline=True, - ) - - for filename in filenames: - template_name = Path(filename).relative_to(location) - template = env.get_template(str(template_name)) - output = template.stream(**variables) - - destination = output_path / os.path.splitext(template_name)[0] - destination.parent.mkdir(parents=True, exist_ok=True) - - with destination.open("w") as fp: - output.dump(fp) - - # Copy file mode over - source_path = Path(template.filename) - mode = source_path.stat().st_mode - destination.chmod(mode) - - -if __name__ == "__main__": - main() diff --git a/docker/owlbot/java/src/poms/module.py b/docker/owlbot/java/src/poms/module.py deleted file mode 100644 index c8cc15984..000000000 --- a/docker/owlbot/java/src/poms/module.py +++ /dev/null @@ -1,50 +0,0 @@ -# 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. -# 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. - -import attr -from lxml import etree -import os -from typing import List, Optional - - -@attr.s(auto_attribs=True) -class Module: - group_id: str - artifact_id: str - version: str - release_version: Optional[str] - - -def read_module(pom: str) -> Module: - tree = etree.parse(pom) - artifact_id = tree.find("{http://maven.apache.org/POM/4.0.0}artifactId").text - version = tree.find("{http://maven.apache.org/POM/4.0.0}version").text - group_id = ( - "com.google.cloud" - if artifact_id.startswith("google-cloud") - else "com.google.api.grpc" - ) - return Module(group_id=group_id, artifact_id=artifact_id, version=version,) - - -def read_modules(service: str) -> List[Module]: - thedir = f"workspace/java-{service}/" - modules = [] - for name in os.listdir(thedir): - dir = os.path.join(thedir, name) - pom = os.path.join(dir, "pom.xml") - if os.path.exists(pom): - modules.append(read_module(pom)) - - return modules diff --git a/docker/owlbot/java/src/poms/templates.py b/docker/owlbot/java/src/poms/templates.py deleted file mode 100644 index 287c40938..000000000 --- a/docker/owlbot/java/src/poms/templates.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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. -# 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. - -from jinja2 import Environment, FileSystemLoader -import os -import pathlib -from typing import List - -root_directory = pathlib.Path( - os.path.realpath(os.path.dirname(os.path.realpath(__file__))) -).parent.parent -print(root_directory) -jinja_env = Environment( - loader=FileSystemLoader(str(root_directory / "templates" / "poms")), - keep_trailing_newline=True, -) - - -def render(template_name: str, output_name: str, **kwargs): - template = jinja_env.get_template(template_name) - t = template.stream(kwargs) - directory = os.path.dirname(output_name) - if not os.path.isdir(directory): - os.makedirs(directory) - t.dump(str(output_name)) diff --git a/docker/owlbot/java/src/requirements.in b/docker/owlbot/java/src/requirements.in deleted file mode 100644 index 1dbbb3c66..000000000 --- a/docker/owlbot/java/src/requirements.in +++ /dev/null @@ -1,11 +0,0 @@ -attrs -click -jinja2 -lxml -typing -markupsafe -colorlog -protobuf -watchdog -requests -pyyaml \ No newline at end of file diff --git a/docker/owlbot/java/src/requirements.txt b/docker/owlbot/java/src/requirements.txt deleted file mode 100644 index 3654ac812..000000000 --- a/docker/owlbot/java/src/requirements.txt +++ /dev/null @@ -1,442 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --generate-hashes requirements.in -# -attrs==23.2.0 \ - --hash=sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 \ - --hash=sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1 - # via -r requirements.in -certifi==2024.7.4 \ - --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \ - --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90 - # via requests -charset-normalizer==3.3.2 \ - --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \ - --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \ - --hash=sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786 \ - --hash=sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8 \ - --hash=sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09 \ - --hash=sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185 \ - --hash=sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574 \ - --hash=sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e \ - --hash=sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519 \ - --hash=sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898 \ - --hash=sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269 \ - --hash=sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3 \ - --hash=sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f \ - --hash=sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6 \ - --hash=sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8 \ - --hash=sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a \ - --hash=sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73 \ - --hash=sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc \ - --hash=sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714 \ - --hash=sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2 \ - --hash=sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc \ - --hash=sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce \ - --hash=sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d \ - --hash=sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e \ - --hash=sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6 \ - --hash=sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269 \ - --hash=sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96 \ - --hash=sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d \ - --hash=sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a \ - --hash=sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4 \ - --hash=sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77 \ - --hash=sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d \ - --hash=sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0 \ - --hash=sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed \ - --hash=sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068 \ - --hash=sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac \ - --hash=sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25 \ - --hash=sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 \ - --hash=sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab \ - --hash=sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26 \ - --hash=sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2 \ - --hash=sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db \ - --hash=sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f \ - --hash=sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5 \ - --hash=sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99 \ - --hash=sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c \ - --hash=sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d \ - --hash=sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811 \ - --hash=sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa \ - --hash=sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a \ - --hash=sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03 \ - --hash=sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b \ - --hash=sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04 \ - --hash=sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c \ - --hash=sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001 \ - --hash=sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458 \ - --hash=sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389 \ - --hash=sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99 \ - --hash=sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985 \ - --hash=sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537 \ - --hash=sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238 \ - --hash=sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f \ - --hash=sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d \ - --hash=sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796 \ - --hash=sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a \ - --hash=sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143 \ - --hash=sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8 \ - --hash=sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c \ - --hash=sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5 \ - --hash=sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5 \ - --hash=sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711 \ - --hash=sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4 \ - --hash=sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6 \ - --hash=sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c \ - --hash=sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7 \ - --hash=sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4 \ - --hash=sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b \ - --hash=sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae \ - --hash=sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12 \ - --hash=sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c \ - --hash=sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae \ - --hash=sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8 \ - --hash=sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887 \ - --hash=sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b \ - --hash=sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4 \ - --hash=sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f \ - --hash=sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5 \ - --hash=sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33 \ - --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \ - --hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561 - # via requests -click==8.1.7 \ - --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \ - --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de - # via -r requirements.in -colorlog==6.8.2 \ - --hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \ - --hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33 - # via -r requirements.in -idna==3.7 \ - --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ - --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 - # via requests -jinja2==3.1.4 \ - --hash=sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 \ - --hash=sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d - # via -r requirements.in -lxml==5.2.2 \ - --hash=sha256:02437fb7308386867c8b7b0e5bc4cd4b04548b1c5d089ffb8e7b31009b961dc3 \ - --hash=sha256:02f6a8eb6512fdc2fd4ca10a49c341c4e109aa6e9448cc4859af5b949622715a \ - --hash=sha256:05f8757b03208c3f50097761be2dea0aba02e94f0dc7023ed73a7bb14ff11eb0 \ - --hash=sha256:06668e39e1f3c065349c51ac27ae430719d7806c026fec462e5693b08b95696b \ - --hash=sha256:07542787f86112d46d07d4f3c4e7c760282011b354d012dc4141cc12a68cef5f \ - --hash=sha256:08ea0f606808354eb8f2dfaac095963cb25d9d28e27edcc375d7b30ab01abbf6 \ - --hash=sha256:0969e92af09c5687d769731e3f39ed62427cc72176cebb54b7a9d52cc4fa3b73 \ - --hash=sha256:0a028b61a2e357ace98b1615fc03f76eb517cc028993964fe08ad514b1e8892d \ - --hash=sha256:0b3f5016e00ae7630a4b83d0868fca1e3d494c78a75b1c7252606a3a1c5fc2ad \ - --hash=sha256:13e69be35391ce72712184f69000cda04fc89689429179bc4c0ae5f0b7a8c21b \ - --hash=sha256:16a8326e51fcdffc886294c1e70b11ddccec836516a343f9ed0f82aac043c24a \ - --hash=sha256:19b4e485cd07b7d83e3fe3b72132e7df70bfac22b14fe4bf7a23822c3a35bff5 \ - --hash=sha256:1a2569a1f15ae6c8c64108a2cd2b4a858fc1e13d25846be0666fc144715e32ab \ - --hash=sha256:1a7aca7964ac4bb07680d5c9d63b9d7028cace3e2d43175cb50bba8c5ad33316 \ - --hash=sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6 \ - --hash=sha256:1d8a701774dfc42a2f0b8ccdfe7dbc140500d1049e0632a611985d943fcf12df \ - --hash=sha256:1e275ea572389e41e8b039ac076a46cb87ee6b8542df3fff26f5baab43713bca \ - --hash=sha256:2304d3c93f2258ccf2cf7a6ba8c761d76ef84948d87bf9664e14d203da2cd264 \ - --hash=sha256:23441e2b5339bc54dc949e9e675fa35efe858108404ef9aa92f0456929ef6fe8 \ - --hash=sha256:23cfafd56887eaed93d07bc4547abd5e09d837a002b791e9767765492a75883f \ - --hash=sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b \ - --hash=sha256:2eb2227ce1ff998faf0cd7fe85bbf086aa41dfc5af3b1d80867ecfe75fb68df3 \ - --hash=sha256:2fb0ba3e8566548d6c8e7dd82a8229ff47bd8fb8c2da237607ac8e5a1b8312e5 \ - --hash=sha256:303f540ad2dddd35b92415b74b900c749ec2010e703ab3bfd6660979d01fd4ed \ - --hash=sha256:339ee4a4704bc724757cd5dd9dc8cf4d00980f5d3e6e06d5847c1b594ace68ab \ - --hash=sha256:33ce9e786753743159799fdf8e92a5da351158c4bfb6f2db0bf31e7892a1feb5 \ - --hash=sha256:343ab62e9ca78094f2306aefed67dcfad61c4683f87eee48ff2fd74902447726 \ - --hash=sha256:34e17913c431f5ae01d8658dbf792fdc457073dcdfbb31dc0cc6ab256e664a8d \ - --hash=sha256:364d03207f3e603922d0d3932ef363d55bbf48e3647395765f9bfcbdf6d23632 \ - --hash=sha256:38b67afb0a06b8575948641c1d6d68e41b83a3abeae2ca9eed2ac59892b36706 \ - --hash=sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8 \ - --hash=sha256:3b019d4ee84b683342af793b56bb35034bd749e4cbdd3d33f7d1107790f8c472 \ - --hash=sha256:3b6a30a9ab040b3f545b697cb3adbf3696c05a3a68aad172e3fd7ca73ab3c835 \ - --hash=sha256:3d1e35572a56941b32c239774d7e9ad724074d37f90c7a7d499ab98761bd80cf \ - --hash=sha256:3d98de734abee23e61f6b8c2e08a88453ada7d6486dc7cdc82922a03968928db \ - --hash=sha256:453d037e09a5176d92ec0fd282e934ed26d806331a8b70ab431a81e2fbabf56d \ - --hash=sha256:45f9494613160d0405682f9eee781c7e6d1bf45f819654eb249f8f46a2c22545 \ - --hash=sha256:4820c02195d6dfb7b8508ff276752f6b2ff8b64ae5d13ebe02e7667e035000b9 \ - --hash=sha256:49095a38eb333aaf44c06052fd2ec3b8f23e19747ca7ec6f6c954ffea6dbf7be \ - --hash=sha256:4aefd911793b5d2d7a921233a54c90329bf3d4a6817dc465f12ffdfe4fc7b8fe \ - --hash=sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905 \ - --hash=sha256:4c30a2f83677876465f44c018830f608fa3c6a8a466eb223535035fbc16f3438 \ - --hash=sha256:50127c186f191b8917ea2fb8b206fbebe87fd414a6084d15568c27d0a21d60db \ - --hash=sha256:50ccb5d355961c0f12f6cf24b7187dbabd5433f29e15147a67995474f27d1776 \ - --hash=sha256:519895c99c815a1a24a926d5b60627ce5ea48e9f639a5cd328bda0515ea0f10c \ - --hash=sha256:54401c77a63cc7d6dc4b4e173bb484f28a5607f3df71484709fe037c92d4f0ed \ - --hash=sha256:546cf886f6242dff9ec206331209db9c8e1643ae642dea5fdbecae2453cb50fd \ - --hash=sha256:55ce6b6d803890bd3cc89975fca9de1dff39729b43b73cb15ddd933b8bc20484 \ - --hash=sha256:56793b7a1a091a7c286b5f4aa1fe4ae5d1446fe742d00cdf2ffb1077865db10d \ - --hash=sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6 \ - --hash=sha256:5b8c041b6265e08eac8a724b74b655404070b636a8dd6d7a13c3adc07882ef30 \ - --hash=sha256:5e097646944b66207023bc3c634827de858aebc226d5d4d6d16f0b77566ea182 \ - --hash=sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61 \ - --hash=sha256:610b5c77428a50269f38a534057444c249976433f40f53e3b47e68349cca1425 \ - --hash=sha256:625e3ef310e7fa3a761d48ca7ea1f9d8718a32b1542e727d584d82f4453d5eeb \ - --hash=sha256:657a972f46bbefdbba2d4f14413c0d079f9ae243bd68193cb5061b9732fa54c1 \ - --hash=sha256:69ab77a1373f1e7563e0fb5a29a8440367dec051da6c7405333699d07444f511 \ - --hash=sha256:6a520b4f9974b0a0a6ed73c2154de57cdfd0c8800f4f15ab2b73238ffed0b36e \ - --hash=sha256:6d68ce8e7b2075390e8ac1e1d3a99e8b6372c694bbe612632606d1d546794207 \ - --hash=sha256:6dcc3d17eac1df7859ae01202e9bb11ffa8c98949dcbeb1069c8b9a75917e01b \ - --hash=sha256:6dfdc2bfe69e9adf0df4915949c22a25b39d175d599bf98e7ddf620a13678585 \ - --hash=sha256:739e36ef7412b2bd940f75b278749106e6d025e40027c0b94a17ef7968d55d56 \ - --hash=sha256:7429e7faa1a60cad26ae4227f4dd0459efde239e494c7312624ce228e04f6391 \ - --hash=sha256:74da9f97daec6928567b48c90ea2c82a106b2d500f397eeb8941e47d30b1ca85 \ - --hash=sha256:74e4f025ef3db1c6da4460dd27c118d8cd136d0391da4e387a15e48e5c975147 \ - --hash=sha256:75a9632f1d4f698b2e6e2e1ada40e71f369b15d69baddb8968dcc8e683839b18 \ - --hash=sha256:76acba4c66c47d27c8365e7c10b3d8016a7da83d3191d053a58382311a8bf4e1 \ - --hash=sha256:79d1fb9252e7e2cfe4de6e9a6610c7cbb99b9708e2c3e29057f487de5a9eaefa \ - --hash=sha256:7ce7ad8abebe737ad6143d9d3bf94b88b93365ea30a5b81f6877ec9c0dee0a48 \ - --hash=sha256:7ed07b3062b055d7a7f9d6557a251cc655eed0b3152b76de619516621c56f5d3 \ - --hash=sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184 \ - --hash=sha256:8268cbcd48c5375f46e000adb1390572c98879eb4f77910c6053d25cc3ac2c67 \ - --hash=sha256:875a3f90d7eb5c5d77e529080d95140eacb3c6d13ad5b616ee8095447b1d22e7 \ - --hash=sha256:89feb82ca055af0fe797a2323ec9043b26bc371365847dbe83c7fd2e2f181c34 \ - --hash=sha256:8a7e24cb69ee5f32e003f50e016d5fde438010c1022c96738b04fc2423e61706 \ - --hash=sha256:8ab6a358d1286498d80fe67bd3d69fcbc7d1359b45b41e74c4a26964ca99c3f8 \ - --hash=sha256:8b8df03a9e995b6211dafa63b32f9d405881518ff1ddd775db4e7b98fb545e1c \ - --hash=sha256:8cf85a6e40ff1f37fe0f25719aadf443686b1ac7652593dc53c7ef9b8492b115 \ - --hash=sha256:8e8d351ff44c1638cb6e980623d517abd9f580d2e53bfcd18d8941c052a5a009 \ - --hash=sha256:9164361769b6ca7769079f4d426a41df6164879f7f3568be9086e15baca61466 \ - --hash=sha256:96e85aa09274955bb6bd483eaf5b12abadade01010478154b0ec70284c1b1526 \ - --hash=sha256:981a06a3076997adf7c743dcd0d7a0415582661e2517c7d961493572e909aa1d \ - --hash=sha256:9cd5323344d8ebb9fb5e96da5de5ad4ebab993bbf51674259dbe9d7a18049525 \ - --hash=sha256:9d6c6ea6a11ca0ff9cd0390b885984ed31157c168565702959c25e2191674a14 \ - --hash=sha256:a02d3c48f9bb1e10c7788d92c0c7db6f2002d024ab6e74d6f45ae33e3d0288a3 \ - --hash=sha256:a233bb68625a85126ac9f1fc66d24337d6e8a0f9207b688eec2e7c880f012ec0 \ - --hash=sha256:a2f6a1bc2460e643785a2cde17293bd7a8f990884b822f7bca47bee0a82fc66b \ - --hash=sha256:a6d17e0370d2516d5bb9062c7b4cb731cff921fc875644c3d751ad857ba9c5b1 \ - --hash=sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f \ - --hash=sha256:ab67ed772c584b7ef2379797bf14b82df9aa5f7438c5b9a09624dd834c1c1aaf \ - --hash=sha256:ac6540c9fff6e3813d29d0403ee7a81897f1d8ecc09a8ff84d2eea70ede1cdbf \ - --hash=sha256:ae4073a60ab98529ab8a72ebf429f2a8cc612619a8c04e08bed27450d52103c0 \ - --hash=sha256:ae791f6bd43305aade8c0e22f816b34f3b72b6c820477aab4d18473a37e8090b \ - --hash=sha256:aef5474d913d3b05e613906ba4090433c515e13ea49c837aca18bde190853dff \ - --hash=sha256:b0b3f2df149efb242cee2ffdeb6674b7f30d23c9a7af26595099afaf46ef4e88 \ - --hash=sha256:b128092c927eaf485928cec0c28f6b8bead277e28acf56800e972aa2c2abd7a2 \ - --hash=sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40 \ - --hash=sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716 \ - --hash=sha256:b47633251727c8fe279f34025844b3b3a3e40cd1b198356d003aa146258d13a2 \ - --hash=sha256:b537bd04d7ccd7c6350cdaaaad911f6312cbd61e6e6045542f781c7f8b2e99d2 \ - --hash=sha256:b5e4ef22ff25bfd4ede5f8fb30f7b24446345f3e79d9b7455aef2836437bc38a \ - --hash=sha256:b74b9ea10063efb77a965a8d5f4182806fbf59ed068b3c3fd6f30d2ac7bee734 \ - --hash=sha256:bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87 \ - --hash=sha256:bbc4b80af581e18568ff07f6395c02114d05f4865c2812a1f02f2eaecf0bfd48 \ - --hash=sha256:bcc98f911f10278d1daf14b87d65325851a1d29153caaf146877ec37031d5f36 \ - --hash=sha256:be49ad33819d7dcc28a309b86d4ed98e1a65f3075c6acd3cd4fe32103235222b \ - --hash=sha256:bec4bd9133420c5c52d562469c754f27c5c9e36ee06abc169612c959bd7dbb07 \ - --hash=sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c \ - --hash=sha256:c689d0d5381f56de7bd6966a4541bff6e08bf8d3871bbd89a0c6ab18aa699573 \ - --hash=sha256:c7079d5eb1c1315a858bbf180000757db8ad904a89476653232db835c3114001 \ - --hash=sha256:cb3942960f0beb9f46e2a71a3aca220d1ca32feb5a398656be934320804c0df9 \ - --hash=sha256:cd9e78285da6c9ba2d5c769628f43ef66d96ac3085e59b10ad4f3707980710d3 \ - --hash=sha256:cf2a978c795b54c539f47964ec05e35c05bd045db5ca1e8366988c7f2fe6b3ce \ - --hash=sha256:d14a0d029a4e176795cef99c056d58067c06195e0c7e2dbb293bf95c08f772a3 \ - --hash=sha256:d237ba6664b8e60fd90b8549a149a74fcc675272e0e95539a00522e4ca688b04 \ - --hash=sha256:d26a618ae1766279f2660aca0081b2220aca6bd1aa06b2cf73f07383faf48927 \ - --hash=sha256:d28cb356f119a437cc58a13f8135ab8a4c8ece18159eb9194b0d269ec4e28083 \ - --hash=sha256:d4ed0c7cbecde7194cd3228c044e86bf73e30a23505af852857c09c24e77ec5d \ - --hash=sha256:d83e2d94b69bf31ead2fa45f0acdef0757fa0458a129734f59f67f3d2eb7ef32 \ - --hash=sha256:d8bbcd21769594dbba9c37d3c819e2d5847656ca99c747ddb31ac1701d0c0ed9 \ - --hash=sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f \ - --hash=sha256:dc911208b18842a3a57266d8e51fc3cfaccee90a5351b92079beed912a7914c2 \ - --hash=sha256:dfa7c241073d8f2b8e8dbc7803c434f57dbb83ae2a3d7892dd068d99e96efe2c \ - --hash=sha256:e282aedd63c639c07c3857097fc0e236f984ceb4089a8b284da1c526491e3f3d \ - --hash=sha256:e290d79a4107d7d794634ce3e985b9ae4f920380a813717adf61804904dc4393 \ - --hash=sha256:e3d9d13603410b72787579769469af730c38f2f25505573a5888a94b62b920f8 \ - --hash=sha256:e481bba1e11ba585fb06db666bfc23dbe181dbafc7b25776156120bf12e0d5a6 \ - --hash=sha256:e49b052b768bb74f58c7dda4e0bdf7b79d43a9204ca584ffe1fb48a6f3c84c66 \ - --hash=sha256:eb00b549b13bd6d884c863554566095bf6fa9c3cecb2e7b399c4bc7904cb33b5 \ - --hash=sha256:ec87c44f619380878bd49ca109669c9f221d9ae6883a5bcb3616785fa8f94c97 \ - --hash=sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196 \ - --hash=sha256:f11ae142f3a322d44513de1018b50f474f8f736bc3cd91d969f464b5bfef8836 \ - --hash=sha256:f2a09f6184f17a80897172863a655467da2b11151ec98ba8d7af89f17bf63dae \ - --hash=sha256:f5b65529bb2f21ac7861a0e94fdbf5dc0daab41497d18223b46ee8515e5ad297 \ - --hash=sha256:f60fdd125d85bf9c279ffb8e94c78c51b3b6a37711464e1f5f31078b45002421 \ - --hash=sha256:f61efaf4bed1cc0860e567d2ecb2363974d414f7f1f124b1df368bbf183453a6 \ - --hash=sha256:f90e552ecbad426eab352e7b2933091f2be77115bb16f09f78404861c8322981 \ - --hash=sha256:f956196ef61369f1685d14dad80611488d8dc1ef00be57c0c5a03064005b0f30 \ - --hash=sha256:fb91819461b1b56d06fa4bcf86617fac795f6a99d12239fb0c68dbeba41a0a30 \ - --hash=sha256:fbc9d316552f9ef7bba39f4edfad4a734d3d6f93341232a9dddadec4f15d425f \ - --hash=sha256:ff69a9a0b4b17d78170c73abe2ab12084bdf1691550c5629ad1fe7849433f324 \ - --hash=sha256:ffb2be176fed4457e445fe540617f0252a72a8bc56208fd65a690fdb1f57660b - # via -r requirements.in -markupsafe==2.1.5 \ - --hash=sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf \ - --hash=sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff \ - --hash=sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f \ - --hash=sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3 \ - --hash=sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532 \ - --hash=sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f \ - --hash=sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617 \ - --hash=sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df \ - --hash=sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4 \ - --hash=sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906 \ - --hash=sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f \ - --hash=sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4 \ - --hash=sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8 \ - --hash=sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371 \ - --hash=sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2 \ - --hash=sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465 \ - --hash=sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52 \ - --hash=sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6 \ - --hash=sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169 \ - --hash=sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad \ - --hash=sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2 \ - --hash=sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0 \ - --hash=sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029 \ - --hash=sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f \ - --hash=sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a \ - --hash=sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced \ - --hash=sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5 \ - --hash=sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c \ - --hash=sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf \ - --hash=sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9 \ - --hash=sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb \ - --hash=sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad \ - --hash=sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3 \ - --hash=sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1 \ - --hash=sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46 \ - --hash=sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc \ - --hash=sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a \ - --hash=sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee \ - --hash=sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900 \ - --hash=sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5 \ - --hash=sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea \ - --hash=sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f \ - --hash=sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5 \ - --hash=sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e \ - --hash=sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a \ - --hash=sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f \ - --hash=sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50 \ - --hash=sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a \ - --hash=sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b \ - --hash=sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4 \ - --hash=sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff \ - --hash=sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2 \ - --hash=sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46 \ - --hash=sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b \ - --hash=sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf \ - --hash=sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5 \ - --hash=sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5 \ - --hash=sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab \ - --hash=sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd \ - --hash=sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68 - # via - # -r requirements.in - # jinja2 -protobuf==5.27.3 \ - --hash=sha256:043853dcb55cc262bf2e116215ad43fa0859caab79bb0b2d31b708f128ece035 \ - --hash=sha256:16ddf3f8c6c41e1e803da7abea17b1793a97ef079a912e42351eabb19b2cffe7 \ - --hash=sha256:68248c60d53f6168f565a8c76dc58ba4fa2ade31c2d1ebdae6d80f969cdc2d4f \ - --hash=sha256:82460903e640f2b7e34ee81a947fdaad89de796d324bcbc38ff5430bcdead82c \ - --hash=sha256:8572c6533e544ebf6899c360e91d6bcbbee2549251643d32c52cf8a5de295ba5 \ - --hash=sha256:a55c48f2a2092d8e213bd143474df33a6ae751b781dd1d1f4d953c128a415b25 \ - --hash=sha256:af7c0b7cfbbb649ad26132e53faa348580f844d9ca46fd3ec7ca48a1ea5db8a1 \ - --hash=sha256:b8a994fb3d1c11156e7d1e427186662b64694a62b55936b2b9348f0a7c6625ce \ - --hash=sha256:c2a105c24f08b1e53d6c7ffe69cb09d0031512f0b72f812dd4005b8112dbe91e \ - --hash=sha256:c84eee2c71ed83704f1afbf1a85c3171eab0fd1ade3b399b3fad0884cbcca8bf \ - --hash=sha256:dcb307cd4ef8fec0cf52cb9105a03d06fbb5275ce6d84a6ae33bc6cf84e0a07b - # via -r requirements.in -pyyaml==6.0.1 \ - --hash=sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5 \ - --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \ - --hash=sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df \ - --hash=sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741 \ - --hash=sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206 \ - --hash=sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27 \ - --hash=sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595 \ - --hash=sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62 \ - --hash=sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98 \ - --hash=sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696 \ - --hash=sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290 \ - --hash=sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9 \ - --hash=sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d \ - --hash=sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6 \ - --hash=sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867 \ - --hash=sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47 \ - --hash=sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486 \ - --hash=sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6 \ - --hash=sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3 \ - --hash=sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007 \ - --hash=sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938 \ - --hash=sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0 \ - --hash=sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c \ - --hash=sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735 \ - --hash=sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d \ - --hash=sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28 \ - --hash=sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4 \ - --hash=sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba \ - --hash=sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8 \ - --hash=sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef \ - --hash=sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5 \ - --hash=sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd \ - --hash=sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3 \ - --hash=sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0 \ - --hash=sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515 \ - --hash=sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c \ - --hash=sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c \ - --hash=sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924 \ - --hash=sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34 \ - --hash=sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 \ - --hash=sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859 \ - --hash=sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673 \ - --hash=sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54 \ - --hash=sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a \ - --hash=sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b \ - --hash=sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab \ - --hash=sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa \ - --hash=sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c \ - --hash=sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585 \ - --hash=sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d \ - --hash=sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f - # via -r requirements.in -requests==2.32.3 \ - --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \ - --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6 - # via -r requirements.in -typing==3.7.4.3 \ - --hash=sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9 \ - --hash=sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5 - # via -r requirements.in -urllib3==2.2.2 \ - --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \ - --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168 - # via requests -watchdog==4.0.1 \ - --hash=sha256:0144c0ea9997b92615af1d94afc0c217e07ce2c14912c7b1a5731776329fcfc7 \ - --hash=sha256:03e70d2df2258fb6cb0e95bbdbe06c16e608af94a3ffbd2b90c3f1e83eb10767 \ - --hash=sha256:093b23e6906a8b97051191a4a0c73a77ecc958121d42346274c6af6520dec175 \ - --hash=sha256:123587af84260c991dc5f62a6e7ef3d1c57dfddc99faacee508c71d287248459 \ - --hash=sha256:17e32f147d8bf9657e0922c0940bcde863b894cd871dbb694beb6704cfbd2fb5 \ - --hash=sha256:206afc3d964f9a233e6ad34618ec60b9837d0582b500b63687e34011e15bb429 \ - --hash=sha256:4107ac5ab936a63952dea2a46a734a23230aa2f6f9db1291bf171dac3ebd53c6 \ - --hash=sha256:4513ec234c68b14d4161440e07f995f231be21a09329051e67a2118a7a612d2d \ - --hash=sha256:611be3904f9843f0529c35a3ff3fd617449463cb4b73b1633950b3d97fa4bfb7 \ - --hash=sha256:62c613ad689ddcb11707f030e722fa929f322ef7e4f18f5335d2b73c61a85c28 \ - --hash=sha256:667f3c579e813fcbad1b784db7a1aaa96524bed53437e119f6a2f5de4db04235 \ - --hash=sha256:6e8c70d2cd745daec2a08734d9f63092b793ad97612470a0ee4cbb8f5f705c57 \ - --hash=sha256:7577b3c43e5909623149f76b099ac49a1a01ca4e167d1785c76eb52fa585745a \ - --hash=sha256:998d2be6976a0ee3a81fb8e2777900c28641fb5bfbd0c84717d89bca0addcdc5 \ - --hash=sha256:a3c2c317a8fb53e5b3d25790553796105501a235343f5d2bf23bb8649c2c8709 \ - --hash=sha256:ab998f567ebdf6b1da7dc1e5accfaa7c6992244629c0fdaef062f43249bd8dee \ - --hash=sha256:ac7041b385f04c047fcc2951dc001671dee1b7e0615cde772e84b01fbf68ee84 \ - --hash=sha256:bca36be5707e81b9e6ce3208d92d95540d4ca244c006b61511753583c81c70dd \ - --hash=sha256:c9904904b6564d4ee8a1ed820db76185a3c96e05560c776c79a6ce5ab71888ba \ - --hash=sha256:cad0bbd66cd59fc474b4a4376bc5ac3fc698723510cbb64091c2a793b18654db \ - --hash=sha256:d10a681c9a1d5a77e75c48a3b8e1a9f2ae2928eda463e8d33660437705659682 \ - --hash=sha256:d4925e4bf7b9bddd1c3de13c9b8a2cdb89a468f640e66fbfabaf735bd85b3e35 \ - --hash=sha256:d7b9f5f3299e8dd230880b6c55504a1f69cf1e4316275d1b215ebdd8187ec88d \ - --hash=sha256:da2dfdaa8006eb6a71051795856bedd97e5b03e57da96f98e375682c48850645 \ - --hash=sha256:dddba7ca1c807045323b6af4ff80f5ddc4d654c8bce8317dde1bd96b128ed253 \ - --hash=sha256:e7921319fe4430b11278d924ef66d4daa469fafb1da679a2e48c935fa27af193 \ - --hash=sha256:e93f451f2dfa433d97765ca2634628b789b49ba8b504fdde5837cdcf25fdb53b \ - --hash=sha256:eebaacf674fa25511e8867028d281e602ee6500045b57f43b08778082f7f8b44 \ - --hash=sha256:ef0107bbb6a55f5be727cfc2ef945d5676b97bffb8425650dadbb184be9f9a2b \ - --hash=sha256:f0de0f284248ab40188f23380b03b59126d1479cd59940f2a34f8852db710625 \ - --hash=sha256:f27279d060e2ab24c0aa98363ff906d2386aa6c4dc2f1a374655d4e02a6c5e5e \ - --hash=sha256:f8affdf3c0f0466e69f5b3917cdd042f89c8c63aebdb9f7c078996f607cdb0f5 - # via -r requirements.in diff --git a/docker/owlbot/java/templates/clirr/clirr-ignored-differences.xml.j2 b/docker/owlbot/java/templates/clirr/clirr-ignored-differences.xml.j2 deleted file mode 100644 index 652898170..000000000 --- a/docker/owlbot/java/templates/clirr/clirr-ignored-differences.xml.j2 +++ /dev/null @@ -1,19 +0,0 @@ - - - -{% for proto_path in proto_paths %} - 7012 - {{proto_path}}/*OrBuilder - * get*(*) - - - 7012 - {{proto_path}}/*OrBuilder - boolean contains*(*) - - - 7012 - {{proto_path}}/*OrBuilder - boolean has*(*) - {% endfor %} - diff --git a/docker/owlbot/java/templates/poms/bom_pom.xml.j2 b/docker/owlbot/java/templates/poms/bom_pom.xml.j2 deleted file mode 100644 index 68f0f439e..000000000 --- a/docker/owlbot/java/templates/poms/bom_pom.xml.j2 +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - {{main_module.group_id}} - {{main_module.artifact_id}}-bom - {{main_module.version}} - pom - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - Google {{name}} BOM - https://github.com/{{repo}} - - BOM for {{name}} - - - - Google LLC - - - - - chingor13 - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - - scm:git:https://github.com/{{repo}}.git - scm:git:git@github.com:{{repo}}.git - https://github.com/{{repo}} - - - - true - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - {% for module in modules %} - - {{module.group_id}} - {{module.artifact_id}} - {{module.version}} - {% endfor %} - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - - - - - diff --git a/docker/owlbot/java/templates/poms/cloud_pom.xml.j2 b/docker/owlbot/java/templates/poms/cloud_pom.xml.j2 deleted file mode 100644 index a0f9a2480..000000000 --- a/docker/owlbot/java/templates/poms/cloud_pom.xml.j2 +++ /dev/null @@ -1,139 +0,0 @@ - - - 4.0.0 - {{module.group_id}} - {{module.artifact_id}} - {{module.version}} - jar - Google {{name}} - https://github.com/{{repo}} - {{name}} {{description}} - - {{parent_module.group_id}} - {{parent_module.artifact_id}} - {{parent_module.version}} - - - {{module.artifact_id}} - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.api - api-common - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - -{% for module in proto_modules %} - - {{module.group_id}} - {{module.artifact_id}} - {% endfor %} - - com.google.guava - guava - - - com.google.api - gax - - - com.google.api - gax-grpc - - - com.google.api - gax-httpjson - - - com.google.api.grpc - grpc-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api.grpc - grpc-google-iam-v1 - - - org.threeten - threetenbp - - - - - junit - junit - test - 4.13.2 - -{% for module in grpc_modules %} - - {{module.group_id}} - {{module.artifact_id}} - test - {% endfor %} - - - com.google.api - gax - testlib - test - - - com.google.api - gax-grpc - testlib - test - - - com.google.api - gax-httpjson - testlib - test - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/templates/poms/grpc_pom.xml.j2 b/docker/owlbot/java/templates/poms/grpc_pom.xml.j2 deleted file mode 100644 index 1b2b1c16f..000000000 --- a/docker/owlbot/java/templates/poms/grpc_pom.xml.j2 +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - {{module.group_id}} - {{module.artifact_id}} - {{module.version}} - {{module.artifact_id}} - GRPC library for {{main_module.artifact_id}} - - {{parent_module.group_id}} - {{parent_module.artifact_id}} - {{parent_module.version}} - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - {{proto_module.group_id}} - {{proto_module.artifact_id}} - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/templates/poms/parent_pom.xml.j2 b/docker/owlbot/java/templates/poms/parent_pom.xml.j2 deleted file mode 100644 index 1b9a73f0a..000000000 --- a/docker/owlbot/java/templates/poms/parent_pom.xml.j2 +++ /dev/null @@ -1,176 +0,0 @@ - - - 4.0.0 - {{main_module.group_id}} - {{main_module.artifact_id}}-parent - pom - {{main_module.version}} - Google {{name}} Parent - https://github.com/{{repo}} - - Java idiomatic client for Google Cloud Platform services. - - - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - - - chingor - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - Google LLC - - - scm:git:git@github.com:{{repo}}.git - scm:git:git@github.com:{{repo}}.git - https://github.com/{{repo}} - HEAD - - - https://github.com/{{repo}}/issues - GitHub Issues - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UTF-8 - UTF-8 - github - {{main_module.artifact_id}}-parent - - - - -{% for module in modules %} - {{module.group_id}} - {{module.artifact_id}} - {{module.version}} - -{% endfor %} - - com.google.cloud - google-cloud-shared-dependencies - 3.0.4 - pom - import - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.objenesis:objenesis - javax.annotation:javax.annotation-api - - - - - - - - -{% for module in modules %} {{module.artifact_id}} -{% endfor %} {{main_module.artifact_id}}-bom - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.3.0 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - ${site.installationModule} - jar - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - html - - aggregate - javadoc - - - - - none - protected - true - ${project.build.directory}/javadoc - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - - https://grpc.io/grpc-java/javadoc/ - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.dev/java/google-auth-library/latest/ - https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - - - - - - diff --git a/docker/owlbot/java/templates/poms/proto_pom.xml.j2 b/docker/owlbot/java/templates/poms/proto_pom.xml.j2 deleted file mode 100644 index 9c383533c..000000000 --- a/docker/owlbot/java/templates/poms/proto_pom.xml.j2 +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - {{module.group_id}} - {{module.artifact_id}} - {{module.version}} - {{module.artifact_id}} - Proto library for {{main_module.artifact_id}} - - {{parent_module.group_id}} - {{parent_module.artifact_id}} - {{parent_module.version}} - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/templates/poms/versions.txt.j2 b/docker/owlbot/java/templates/poms/versions.txt.j2 deleted file mode 100644 index 2ebaf85d3..000000000 --- a/docker/owlbot/java/templates/poms/versions.txt.j2 +++ /dev/null @@ -1,4 +0,0 @@ -# Format: -# module:released-version:current-version -{% for module in modules %} -{{module.artifact_id}}:{% if module.release_version %}{{module.release_version}}{% else %}{{module.version}}{% endif %}:{{module.version}}{% endfor %} diff --git a/docker/owlbot/java/tests/README.md b/docker/owlbot/java/tests/README.md deleted file mode 100644 index 260e7b4bb..000000000 --- a/docker/owlbot/java/tests/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Java OwlBot Image Tests - -## New Client - -This suite tests the bootstrapping of a new client. In this case, we are -generating the initial artifacts. We expect the post-processor to create all -the necessary `pom.xml` files for the detected artifacts. - -## New Version - -This suite tests the addition of a new service version. There are existing -`pom.xml` files that need to be modified to add the new modules/artifacts. diff --git a/docker/owlbot/java/tests/fix-poms/golden/.repo-metadata.json b/docker/owlbot/java/tests/fix-poms/golden/.repo-metadata.json deleted file mode 100644 index ed1a65181..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/.repo-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "foo", - "name_pretty": "Example API", - "product_documentation": "https://cloud.google.com/foo/", - "api_description": "is an example API", - "client_documentation": "https://googleapis.dev/java/google-cloud-foo/latest/index.html", - "release_level": "beta", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-foo", - "repo_short": "java-foo", - "distribution_name": "com.google.cloud:google-cloud-foo", - "api_id": "foo.googleapis.com", - "requires_billing": true, - "extra_versioned_modules": "google-cloud-foo-emulator", - "excluded_poms": "google-cloud-foo-bom", - "excluded_dependencies": "grpc-google-cloud-foo-v2,google-cloud-foo-bom" -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo-emulator/pom.xml b/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo-emulator/pom.xml deleted file mode 100644 index 3178bda26..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo-emulator/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-emulator - 0.1.1-SNAPSHOT - pom - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - Google Example API BOM - https://github.com/googleapis/java-foo - - BOM for Example API - - - - Google LLC - - - - - chingor13 - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - - scm:git:https://github.com/googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - - - - true - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - - - - - diff --git a/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/pom.xml b/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/pom.xml deleted file mode 100644 index 215a9475f..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/pom.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - jar - Google Example API - https://github.com/googleapis/java-foo - Example API is an example API - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - google-cloud-foo - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.api - api-common - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - - com.google.api.grpc - proto-google-cloud-foo-v2 - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - com.google.api - gax - - - com.google.api - gax-grpc - - - org.threeten - threetenbp - - - - - junit - junit - test - 4.13.2 - - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - test - - - - com.google.api - gax-grpc - testlib - test - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java b/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java deleted file mode 100644 index 3fdb2faa4..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceClient {} diff --git a/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java b/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java deleted file mode 100644 index 8097018ad..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceSettings {} diff --git a/docker/owlbot/java/tests/fix-poms/golden/grpc-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/fix-poms/golden/grpc-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 65ea16f63..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/grpc-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - grpc-google-cloud-foo-v1 - GRPC library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/fix-poms/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java b/docker/owlbot/java/tests/fix-poms/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java deleted file mode 100644 index 4a3c4b7b1..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java +++ /dev/null @@ -1,28 +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 - * - * https://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. - */ -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/cloud/foo/v1/bar.proto") -public final class SomeService {} diff --git a/docker/owlbot/java/tests/fix-poms/golden/pom.xml b/docker/owlbot/java/tests/fix-poms/golden/pom.xml deleted file mode 100644 index 80e7b827d..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/pom.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-parent - pom - 0.1.1-SNAPSHOT - Google Example API Parent - https://github.com/googleapis/java-foo - - Java idiomatic client for Google Cloud Platform services. - - - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - - - chingor - Jeff Ching - chingor@google.com - Google - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google - - Developer - - - - - Google LLC - - - scm:git:git@github.com:googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - HEAD - - - https://github.com/googleapis/java-foo/issues - GitHub Issues - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UTF-8 - UTF-8 - github - google-cloud-foo-parent - - - - - - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - - com.google.cloud - google-cloud-shared-dependencies - 3.0.4 - pom - import - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.objenesis:objenesis - javax.annotation:javax.annotation-api - - - - - - - - - google-cloud-foo - grpc-google-cloud-foo-v1 - proto-google-cloud-foo-v1 - proto-google-cloud-foo-v2 - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.3.0 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - ${site.installationModule} - jar - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - html - - aggregate - javadoc - - - - - none - protected - true - ${project.build.directory}/javadoc - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - - https://grpc.io/grpc-java/javadoc/ - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.dev/java/google-auth-library/latest/ - https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - - - - - - diff --git a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml b/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 8ba19c75f..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - proto-google-cloud-foo-v1 - Proto library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java b/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java deleted file mode 100644 index a0ac9d758..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java +++ /dev/null @@ -1,30 +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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v1.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/clirr-ignored-differences.xml b/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/pom.xml b/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/pom.xml deleted file mode 100644 index 57429eee6..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.api.grpc - proto-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - proto-google-cloud-foo-v2 - Proto library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java b/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java deleted file mode 100644 index b69d8daed..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java +++ /dev/null @@ -1,30 +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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v2.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/fix-poms/golden/versions.txt b/docker/owlbot/java/tests/fix-poms/golden/versions.txt deleted file mode 100644 index 4931ad357..000000000 --- a/docker/owlbot/java/tests/fix-poms/golden/versions.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Format: -# module:released-version:current-version - -google-cloud-foo:0.0.0:0.1.1-SNAPSHOT -grpc-google-cloud-foo-v1:0.0.0:0.1.1-SNAPSHOT -proto-google-cloud-foo-v1:0.0.0:0.1.1-SNAPSHOT -proto-google-cloud-foo-v2:0.0.0:0.1.1-SNAPSHOT -google-cloud-foo-emulator:0.0.0:0.1.1-SNAPSHOT diff --git a/docker/owlbot/java/tests/fix-poms/input/.repo-metadata.json b/docker/owlbot/java/tests/fix-poms/input/.repo-metadata.json deleted file mode 100644 index ed1a65181..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/.repo-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "foo", - "name_pretty": "Example API", - "product_documentation": "https://cloud.google.com/foo/", - "api_description": "is an example API", - "client_documentation": "https://googleapis.dev/java/google-cloud-foo/latest/index.html", - "release_level": "beta", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-foo", - "repo_short": "java-foo", - "distribution_name": "com.google.cloud:google-cloud-foo", - "api_id": "foo.googleapis.com", - "requires_billing": true, - "extra_versioned_modules": "google-cloud-foo-emulator", - "excluded_poms": "google-cloud-foo-bom", - "excluded_dependencies": "grpc-google-cloud-foo-v2,google-cloud-foo-bom" -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo-emulator/pom.xml b/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo-emulator/pom.xml deleted file mode 100644 index 3178bda26..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo-emulator/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-emulator - 0.1.1-SNAPSHOT - pom - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - Google Example API BOM - https://github.com/googleapis/java-foo - - BOM for Example API - - - - Google LLC - - - - - chingor13 - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - - scm:git:https://github.com/googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - - - - true - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - - - - - diff --git a/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/pom.xml b/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/pom.xml deleted file mode 100644 index 215a9475f..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/pom.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - jar - Google Example API - https://github.com/googleapis/java-foo - Example API is an example API - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - google-cloud-foo - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.api - api-common - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - - com.google.api.grpc - proto-google-cloud-foo-v2 - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - com.google.api - gax - - - com.google.api - gax-grpc - - - org.threeten - threetenbp - - - - - junit - junit - test - 4.13.2 - - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - test - - - - com.google.api - gax-grpc - testlib - test - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java b/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java deleted file mode 100644 index 3fdb2faa4..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceClient {} diff --git a/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java b/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java deleted file mode 100644 index 8097018ad..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceSettings {} diff --git a/docker/owlbot/java/tests/fix-poms/input/grpc-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/fix-poms/input/grpc-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 65ea16f63..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/grpc-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - grpc-google-cloud-foo-v1 - GRPC library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/fix-poms/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java b/docker/owlbot/java/tests/fix-poms/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java deleted file mode 100644 index 4a3c4b7b1..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java +++ /dev/null @@ -1,28 +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 - * - * https://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. - */ -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/cloud/foo/v1/bar.proto") -public final class SomeService {} diff --git a/docker/owlbot/java/tests/fix-poms/input/pom.xml b/docker/owlbot/java/tests/fix-poms/input/pom.xml deleted file mode 100644 index 80e7b827d..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/pom.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-parent - pom - 0.1.1-SNAPSHOT - Google Example API Parent - https://github.com/googleapis/java-foo - - Java idiomatic client for Google Cloud Platform services. - - - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - - - chingor - Jeff Ching - chingor@google.com - Google - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google - - Developer - - - - - Google LLC - - - scm:git:git@github.com:googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - HEAD - - - https://github.com/googleapis/java-foo/issues - GitHub Issues - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UTF-8 - UTF-8 - github - google-cloud-foo-parent - - - - - - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - - com.google.cloud - google-cloud-shared-dependencies - 3.0.4 - pom - import - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.objenesis:objenesis - javax.annotation:javax.annotation-api - - - - - - - - - google-cloud-foo - grpc-google-cloud-foo-v1 - proto-google-cloud-foo-v1 - proto-google-cloud-foo-v2 - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.3.0 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - ${site.installationModule} - jar - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - html - - aggregate - javadoc - - - - - none - protected - true - ${project.build.directory}/javadoc - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - - https://grpc.io/grpc-java/javadoc/ - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.dev/java/google-auth-library/latest/ - https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - - - - - - diff --git a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/clirr-ignored-differences.xml b/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 8ba19c75f..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - proto-google-cloud-foo-v1 - Proto library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java b/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java deleted file mode 100644 index a0ac9d758..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java +++ /dev/null @@ -1,30 +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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v1.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/clirr-ignored-differences.xml b/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/pom.xml b/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/pom.xml deleted file mode 100644 index 57429eee6..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.api.grpc - proto-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - proto-google-cloud-foo-v2 - Proto library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java b/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java deleted file mode 100644 index b69d8daed..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java +++ /dev/null @@ -1,30 +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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v2.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/fix-poms/input/versions.txt b/docker/owlbot/java/tests/fix-poms/input/versions.txt deleted file mode 100644 index b0dbde2ec..000000000 --- a/docker/owlbot/java/tests/fix-poms/input/versions.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Format: -# module:released-version:current-version - -google-cloud-foo:0.0.0:0.1.1-SNAPSHOT -grpc-google-cloud-foo-v1:0.0.0:0.1.1-SNAPSHOT -proto-google-cloud-foo-v1:0.0.0:0.1.1-SNAPSHOT -proto-google-cloud-foo-v2:0.0.0:0.1.1-SNAPSHOT diff --git a/docker/owlbot/java/tests/new-client-maps/golden/.repo-metadata.json b/docker/owlbot/java/tests/new-client-maps/golden/.repo-metadata.json deleted file mode 100644 index af7d973e6..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/.repo-metadata.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "maps", - "name_pretty": "Example API", - "product_documentation": "https://maps.google.com/foo/", - "api_description": "is an example API", - "client_documentation": "https://googleapis.dev/java/google-maps-foo/latest/index.html", - "release_level": "beta", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-maps", - "repo_short": "java-maps", - "distribution_name": "com.google.maps:google-maps-foo", - "api_id": "maps.googleapis.com", - "requires_billing": true -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo-bom/pom.xml b/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo-bom/pom.xml deleted file mode 100644 index 460f53b88..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo-bom/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - 4.0.0 - com.google.maps - google-maps-foo-bom - 0.0.1-SNAPSHOT - pom - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - Google Example API BOM - https://github.com/googleapis/java-maps - - BOM for Example API - - - - Google LLC - - - - - chingor13 - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - - scm:git:https://github.com/googleapis/java-maps.git - scm:git:git@github.com:googleapis/java-maps.git - https://github.com/googleapis/java-maps - - - - true - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - - com.google.maps - google-maps-foo - 0.0.1-SNAPSHOT - - - com.google.maps.api.grpc - grpc-google-maps-foo-v1 - 0.0.1-SNAPSHOT - - - com.google.maps.api.grpc - proto-google-maps-foo-v1 - 0.0.1-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - - - - - diff --git a/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/pom.xml b/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/pom.xml deleted file mode 100644 index 1e7b38e0c..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - 4.0.0 - com.google.maps - google-maps-foo - 0.0.1-SNAPSHOT - jar - Google Example API - https://github.com/googleapis/java-maps - Example API is an example API - - com.google.maps - google-maps-foo-parent - 0.0.1-SNAPSHOT - - - google-maps-foo - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.api - api-common - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - - com.google.maps.api.grpc - proto-google-maps-foo-v1 - - - com.google.guava - guava - - - com.google.api - gax - - - com.google.api - gax-grpc - - - com.google.api - gax-httpjson - - - com.google.api.grpc - grpc-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api.grpc - grpc-google-iam-v1 - - - org.threeten - threetenbp - - - - - junit - junit - test - 4.13.2 - - - - com.google.maps.api.grpc - grpc-google-maps-foo-v1 - test - - - - com.google.api - gax - testlib - test - - - com.google.api - gax-grpc - testlib - test - - - com.google.api - gax-httpjson - testlib - test - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceClient.java b/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceClient.java deleted file mode 100644 index f8bfa2c42..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceClient.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.maps.foo.v1; - -class SomeServiceClient {} diff --git a/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceSettings.java b/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceSettings.java deleted file mode 100644 index fbfd6751a..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.maps.foo.v1; - -class SomeServiceSettings {} diff --git a/docker/owlbot/java/tests/new-client-maps/golden/grpc-google-maps-foo-v1/pom.xml b/docker/owlbot/java/tests/new-client-maps/golden/grpc-google-maps-foo-v1/pom.xml deleted file mode 100644 index dc943c66b..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/grpc-google-maps-foo-v1/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - com.google.maps.api.grpc - grpc-google-maps-foo-v1 - 0.0.1-SNAPSHOT - grpc-google-maps-foo-v1 - GRPC library for google-maps-foo - - com.google.maps - google-maps-foo-parent - 0.0.1-SNAPSHOT - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.maps.api.grpc - proto-google-maps-foo-v1 - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client-maps/golden/grpc-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeService.java b/docker/owlbot/java/tests/new-client-maps/golden/grpc-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeService.java deleted file mode 100644 index 9dc9d67de..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/grpc-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2024 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 - * - * https://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. - */ -package com.google.maps.foo.v1; - - -/** - * - * - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/maps/foo/v1/bar.proto") -public final class SomeService {} diff --git a/docker/owlbot/java/tests/new-client-maps/golden/pom.xml b/docker/owlbot/java/tests/new-client-maps/golden/pom.xml deleted file mode 100644 index cf1febc69..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/pom.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - 4.0.0 - com.google.maps - google-maps-foo-parent - pom - 0.0.1-SNAPSHOT - Google Example API Parent - https://github.com/googleapis/java-maps - - Java idiomatic client for Google Cloud Platform services. - - - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - - - chingor - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - Google LLC - - - scm:git:git@github.com:googleapis/java-maps.git - scm:git:git@github.com:googleapis/java-maps.git - https://github.com/googleapis/java-maps - HEAD - - - https://github.com/googleapis/java-maps/issues - GitHub Issues - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UTF-8 - UTF-8 - github - google-maps-foo-parent - - - - - - com.google.maps - google-maps-foo - 0.0.1-SNAPSHOT - - - com.google.maps.api.grpc - grpc-google-maps-foo-v1 - 0.0.1-SNAPSHOT - - - com.google.maps.api.grpc - proto-google-maps-foo-v1 - 0.0.1-SNAPSHOT - - - - com.google.cloud - google-cloud-shared-dependencies - 3.0.4 - pom - import - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.objenesis:objenesis - javax.annotation:javax.annotation-api - - - - - - - - - google-maps-foo - grpc-google-maps-foo-v1 - proto-google-maps-foo-v1 - google-maps-foo-bom - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.3.0 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - ${site.installationModule} - jar - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - html - - aggregate - javadoc - - - - - none - protected - true - ${project.build.directory}/javadoc - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - - https://grpc.io/grpc-java/javadoc/ - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.dev/java/google-auth-library/latest/ - https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - - - - - - diff --git a/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/clirr-ignored-differences.xml b/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/pom.xml b/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/pom.xml deleted file mode 100644 index 0f49b858f..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.maps.api.grpc - proto-google-maps-foo-v1 - 0.0.1-SNAPSHOT - proto-google-maps-foo-v1 - Proto library for google-maps-foo - - com.google.maps - google-maps-foo-parent - 0.0.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeMessage.java b/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeMessage.java deleted file mode 100644 index 2980af9db..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/proto-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeMessage.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2024 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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.maps.foo.v1; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.maps.foo.v1.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/new-client-maps/golden/versions.txt b/docker/owlbot/java/tests/new-client-maps/golden/versions.txt deleted file mode 100644 index 4f1b0eda0..000000000 --- a/docker/owlbot/java/tests/new-client-maps/golden/versions.txt +++ /dev/null @@ -1,6 +0,0 @@ -# Format: -# module:released-version:current-version - -google-maps-foo:0.0.0:0.0.1-SNAPSHOT -proto-google-maps-foo-v1:0.0.0:0.0.1-SNAPSHOT -grpc-google-maps-foo-v1:0.0.0:0.0.1-SNAPSHOT diff --git a/docker/owlbot/java/tests/new-client-maps/input/.repo-metadata.json b/docker/owlbot/java/tests/new-client-maps/input/.repo-metadata.json deleted file mode 100644 index af7d973e6..000000000 --- a/docker/owlbot/java/tests/new-client-maps/input/.repo-metadata.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "maps", - "name_pretty": "Example API", - "product_documentation": "https://maps.google.com/foo/", - "api_description": "is an example API", - "client_documentation": "https://googleapis.dev/java/google-maps-foo/latest/index.html", - "release_level": "beta", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-maps", - "repo_short": "java-maps", - "distribution_name": "com.google.maps:google-maps-foo", - "api_id": "maps.googleapis.com", - "requires_billing": true -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client-maps/input/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceClient.java b/docker/owlbot/java/tests/new-client-maps/input/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceClient.java deleted file mode 100644 index 321e66fd4..000000000 --- a/docker/owlbot/java/tests/new-client-maps/input/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceClient.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.maps.foo.v1; - -class SomeServiceClient {} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client-maps/input/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceSettings.java b/docker/owlbot/java/tests/new-client-maps/input/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceSettings.java deleted file mode 100644 index 1ec312524..000000000 --- a/docker/owlbot/java/tests/new-client-maps/input/google-maps-foo/src/main/java/com/google/maps/foo/SomeServiceSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.maps.foo.v1; - -class SomeServiceSettings {} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client-maps/input/grpc-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeService.java b/docker/owlbot/java/tests/new-client-maps/input/grpc-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeService.java deleted file mode 100644 index 69b30a480..000000000 --- a/docker/owlbot/java/tests/new-client-maps/input/grpc-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.google.maps.foo.v1; - -import static io.grpc.MethodDescriptor.generateFullMethodName; - -/** - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/maps/foo/v1/bar.proto") -public final class SomeService { -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client-maps/input/proto-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeMessage.java b/docker/owlbot/java/tests/new-client-maps/input/proto-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeMessage.java deleted file mode 100644 index 78e95aa7f..000000000 --- a/docker/owlbot/java/tests/new-client-maps/input/proto-google-maps-foo-v1/src/main/java/com/google/maps/foo/SomeMessage.java +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.maps.foo.v1; - -/** - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.maps.foo.v1.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/new-client/golden/.repo-metadata.json b/docker/owlbot/java/tests/new-client/golden/.repo-metadata.json deleted file mode 100644 index 0a562652f..000000000 --- a/docker/owlbot/java/tests/new-client/golden/.repo-metadata.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "foo", - "name_pretty": "Example API", - "product_documentation": "https://cloud.google.com/foo/", - "api_description": "is an example API", - "client_documentation": "https://googleapis.dev/java/google-cloud-foo/latest/index.html", - "release_level": "beta", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-foo", - "repo_short": "java-foo", - "distribution_name": "com.google.cloud:google-cloud-foo", - "api_id": "foo.googleapis.com", - "requires_billing": true -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo-bom/pom.xml b/docker/owlbot/java/tests/new-client/golden/google-cloud-foo-bom/pom.xml deleted file mode 100644 index 5355ea1bc..000000000 --- a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo-bom/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-bom - 0.0.1-SNAPSHOT - pom - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - Google Example API BOM - https://github.com/googleapis/java-foo - - BOM for Example API - - - - Google LLC - - - - - chingor13 - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - - scm:git:https://github.com/googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - - - - true - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - - com.google.cloud - google-cloud-foo - 0.0.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.0.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.0.1-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - - - - - diff --git a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/pom.xml b/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/pom.xml deleted file mode 100644 index 0701bad46..000000000 --- a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo - 0.0.1-SNAPSHOT - jar - Google Example API - https://github.com/googleapis/java-foo - Example API is an example API - - com.google.cloud - google-cloud-foo-parent - 0.0.1-SNAPSHOT - - - google-cloud-foo - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.api - api-common - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - com.google.api - gax - - - com.google.api - gax-grpc - - - com.google.api - gax-httpjson - - - com.google.api.grpc - grpc-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api.grpc - grpc-google-iam-v1 - - - org.threeten - threetenbp - - - - - junit - junit - test - 4.13.2 - - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - test - - - - com.google.api - gax - testlib - test - - - com.google.api - gax-grpc - testlib - test - - - com.google.api - gax-httpjson - testlib - test - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java b/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java deleted file mode 100644 index 3fdb2faa4..000000000 --- a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceClient {} diff --git a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java b/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java deleted file mode 100644 index 8097018ad..000000000 --- a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceSettings {} diff --git a/docker/owlbot/java/tests/new-client/golden/grpc-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/new-client/golden/grpc-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 1c38b596d..000000000 --- a/docker/owlbot/java/tests/new-client/golden/grpc-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.0.1-SNAPSHOT - grpc-google-cloud-foo-v1 - GRPC library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.0.1-SNAPSHOT - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java b/docker/owlbot/java/tests/new-client/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java deleted file mode 100644 index 2a07c8de4..000000000 --- a/docker/owlbot/java/tests/new-client/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2024 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 - * - * https://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. - */ -package com.google.cloud.foo.v1; - - -/** - * - * - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/cloud/foo/v1/bar.proto") -public final class SomeService {} diff --git a/docker/owlbot/java/tests/new-client/golden/pom.xml b/docker/owlbot/java/tests/new-client/golden/pom.xml deleted file mode 100644 index 141be6b6d..000000000 --- a/docker/owlbot/java/tests/new-client/golden/pom.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-parent - pom - 0.0.1-SNAPSHOT - Google Example API Parent - https://github.com/googleapis/java-foo - - Java idiomatic client for Google Cloud Platform services. - - - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - - - chingor - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - Google LLC - - - scm:git:git@github.com:googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - HEAD - - - https://github.com/googleapis/java-foo/issues - GitHub Issues - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UTF-8 - UTF-8 - github - google-cloud-foo-parent - - - - - - com.google.cloud - google-cloud-foo - 0.0.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.0.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.0.1-SNAPSHOT - - - - com.google.cloud - google-cloud-shared-dependencies - 3.0.4 - pom - import - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.objenesis:objenesis - javax.annotation:javax.annotation-api - - - - - - - - - google-cloud-foo - grpc-google-cloud-foo-v1 - proto-google-cloud-foo-v1 - google-cloud-foo-bom - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.3.0 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - ${site.installationModule} - jar - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - html - - aggregate - javadoc - - - - - none - protected - true - ${project.build.directory}/javadoc - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - - https://grpc.io/grpc-java/javadoc/ - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.dev/java/google-auth-library/latest/ - https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - - - - - - diff --git a/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml b/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 29012d4b7..000000000 --- a/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.0.1-SNAPSHOT - proto-google-cloud-foo-v1 - Proto library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.0.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java b/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java deleted file mode 100644 index 9ff3db8b8..000000000 --- a/docker/owlbot/java/tests/new-client/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2024 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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v1.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/new-client/golden/versions.txt b/docker/owlbot/java/tests/new-client/golden/versions.txt deleted file mode 100644 index 0f5d3f176..000000000 --- a/docker/owlbot/java/tests/new-client/golden/versions.txt +++ /dev/null @@ -1,6 +0,0 @@ -# Format: -# module:released-version:current-version - -google-cloud-foo:0.0.0:0.0.1-SNAPSHOT -proto-google-cloud-foo-v1:0.0.0:0.0.1-SNAPSHOT -grpc-google-cloud-foo-v1:0.0.0:0.0.1-SNAPSHOT diff --git a/docker/owlbot/java/tests/new-client/input/.repo-metadata.json b/docker/owlbot/java/tests/new-client/input/.repo-metadata.json deleted file mode 100644 index 0a562652f..000000000 --- a/docker/owlbot/java/tests/new-client/input/.repo-metadata.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "foo", - "name_pretty": "Example API", - "product_documentation": "https://cloud.google.com/foo/", - "api_description": "is an example API", - "client_documentation": "https://googleapis.dev/java/google-cloud-foo/latest/index.html", - "release_level": "beta", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-foo", - "repo_short": "java-foo", - "distribution_name": "com.google.cloud:google-cloud-foo", - "api_id": "foo.googleapis.com", - "requires_billing": true -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java b/docker/owlbot/java/tests/new-client/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java deleted file mode 100644 index 347bd7f0f..000000000 --- a/docker/owlbot/java/tests/new-client/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceClient {} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java b/docker/owlbot/java/tests/new-client/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java deleted file mode 100644 index 0378a4d73..000000000 --- a/docker/owlbot/java/tests/new-client/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceSettings {} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java b/docker/owlbot/java/tests/new-client/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java deleted file mode 100644 index 6fad62dbe..000000000 --- a/docker/owlbot/java/tests/new-client/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.google.cloud.foo.v1; - -import static io.grpc.MethodDescriptor.generateFullMethodName; - -/** - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/cloud/foo/v1/bar.proto") -public final class SomeService { -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-client/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java b/docker/owlbot/java/tests/new-client/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java deleted file mode 100644 index b54f5f368..000000000 --- a/docker/owlbot/java/tests/new-client/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v1; - -/** - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v1.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/new-version/golden/.repo-metadata.json b/docker/owlbot/java/tests/new-version/golden/.repo-metadata.json deleted file mode 100644 index 0a562652f..000000000 --- a/docker/owlbot/java/tests/new-version/golden/.repo-metadata.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "foo", - "name_pretty": "Example API", - "product_documentation": "https://cloud.google.com/foo/", - "api_description": "is an example API", - "client_documentation": "https://googleapis.dev/java/google-cloud-foo/latest/index.html", - "release_level": "beta", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-foo", - "repo_short": "java-foo", - "distribution_name": "com.google.cloud:google-cloud-foo", - "api_id": "foo.googleapis.com", - "requires_billing": true -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo-bom/pom.xml b/docker/owlbot/java/tests/new-version/golden/google-cloud-foo-bom/pom.xml deleted file mode 100644 index 35ffa4c27..000000000 --- a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo-bom/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-bom - 0.1.1-SNAPSHOT - pom - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - Google Example API BOM - https://github.com/googleapis/java-foo - - BOM for Example API - - - - Google LLC - - - - - chingor13 - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - - scm:git:https://github.com/googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - - - - true - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - - - - - diff --git a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/pom.xml b/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/pom.xml deleted file mode 100644 index 07bc0284e..000000000 --- a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - jar - Google Example API - https://github.com/googleapis/java-foo - Example API is an example API - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - google-cloud-foo - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.api - api-common - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - - com.google.api.grpc - proto-google-cloud-foo-v2 - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - com.google.api - gax - - - com.google.api - gax-grpc - - - org.threeten - threetenbp - - - - - junit - junit - test - 4.13.2 - - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - test - - - com.google.api.grpc - grpc-google-cloud-foo-v2 - test - - - - com.google.api - gax-grpc - testlib - test - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java b/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java deleted file mode 100644 index 3fdb2faa4..000000000 --- a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceClient {} diff --git a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java b/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java deleted file mode 100644 index 8097018ad..000000000 --- a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceSettings {} diff --git a/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 65ea16f63..000000000 --- a/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - grpc-google-cloud-foo-v1 - GRPC library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java b/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java deleted file mode 100644 index 4a3c4b7b1..000000000 --- a/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java +++ /dev/null @@ -1,28 +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 - * - * https://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. - */ -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/cloud/foo/v1/bar.proto") -public final class SomeService {} diff --git a/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v2/pom.xml b/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v2/pom.xml deleted file mode 100644 index 65ea16f63..000000000 --- a/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v2/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - grpc-google-cloud-foo-v1 - GRPC library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeService.java b/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeService.java deleted file mode 100644 index e9b628be6..000000000 --- a/docker/owlbot/java/tests/new-version/golden/grpc-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeService.java +++ /dev/null @@ -1,28 +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 - * - * https://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. - */ -package com.google.cloud.foo.v2; - -/** - * - * - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/cloud/foo/v2/bar.proto") -public final class SomeService {} diff --git a/docker/owlbot/java/tests/new-version/golden/pom.xml b/docker/owlbot/java/tests/new-version/golden/pom.xml deleted file mode 100644 index 84e6b48cb..000000000 --- a/docker/owlbot/java/tests/new-version/golden/pom.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-parent - pom - 0.1.1-SNAPSHOT - Google Example API Parent - https://github.com/googleapis/java-foo - - Java idiomatic client for Google Cloud Platform services. - - - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - - - chingor - Jeff Ching - chingor@google.com - Google - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google - - Developer - - - - - Google LLC - - - scm:git:git@github.com:googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - HEAD - - - https://github.com/googleapis/java-foo/issues - GitHub Issues - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UTF-8 - UTF-8 - github - google-cloud-foo-parent - - - - - - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - - com.google.cloud - google-cloud-shared-dependencies - 3.0.4 - pom - import - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.objenesis:objenesis - javax.annotation:javax.annotation-api - - - - - - - - - google-cloud-foo - grpc-google-cloud-foo-v1 - grpc-google-cloud-foo-v2 - proto-google-cloud-foo-v1 - proto-google-cloud-foo-v2 - google-cloud-foo-bom - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.3.0 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - ${site.installationModule} - jar - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - html - - aggregate - javadoc - - - - - none - protected - true - ${project.build.directory}/javadoc - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - - https://grpc.io/grpc-java/javadoc/ - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.dev/java/google-auth-library/latest/ - https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - - - - - - diff --git a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml b/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 8ba19c75f..000000000 --- a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - proto-google-cloud-foo-v1 - Proto library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java b/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java deleted file mode 100644 index a0ac9d758..000000000 --- a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java +++ /dev/null @@ -1,30 +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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v1.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/clirr-ignored-differences.xml b/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/pom.xml b/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/pom.xml deleted file mode 100644 index 57429eee6..000000000 --- a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.api.grpc - proto-google-cloud-foo-v2 - 0.1.1-SNAPSHOT - proto-google-cloud-foo-v2 - Proto library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java b/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java deleted file mode 100644 index 3134834ae..000000000 --- a/docker/owlbot/java/tests/new-version/golden/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java +++ /dev/null @@ -1,30 +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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v2; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v2.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/new-version/golden/versions.txt b/docker/owlbot/java/tests/new-version/golden/versions.txt deleted file mode 100644 index 2f3088743..000000000 --- a/docker/owlbot/java/tests/new-version/golden/versions.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Format: -# module:released-version:current-version - -google-cloud-foo:0.0.0:0.1.1-SNAPSHOT -grpc-google-cloud-foo-v1:0.0.0:0.1.1-SNAPSHOT -proto-google-cloud-foo-v1:0.0.0:0.1.1-SNAPSHOT -proto-google-cloud-foo-v2:0.0.0:0.1.1-SNAPSHOT -grpc-google-cloud-foo-v2:0.0.0:0.1.1-SNAPSHOT diff --git a/docker/owlbot/java/tests/new-version/input/.repo-metadata.json b/docker/owlbot/java/tests/new-version/input/.repo-metadata.json deleted file mode 100644 index 0a562652f..000000000 --- a/docker/owlbot/java/tests/new-version/input/.repo-metadata.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "foo", - "name_pretty": "Example API", - "product_documentation": "https://cloud.google.com/foo/", - "api_description": "is an example API", - "client_documentation": "https://googleapis.dev/java/google-cloud-foo/latest/index.html", - "release_level": "beta", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-foo", - "repo_short": "java-foo", - "distribution_name": "com.google.cloud:google-cloud-foo", - "api_id": "foo.googleapis.com", - "requires_billing": true -} \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-version/input/google-cloud-foo-bom/pom.xml b/docker/owlbot/java/tests/new-version/input/google-cloud-foo-bom/pom.xml deleted file mode 100644 index 939817512..000000000 --- a/docker/owlbot/java/tests/new-version/input/google-cloud-foo-bom/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-bom - 0.1.1-SNAPSHOT - pom - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - Google Example API BOM - https://github.com/googleapis/java-foo - - BOM for Example API - - - - Google LLC - - - - - chingor13 - Jeff Ching - chingor@google.com - Google LLC - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google LLC - - Developer - - - - - - scm:git:https://github.com/googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - - - - true - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - - - - - diff --git a/docker/owlbot/java/tests/new-version/input/google-cloud-foo/pom.xml b/docker/owlbot/java/tests/new-version/input/google-cloud-foo/pom.xml deleted file mode 100644 index a7abeb42c..000000000 --- a/docker/owlbot/java/tests/new-version/input/google-cloud-foo/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - jar - Google Example API - https://github.com/googleapis/java-foo - Example API is an example API - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - google-cloud-foo - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.api - api-common - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - com.google.api - gax - - - com.google.api - gax-grpc - - - org.threeten - threetenbp - - - - - junit - junit - test - 4.13.2 - - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - test - - - - com.google.api - gax-grpc - testlib - test - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-version/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java b/docker/owlbot/java/tests/new-version/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java deleted file mode 100644 index 3fdb2faa4..000000000 --- a/docker/owlbot/java/tests/new-version/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceClient.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceClient {} diff --git a/docker/owlbot/java/tests/new-version/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java b/docker/owlbot/java/tests/new-version/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java deleted file mode 100644 index 8097018ad..000000000 --- a/docker/owlbot/java/tests/new-version/input/google-cloud-foo/src/main/java/com/google/cloud/foo/SomeServiceSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * https://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. - */ - -package com.google.cloud.foo.v1; - -class SomeServiceSettings {} diff --git a/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 65ea16f63..000000000 --- a/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - grpc-google-cloud-foo-v1 - GRPC library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java b/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java deleted file mode 100644 index 344004937..000000000 --- a/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeService.java +++ /dev/null @@ -1,29 +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 - * - * https://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. - */ -package com.google.cloud.foo.v1; - - -/** - * - * - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/cloud/foo/v1/bar.proto") -public final class SomeService {} diff --git a/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v2/pom.xml b/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v2/pom.xml deleted file mode 100644 index 65ea16f63..000000000 --- a/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v2/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - grpc-google-cloud-foo-v1 - GRPC library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - io.grpc - grpc-api - - - io.grpc - grpc-stub - - - io.grpc - grpc-protobuf - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-cloud-foo-v1 - - - com.google.guava - guava - - - - - - java9 - - [9,) - - - - javax.annotation - javax.annotation-api - - - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - \ No newline at end of file diff --git a/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeService.java b/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeService.java deleted file mode 100644 index ff39beaec..000000000 --- a/docker/owlbot/java/tests/new-version/input/grpc-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeService.java +++ /dev/null @@ -1,29 +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 - * - * https://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. - */ -package com.google.cloud.foo.v2; - - -/** - * - * - *
- * Foo Service.
- * 
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler", - comments = "Source: google/cloud/foo/v2/bar.proto") -public final class SomeService {} diff --git a/docker/owlbot/java/tests/new-version/input/pom.xml b/docker/owlbot/java/tests/new-version/input/pom.xml deleted file mode 100644 index 38c077fb0..000000000 --- a/docker/owlbot/java/tests/new-version/input/pom.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-foo-parent - pom - 0.1.1-SNAPSHOT - Google Example API Parent - https://github.com/googleapis/java-foo - - Java idiomatic client for Google Cloud Platform services. - - - - com.google.cloud - google-cloud-shared-config - 1.5.3 - - - - - chingor - Jeff Ching - chingor@google.com - Google - - Developer - - - - neenushaji - Neenu Shaji - neenushaji@google.com - Google - - Developer - - - - - Google LLC - - - scm:git:git@github.com:googleapis/java-foo.git - scm:git:git@github.com:googleapis/java-foo.git - https://github.com/googleapis/java-foo - HEAD - - - https://github.com/googleapis/java-foo/issues - GitHub Issues - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UTF-8 - UTF-8 - github - google-cloud-foo-parent - - - - - - com.google.cloud - google-cloud-foo - 0.1.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - - - - com.google.cloud - google-cloud-shared-dependencies - 3.0.4 - pom - import - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.objenesis:objenesis - javax.annotation:javax.annotation-api - - - - - - - - - google-cloud-foo - grpc-google-cloud-foo-v1 - proto-google-cloud-foo-v1 - google-cloud-foo-bom - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.3.0 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - ${site.installationModule} - jar - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - html - - aggregate - javadoc - - - - - none - protected - true - ${project.build.directory}/javadoc - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - - https://grpc.io/grpc-java/javadoc/ - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.dev/java/google-auth-library/latest/ - https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ - - - - - - diff --git a/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/clirr-ignored-differences.xml b/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/clirr-ignored-differences.xml deleted file mode 100644 index 70e35c153..000000000 --- a/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/clirr-ignored-differences.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/pom.xml b/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/pom.xml deleted file mode 100644 index 8ba19c75f..000000000 --- a/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - com.google.api.grpc - proto-google-cloud-foo-v1 - 0.1.1-SNAPSHOT - proto-google-cloud-foo-v1 - Proto library for google-cloud-foo - - com.google.cloud - google-cloud-foo-parent - 0.1.1-SNAPSHOT - - - - com.google.protobuf - protobuf-java - - - com.google.api.grpc - proto-google-common-protos - - - com.google.api.grpc - proto-google-iam-v1 - - - com.google.api - api-common - - - com.google.guava - guava - - - - - - - org.codehaus.mojo - flatten-maven-plugin - - - - diff --git a/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java b/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java deleted file mode 100644 index a0ac9d758..000000000 --- a/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v1/src/main/java/com/google/cloud/foo/SomeMessage.java +++ /dev/null @@ -1,30 +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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v1; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v1.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java b/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java deleted file mode 100644 index 3134834ae..000000000 --- a/docker/owlbot/java/tests/new-version/input/proto-google-cloud-foo-v2/src/main/java/com/google/cloud/foo/v2/SomeMessage.java +++ /dev/null @@ -1,30 +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 - * - * https://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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/cloud/foo/v1/bar.proto - -package com.google.cloud.foo.v2; - -/** - * - * - *
- * Some sample class
- * 
- * - * Protobuf type {@code google.cloud.foo.v2.SomeMessage} - */ -public final class SomeMessage {} diff --git a/docker/owlbot/java/tests/new-version/input/versions.txt b/docker/owlbot/java/tests/new-version/input/versions.txt deleted file mode 100644 index 7d493d72a..000000000 --- a/docker/owlbot/java/tests/new-version/input/versions.txt +++ /dev/null @@ -1,6 +0,0 @@ -# Format: -# module:released-version:current-version - -google-cloud-foo:0.0.0:0.1.1-SNAPSHOT -grpc-google-cloud-foo-v1:0.0.0:0.1.1-SNAPSHOT -proto-google-cloud-foo-v1:0.0.0:0.1.1-SNAPSHOT diff --git a/synthtool/gcp/templates/java_library/.github/CODEOWNERS b/synthtool/gcp/templates/java_library/.github/CODEOWNERS deleted file mode 100644 index 5002a1b08..000000000 --- a/synthtool/gcp/templates/java_library/.github/CODEOWNERS +++ /dev/null @@ -1,20 +0,0 @@ -# Code owners file. -# This file controls who is tagged for review for any given pull request. - -# For syntax help see: -# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -{% if 'codeowner_team' in metadata['repo'] %} -# The {{ metadata['repo']['codeowner_team'] }} is the default owner for changes in this repo -* @googleapis/yoshi-java {{ metadata['repo']['codeowner_team'] }} -{% if 'library_type' in metadata['repo'] and metadata['repo']['library_type'] != 'GAPIC_AUTO' %} -# for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner -**/*.java {{ metadata['repo']['codeowner_team'] }} -{% endif %} -{% else %} -* @googleapis/yoshi-java -{% endif %} -# The java-samples-reviewers team is the default owner for samples changes -samples/**/*.java @googleapis/java-samples-reviewers - -# Generated snippets should not be owned by samples reviewers -samples/snippets/generated/ @googleapis/yoshi-java diff --git a/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/bug_report.md b/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index c7539a687..000000000 --- a/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,56 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- -{% if migrated_split_repo %} -:bus: This library has moved to -[google-cloud-java/{{ metadata['repo']['repo_short'] }}]( -https://github.com/googleapis/google-cloud-java/tree/main/{{ metadata['repo']['repo_short'] }}). -This repository will be archived in the future. -{% endif %} -Thanks for stopping by to let us know something could be better! - -**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. - -Please run down the following list and make sure you've tried the usual "quick fixes": - - - Search the issues already opened: https://github.com/googleapis/{{metadata['repo']['repo_short']}}/issues - - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform - -If you are still having issues, please include as much information as possible: - -#### Environment details - -1. Specify the API at the beginning of the title. For example, "BigQuery: ..."). - General, Core, and Other are also allowed as types -2. OS type and version: -3. Java version: -4. {{metadata['repo']['name']}} version(s): - -#### Steps to reproduce - - 1. ? - 2. ? - -#### Code example - -```java -// example -``` - -#### Stack trace -``` -Any relevant stacktrace here. -``` - -#### External references such as API reference guides - -- ? - -#### Any additional information below - - -Following these steps guarantees the quickest resolution possible. - -Thanks! diff --git a/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/feature_request.md b/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index f89a7dc59..000000000 --- a/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this library - ---- -{% if migrated_split_repo %} -:bus: This library has moved to -[google-cloud-java/{{ metadata['repo']['repo_short'] }}]( -https://github.com/googleapis/google-cloud-java/tree/main/{{ metadata['repo']['repo_short'] }}). -This repository will be archived in the future. -{% endif %} -Thanks for stopping by to let us know something could be better! - -**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. - -**Is your feature request related to a problem? Please describe.** -What the problem is. Example: I'm always frustrated when [...] - -**Describe the solution you'd like** -What you want to happen. - -**Describe alternatives you've considered** -Any alternative solutions or features you've considered. - -**Additional context** -Any other context or screenshots about the feature request. diff --git a/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/support_request.md b/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/support_request.md deleted file mode 100644 index 995869032..000000000 --- a/synthtool/gcp/templates/java_library/.github/ISSUE_TEMPLATE/support_request.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -name: Support request -about: If you have a support contract with Google, please create an issue in the Google Cloud Support console. - ---- - -**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. diff --git a/synthtool/gcp/templates/java_library/.github/PULL_REQUEST_TEMPLATE.md b/synthtool/gcp/templates/java_library/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index b3640828a..000000000 --- a/synthtool/gcp/templates/java_library/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,10 +0,0 @@ -Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: -- [ ] Make sure to open an issue as a [bug/issue](https://github.com/{{ metadata['repo']['repo'] }}/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea -- [ ] Ensure the tests and linter pass -- [ ] Code coverage does not decrease (if any source code was changed) -- [ ] 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/synthtool/gcp/templates/java_library/.github/auto-label.yaml b/synthtool/gcp/templates/java_library/.github/auto-label.yaml deleted file mode 100644 index 4caef688b..000000000 --- a/synthtool/gcp/templates/java_library/.github/auto-label.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# 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. -# 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. -requestsize: - enabled: true diff --git a/synthtool/gcp/templates/java_library/.github/blunderbuss.yml b/synthtool/gcp/templates/java_library/.github/blunderbuss.yml deleted file mode 100644 index 2176b0543..000000000 --- a/synthtool/gcp/templates/java_library/.github/blunderbuss.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss -assign_prs_by: -- labels: - - samples - to: - - googleapis/java-samples-reviewers \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/.github/dependabot.yml b/synthtool/gcp/templates/java_library/.github/dependabot.yml deleted file mode 100644 index 203f9eacc..000000000 --- a/synthtool/gcp/templates/java_library/.github/dependabot.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "maven" - directory: "/" - schedule: - interval: "daily" - # Disable version updates for Maven dependencies - # we use renovate-bot as well as shared-dependencies BOM to update maven dependencies. - ignore: - - dependency-name: "*" - - package-ecosystem: "pip" - directory: "/" - schedule: - interval: "daily" - # Disable version updates for pip dependencies - # If a security vulnerability comes in, we will be notified about - # it via template in the synthtool repository. - ignore: - - dependency-name: "*" diff --git a/synthtool/gcp/templates/java_library/.github/generated-files-bot.yml b/synthtool/gcp/templates/java_library/.github/generated-files-bot.yml deleted file mode 100644 index c644a24e1..000000000 --- a/synthtool/gcp/templates/java_library/.github/generated-files-bot.yml +++ /dev/null @@ -1,12 +0,0 @@ -externalManifests: -- type: json - file: 'synth.metadata' - jsonpath: '$.generatedFiles[*]' -- type: json - file: '.github/readme/synth.metadata/synth.metadata' - jsonpath: '$.generatedFiles[*]' -ignoreAuthors: -- 'renovate-bot' -- 'yoshi-automation' -- 'release-please[bot]' -- 'gcf-owl-bot[bot]' diff --git a/synthtool/gcp/templates/java_library/.github/release-please.yml b/synthtool/gcp/templates/java_library/.github/release-please.yml deleted file mode 100644 index 8ca7f9cab..000000000 --- a/synthtool/gcp/templates/java_library/.github/release-please.yml +++ /dev/null @@ -1,3 +0,0 @@ -bumpMinorPreMajor: true -handleGHRelease: true -releaseType: java-yoshi diff --git a/synthtool/gcp/templates/java_library/.github/release-trigger.yml b/synthtool/gcp/templates/java_library/.github/release-trigger.yml deleted file mode 100644 index 5056d3a13..000000000 --- a/synthtool/gcp/templates/java_library/.github/release-trigger.yml +++ /dev/null @@ -1,2 +0,0 @@ -enabled: true -multiScmName: {{ metadata['repo']['repo_short'] }} diff --git a/synthtool/gcp/templates/java_library/.github/snippet-bot.yml b/synthtool/gcp/templates/java_library/.github/snippet-bot.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml b/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml deleted file mode 100644 index bbfd4c031..000000000 --- a/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml +++ /dev/null @@ -1,64 +0,0 @@ -# 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. -# Whether or not rebase-merging is enabled on this repository. -# Defaults to `true` -rebaseMergeAllowed: false - -# Whether or not squash-merging is enabled on this repository. -# Defaults to `true` -squashMergeAllowed: true - -# Whether or not PRs are merged with a merge commit on this repository. -# Defaults to `false` -mergeCommitAllowed: false - -# Rules for main branch protection -branchProtectionRules: -# Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `main` -- pattern: main - # Can admins overwrite branch protection. - # Defaults to `true` - isAdminEnforced: true - # Number of approving reviews required to update matching branches. - # Defaults to `1` - requiredApprovingReviewCount: 1 - # Are reviews from code owners required to update matching branches. - # Defaults to `false` - requiresCodeOwnerReviews: true - # Require up to date branches - requiresStrictStatusChecks: false - # List of required status check contexts that must pass for commits to be accepted to matching branches. - requiredStatusCheckContexts: - - "dependencies (17)" - - "lint" - - "javadoc" - - "units (8)" - - "units (11)" - - "Kokoro - Test: Integration" - - "cla/google" - - "OwlBot Post Processor" - - "Kokoro - Test: Java GraalVM Native Image" - - "Kokoro - Test: Java 17 GraalVM Native Image" -# List of explicit permissions to add (additive only) -permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push -- team: java-samples-reviewers - permission: push - diff --git a/synthtool/gcp/templates/java_library/.github/trusted-contribution.yml b/synthtool/gcp/templates/java_library/.github/trusted-contribution.yml deleted file mode 100644 index 88d3ac9bf..000000000 --- a/synthtool/gcp/templates/java_library/.github/trusted-contribution.yml +++ /dev/null @@ -1,9 +0,0 @@ -trustedContributors: -- renovate-bot -- gcf-owl-bot[bot] - -annotations: -- type: comment - text: "/gcbrun" -- type: label - text: "kokoro:force-run" diff --git a/synthtool/gcp/templates/java_library/.github/workflows/approve-readme.yaml b/synthtool/gcp/templates/java_library/.github/workflows/approve-readme.yaml deleted file mode 100644 index bbef6d37c..000000000 --- a/synthtool/gcp/templates/java_library/.github/workflows/approve-readme.yaml +++ /dev/null @@ -1,69 +0,0 @@ -# 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. -on: - pull_request: -name: auto-merge-readme -jobs: - approve: - runs-on: ubuntu-latest - if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' - steps: - - uses: actions/github-script@v7 - with: - github-token: {{ '${{secrets.YOSHI_APPROVER_TOKEN}}' }} - script: | - // only approve PRs from yoshi-automation - if (context.payload.pull_request.user.login !== "yoshi-automation") { - return; - } - - // only approve PRs like "chore: release " - if (!context.payload.pull_request.title === "chore: regenerate README") { - return; - } - - // only approve PRs with README.md and synth.metadata changes - const files = new Set( - ( - await github.paginate( - github.pulls.listFiles.endpoint({ - owner: context.repo.owner, - repo: context.repo.repo, - pull_number: context.payload.pull_request.number, - }) - ) - ).map(file => file.filename) - ); - if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) { - return; - } - - // approve README regeneration PR - await github.pulls.createReview({ - owner: context.repo.owner, - repo: context.repo.repo, - body: 'Rubber stamped PR!', - pull_number: context.payload.pull_request.number, - event: 'APPROVE' - }); - - // attach automerge label - await github.issues.addLabels({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.payload.pull_request.number, - labels: ['automerge'] - }); diff --git a/synthtool/gcp/templates/java_library/.github/workflows/ci.yaml b/synthtool/gcp/templates/java_library/.github/workflows/ci.yaml deleted file mode 100644 index 50487eeb3..000000000 --- a/synthtool/gcp/templates/java_library/.github/workflows/ci.yaml +++ /dev/null @@ -1,123 +0,0 @@ -# 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. -on: - push: - branches: - - main - pull_request: -name: ci -jobs: - units: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - java: [11, 17, 21] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: ${{'{{matrix.java}}'}} - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: test - units-java8: - # Building using Java 17 and run the tests with Java 8 runtime - name: "units (8)" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - java-version: 8 - distribution: temurin - - name: "Set jvm system property environment variable for surefire plugin (unit tests)" - # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests. - # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm - run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV - shell: bash - - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: temurin - - run: .kokoro/build.sh - env: - JOB_TYPE: test - windows: - runs-on: windows-latest - steps: - - name: Support longpaths - run: git config --system core.longpaths true - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 8 - - run: java -version - - run: .kokoro/build.bat - env: - JOB_TYPE: test - dependencies: - runs-on: ubuntu-latest - strategy: - matrix: - java: [17] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: ${{'{{matrix.java}}'}} - - run: java -version - - run: .kokoro/dependencies.sh - javadoc: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: javadoc - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 11 - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: lint - clirr: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 8 - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: clirr diff --git a/synthtool/gcp/templates/java_library/.github/workflows/renovate_config_check.yaml b/synthtool/gcp/templates/java_library/.github/workflows/renovate_config_check.yaml deleted file mode 100644 index 7c5ec7865..000000000 --- a/synthtool/gcp/templates/java_library/.github/workflows/renovate_config_check.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: Renovate Bot Config Validation - -on: - pull_request: - paths: - - 'renovate.json' - -jobs: - renovate_bot_config_validation: - runs-on: ubuntu-22.04 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: '20' - - - name: Install Renovate and Config Validator - run: | - npm install -g npm@latest - npm install --global renovate - renovate-config-validator diff --git a/synthtool/gcp/templates/java_library/.github/workflows/samples.yaml b/synthtool/gcp/templates/java_library/.github/workflows/samples.yaml deleted file mode 100644 index 03b293956..000000000 --- a/synthtool/gcp/templates/java_library/.github/workflows/samples.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# 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. -on: - pull_request: -name: samples -jobs: - checkstyle: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 8 - - name: Run checkstyle - run: mvn -P lint --quiet --batch-mode checkstyle:check - working-directory: samples/snippets diff --git a/synthtool/gcp/templates/java_library/.kokoro/build.bat b/synthtool/gcp/templates/java_library/.kokoro/build.bat deleted file mode 100644 index 067cf4a4c..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/build.bat +++ /dev/null @@ -1,18 +0,0 @@ -:: 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 - -"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/synthtool/gcp/templates/java_library/.kokoro/build.sh b/synthtool/gcp/templates/java_library/.kokoro/build.sh deleted file mode 100755 index bafdc02b3..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/build.sh +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/bash -# 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. - -set -eo pipefail - -## Get the directory of the build script -scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) -## cd to the parent directory, i.e. the root of the git repo -cd ${scriptDir}/.. - -# include common functions -source ${scriptDir}/common.sh - -# Print out Maven & Java version -mvn -version -echo ${JOB_TYPE} - -# attempt to install 3 times with exponential backoff (starting with 10 seconds) -retry_with_backoff 3 10 \ - mvn install -B -V -ntp \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true \ - -T 1C - -# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it -if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then - export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) -fi - -RETURN_CODE=0 -set +e - -case ${JOB_TYPE} in -test) - echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}" - mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT} - RETURN_CODE=$? - ;; -lint) - mvn com.coveo:fmt-maven-plugin:check -B -ntp - RETURN_CODE=$? - ;; -javadoc) - mvn javadoc:javadoc javadoc:test-javadoc -B -ntp - RETURN_CODE=$? - ;; -integration) - mvn -B ${INTEGRATION_TEST_ARGS} \ - -ntp \ - -Penable-integration-tests \ - -DtrimStackTrace=false \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -fae \ - verify - RETURN_CODE=$? - ;; -graalvm) - # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test - RETURN_CODE=$? - ;; -graalvm17) - # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test - RETURN_CODE=$? - ;; -samples) - SAMPLES_DIR=samples - # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. - if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]] - then - SAMPLES_DIR=samples/snapshot - fi - - if [[ -f ${SAMPLES_DIR}/pom.xml ]] - then - for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do - [[ -f "$FILE" ]] || continue - source "$FILE" - done - - pushd ${SAMPLES_DIR} - mvn -B \ - -ntp \ - -DtrimStackTrace=false \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -fae \ - verify - RETURN_CODE=$? - popd - else - echo "no sample pom.xml found - skipping sample tests" - fi - ;; -clirr) - mvn -B -ntp -Denforcer.skip=true clirr:check - RETURN_CODE=$? - ;; -*) - ;; -esac - -if [ "${REPORT_COVERAGE}" == "true" ] -then - bash ${KOKORO_GFILE_DIR}/codecov.sh -fi - -# fix output location of logs -bash .kokoro/coerce_logs.sh - -if [[ "${ENABLE_FLAKYBOT}" == "true" ]] -then - chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot - ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo={{metadata['repo']['repo']}} -fi - -echo "exiting with ${RETURN_CODE}" -exit ${RETURN_CODE} diff --git a/synthtool/gcp/templates/java_library/.kokoro/coerce_logs.sh b/synthtool/gcp/templates/java_library/.kokoro/coerce_logs.sh deleted file mode 100755 index 46edbf7f2..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/coerce_logs.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# 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 script finds and moves sponge logs so that they can be found by placer -# and are not flagged as flaky by sponge. - -set -eo pipefail - -## Get the directory of the build script -scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) -## cd to the parent directory, i.e. the root of the git repo -cd ${scriptDir}/.. - -job=$(basename ${KOKORO_JOB_NAME}) - -echo "coercing sponge logs..." -for xml in `find . -name *-sponge_log.xml` -do - class=$(basename ${xml} | cut -d- -f2) - dir=$(dirname ${xml})/${job}/${class} - text=$(dirname ${xml})/${class}-sponge_log.txt - mkdir -p ${dir} - mv ${xml} ${dir}/sponge_log.xml - mv ${text} ${dir}/sponge_log.txt -done diff --git a/synthtool/gcp/templates/java_library/.kokoro/common.cfg b/synthtool/gcp/templates/java_library/.kokoro/common.cfg deleted file mode 100644 index 567197235..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/common.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR} -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# All builds use the trampoline script to run in docker. -build_file: "{{ metadata['repo']['repo_short'] }}/.kokoro/trampoline.sh" - -# Tell the trampoline which build file to use. -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/{{ metadata['repo']['repo_short'] }}/.kokoro/build.sh" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/common.sh b/synthtool/gcp/templates/java_library/.kokoro/common.sh deleted file mode 100644 index f8f957af1..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/common.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -# 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. - -function retry_with_backoff { - attempts_left=$1 - sleep_seconds=$2 - shift 2 - command=$@ - - - # store current flag state - flags=$- - - # allow a failures to continue - set +e - ${command} - exit_code=$? - - # restore "e" flag - if [[ ${flags} =~ e ]] - then set -e - else set +e - fi - - if [[ $exit_code == 0 ]] - then - return 0 - fi - - # failure - if [[ ${attempts_left} > 0 ]] - then - echo "failure (${exit_code}), sleeping ${sleep_seconds}..." - sleep ${sleep_seconds} - new_attempts=$((${attempts_left} - 1)) - new_sleep=$((${sleep_seconds} * 2)) - retry_with_backoff ${new_attempts} ${new_sleep} ${command} - fi - - return $exit_code -} - -## Helper functionss -function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } -function msg() { println "$*" >&2; } -function println() { printf '%s\n' "$(now) $*"; } - -## Helper comment to trigger updated repo dependency release \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/.kokoro/continuous/common.cfg b/synthtool/gcp/templates/java_library/.kokoro/continuous/common.cfg deleted file mode 100644 index 82120d848..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/continuous/common.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.txt" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "{{ metadata['repo']['repo_short'] }}/.kokoro/trampoline.sh" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/{{ metadata['repo']['repo_short'] }}/.kokoro/build.sh" -} - -env_vars: { - key: "JOB_TYPE" - value: "test" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/continuous/java8.cfg b/synthtool/gcp/templates/java_library/.kokoro/continuous/java8.cfg deleted file mode 100644 index 495cc7bac..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/continuous/java8.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "REPORT_COVERAGE" - value: "true" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/dependencies.sh b/synthtool/gcp/templates/java_library/.kokoro/dependencies.sh deleted file mode 100755 index bd8960246..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/dependencies.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# 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. - -set -eo pipefail -shopt -s nullglob - -## Get the directory of the build script -scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) -## cd to the parent directory, i.e. the root of the git repo -cd ${scriptDir}/.. - -# include common functions -source ${scriptDir}/common.sh - -# Print out Java -java -version -echo $JOB_TYPE - -function determineMavenOpts() { - local javaVersion=$( - # filter down to the version line, then pull out the version between quotes, - # then trim the version number down to its minimal number (removing any - # update or suffix number). - java -version 2>&1 | grep "version" \ - | sed -E 's/^.*"(.*?)".*$/\1/g' \ - | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' - ) - - if [[ $javaVersion == 17* ]] - then - # MaxPermSize is no longer supported as of jdk 17 - echo -n "-Xmx1024m" - else - echo -n "-Xmx1024m -XX:MaxPermSize=128m" - fi -} - -export MAVEN_OPTS=$(determineMavenOpts) - -# this should run maven enforcer -retry_with_backoff 3 10 \ - mvn install -B -V -ntp \ - -DskipTests=true \ - -Dmaven.javadoc.skip=true \ - -Dclirr.skip=true - -mvn -B dependency:analyze -DfailOnWarning=true diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/common.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/common.cfg deleted file mode 100644 index 82120d848..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/common.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.txt" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "{{ metadata['repo']['repo_short'] }}/.kokoro/trampoline.sh" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/{{ metadata['repo']['repo_short'] }}/.kokoro/build.sh" -} - -env_vars: { - key: "JOB_TYPE" - value: "test" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg deleted file mode 100644 index 46e676027..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg +++ /dev/null @@ -1,42 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "ENABLE_FLAKYBOT" - value: {% if migrated_split_repo %}"false"{% else %}"true"{% endif %} -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - -{% if 'partials' in metadata - and 'integration_append' in metadata['partials'] -%} -{{ metadata['partials']['integration_append'] }} -{%- endif -%} diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/java11-integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/java11-integration.cfg deleted file mode 100644 index 0e8d1a941..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/java11-integration.cfg +++ /dev/null @@ -1,42 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/java11014" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "ENABLE_FLAKYBOT" - value: {% if migrated_split_repo %}"false"{% else %}"true"{% endif %} -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - -{% if 'partials' in metadata - and 'integration_append' in metadata['partials'] -%} -{{ metadata['partials']['integration_append'] }} -{%- endif -%} diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/java11.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/java11.cfg deleted file mode 100644 index 709f2b4c7..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/java11.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java11" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/java7.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/java7.cfg deleted file mode 100644 index cb24f44ee..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/java7.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/java8-osx.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/java8-osx.cfg deleted file mode 100644 index d1b04075f..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/java8-osx.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "{{ metadata['repo']['repo_short'] }}/.kokoro/build.sh" diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/java8-win.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/java8-win.cfg deleted file mode 100644 index 15155be48..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/java8-win.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "{{ metadata['repo']['repo_short'] }}/.kokoro/build.bat" diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/java8.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/java8.cfg deleted file mode 100644 index 495cc7bac..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/java8.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "REPORT_COVERAGE" - value: "true" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg deleted file mode 100644 index bc9b4e2a8..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "samples" -} - -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-docs-samples-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-docs-samples-service-account" -} - -env_vars: { - key: "ENABLE_FLAKYBOT" - value: {% if migrated_split_repo %}"false"{% else %}"true"{% endif %} -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/populate-secrets.sh b/synthtool/gcp/templates/java_library/.kokoro/populate-secrets.sh deleted file mode 100755 index f52514257..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/populate-secrets.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# 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. - -set -eo pipefail - -function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;} -function msg { println "$*" >&2 ;} -function println { printf '%s\n' "$(now) $*" ;} - - -# Populates requested secrets set in SECRET_MANAGER_KEYS from service account: -# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com -SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" -msg "Creating folder on disk for secrets: ${SECRET_LOCATION}" -mkdir -p ${SECRET_LOCATION} -for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g") -do - msg "Retrieving secret ${key}" - docker run --entrypoint=gcloud \ - --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \ - gcr.io/google.com/cloudsdktool/cloud-sdk \ - secrets versions access latest \ - --project cloud-devrel-kokoro-resources \ - --secret ${key} > \ - "${SECRET_LOCATION}/${key}" - if [[ $? == 0 ]]; then - msg "Secret written to ${SECRET_LOCATION}/${key}" - else - msg "Error retrieving secret ${key}" - fi -done diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/clirr.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/clirr.cfg deleted file mode 100644 index ec572442e..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/clirr.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "clirr" -} \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/common.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/common.cfg deleted file mode 100644 index dd7dfe0ce..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/common.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.txt" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "{{ metadata['repo']['repo_short'] }}/.kokoro/trampoline.sh" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/{{ metadata['repo']['repo_short'] }}/.kokoro/build.sh" -} - -env_vars: { - key: "JOB_TYPE" - value: "test" -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/dependencies.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/dependencies.cfg deleted file mode 100644 index 0d5f62626..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/dependencies.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/{{ metadata['repo']['repo_short'] }}/.kokoro/dependencies.sh" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native-17.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native-17.cfg deleted file mode 100644 index fb5bb678f..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native-17.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3" -} - -env_vars: { - key: "JOB_TYPE" - value: "graalvm17" -} - -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native.cfg deleted file mode 100644 index 59efee340..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/graalvm-native.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3" -} - -env_vars: { - key: "JOB_TYPE" - value: "graalvm" -} - -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg deleted file mode 100644 index fcf3d08bf..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} - -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - -{% if 'partials' in metadata - and 'integration_append' in metadata['partials'] -%} -{{ metadata['partials']['integration_append'] }} -{%- endif -%} diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java11.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/java11.cfg deleted file mode 100644 index 709f2b4c7..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java11.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java11" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java7.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/java7.cfg deleted file mode 100644 index cb24f44ee..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java7.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8-osx.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8-osx.cfg deleted file mode 100644 index d1b04075f..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8-osx.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "{{ metadata['repo']['repo_short'] }}/.kokoro/build.sh" diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8-win.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8-win.cfg deleted file mode 100644 index 15155be48..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8-win.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "{{ metadata['repo']['repo_short'] }}/.kokoro/build.bat" diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8.cfg deleted file mode 100644 index 495cc7bac..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/java8.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "REPORT_COVERAGE" - value: "true" -} diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/linkage-monitor.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/linkage-monitor.cfg deleted file mode 100644 index a649e7bb1..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/linkage-monitor.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/{{ metadata['repo']['repo_short'] }}/.kokoro/linkage-monitor.sh" -} \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/lint.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/lint.cfg deleted file mode 100644 index 6d323c8ae..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/lint.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "lint" -} \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg deleted file mode 100644 index 01e096004..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "samples" -} - -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-docs-samples-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-docs-samples-service-account" -} \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/.kokoro/requirements.in b/synthtool/gcp/templates/java_library/.kokoro/requirements.in deleted file mode 100644 index 2092cc741..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/requirements.in +++ /dev/null @@ -1,6 +0,0 @@ -gcp-docuploader -gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x -wheel -setuptools -typing-extensions -click<8.1.0 \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/.kokoro/requirements.txt b/synthtool/gcp/templates/java_library/.kokoro/requirements.txt deleted file mode 100644 index c90ce2ca7..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/requirements.txt +++ /dev/null @@ -1,515 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --generate-hashes requirements.in -# -attrs==23.2.0 \ - --hash=sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 \ - --hash=sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1 - # via gcp-releasetool -backports-tarfile==1.2.0 \ - --hash=sha256:77e284d754527b01fb1e6fa8a1afe577858ebe4e9dad8919e34c862cb399bc34 \ - --hash=sha256:d75e02c268746e1b8144c278978b6e98e85de6ad16f8e4b0844a154557eca991 - # via jaraco-context -cachetools==5.4.0 \ - --hash=sha256:3ae3b49a3d5e28a77a0be2b37dbcb89005058959cb2323858c2657c4a8cab474 \ - --hash=sha256:b8adc2e7c07f105ced7bc56dbb6dfbe7c4a00acce20e2227b3f355be89bc6827 - # via google-auth -certifi==2024.7.4 \ - --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \ - --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90 - # via requests -cffi==1.16.0 \ - --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \ - --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \ - --hash=sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417 \ - --hash=sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab \ - --hash=sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520 \ - --hash=sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36 \ - --hash=sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743 \ - --hash=sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8 \ - --hash=sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed \ - --hash=sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684 \ - --hash=sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56 \ - --hash=sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324 \ - --hash=sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d \ - --hash=sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235 \ - --hash=sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e \ - --hash=sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088 \ - --hash=sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000 \ - --hash=sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7 \ - --hash=sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e \ - --hash=sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673 \ - --hash=sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c \ - --hash=sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe \ - --hash=sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2 \ - --hash=sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098 \ - --hash=sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8 \ - --hash=sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a \ - --hash=sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0 \ - --hash=sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b \ - --hash=sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896 \ - --hash=sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e \ - --hash=sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9 \ - --hash=sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2 \ - --hash=sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b \ - --hash=sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6 \ - --hash=sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404 \ - --hash=sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f \ - --hash=sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0 \ - --hash=sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4 \ - --hash=sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc \ - --hash=sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936 \ - --hash=sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba \ - --hash=sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872 \ - --hash=sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb \ - --hash=sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614 \ - --hash=sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1 \ - --hash=sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d \ - --hash=sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969 \ - --hash=sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b \ - --hash=sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4 \ - --hash=sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627 \ - --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \ - --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357 - # via cryptography -charset-normalizer==3.3.2 \ - --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \ - --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \ - --hash=sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786 \ - --hash=sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8 \ - --hash=sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09 \ - --hash=sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185 \ - --hash=sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574 \ - --hash=sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e \ - --hash=sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519 \ - --hash=sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898 \ - --hash=sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269 \ - --hash=sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3 \ - --hash=sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f \ - --hash=sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6 \ - --hash=sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8 \ - --hash=sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a \ - --hash=sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73 \ - --hash=sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc \ - --hash=sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714 \ - --hash=sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2 \ - --hash=sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc \ - --hash=sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce \ - --hash=sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d \ - --hash=sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e \ - --hash=sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6 \ - --hash=sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269 \ - --hash=sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96 \ - --hash=sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d \ - --hash=sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a \ - --hash=sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4 \ - --hash=sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77 \ - --hash=sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d \ - --hash=sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0 \ - --hash=sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed \ - --hash=sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068 \ - --hash=sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac \ - --hash=sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25 \ - --hash=sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 \ - --hash=sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab \ - --hash=sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26 \ - --hash=sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2 \ - --hash=sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db \ - --hash=sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f \ - --hash=sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5 \ - --hash=sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99 \ - --hash=sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c \ - --hash=sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d \ - --hash=sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811 \ - --hash=sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa \ - --hash=sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a \ - --hash=sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03 \ - --hash=sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b \ - --hash=sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04 \ - --hash=sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c \ - --hash=sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001 \ - --hash=sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458 \ - --hash=sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389 \ - --hash=sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99 \ - --hash=sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985 \ - --hash=sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537 \ - --hash=sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238 \ - --hash=sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f \ - --hash=sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d \ - --hash=sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796 \ - --hash=sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a \ - --hash=sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143 \ - --hash=sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8 \ - --hash=sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c \ - --hash=sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5 \ - --hash=sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5 \ - --hash=sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711 \ - --hash=sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4 \ - --hash=sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6 \ - --hash=sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c \ - --hash=sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7 \ - --hash=sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4 \ - --hash=sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b \ - --hash=sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae \ - --hash=sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12 \ - --hash=sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c \ - --hash=sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae \ - --hash=sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8 \ - --hash=sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887 \ - --hash=sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b \ - --hash=sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4 \ - --hash=sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f \ - --hash=sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5 \ - --hash=sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33 \ - --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \ - --hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561 - # via requests -click==8.0.4 \ - --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ - --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb - # via - # -r requirements.in - # gcp-docuploader - # gcp-releasetool -colorlog==6.8.2 \ - --hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \ - --hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33 - # via gcp-docuploader -cryptography==43.0.0 \ - --hash=sha256:0663585d02f76929792470451a5ba64424acc3cd5227b03921dab0e2f27b1709 \ - --hash=sha256:08a24a7070b2b6804c1940ff0f910ff728932a9d0e80e7814234269f9d46d069 \ - --hash=sha256:232ce02943a579095a339ac4b390fbbe97f5b5d5d107f8a08260ea2768be8cc2 \ - --hash=sha256:2905ccf93a8a2a416f3ec01b1a7911c3fe4073ef35640e7ee5296754e30b762b \ - --hash=sha256:299d3da8e00b7e2b54bb02ef58d73cd5f55fb31f33ebbf33bd00d9aa6807df7e \ - --hash=sha256:2c6d112bf61c5ef44042c253e4859b3cbbb50df2f78fa8fae6747a7814484a70 \ - --hash=sha256:31e44a986ceccec3d0498e16f3d27b2ee5fdf69ce2ab89b52eaad1d2f33d8778 \ - --hash=sha256:3d9a1eca329405219b605fac09ecfc09ac09e595d6def650a437523fcd08dd22 \ - --hash=sha256:3dcdedae5c7710b9f97ac6bba7e1052b95c7083c9d0e9df96e02a1932e777895 \ - --hash=sha256:47ca71115e545954e6c1d207dd13461ab81f4eccfcb1345eac874828b5e3eaaf \ - --hash=sha256:4a997df8c1c2aae1e1e5ac49c2e4f610ad037fc5a3aadc7b64e39dea42249431 \ - --hash=sha256:51956cf8730665e2bdf8ddb8da0056f699c1a5715648c1b0144670c1ba00b48f \ - --hash=sha256:5bcb8a5620008a8034d39bce21dc3e23735dfdb6a33a06974739bfa04f853947 \ - --hash=sha256:64c3f16e2a4fc51c0d06af28441881f98c5d91009b8caaff40cf3548089e9c74 \ - --hash=sha256:6e2b11c55d260d03a8cf29ac9b5e0608d35f08077d8c087be96287f43af3ccdc \ - --hash=sha256:7b3f5fe74a5ca32d4d0f302ffe6680fcc5c28f8ef0dc0ae8f40c0f3a1b4fca66 \ - --hash=sha256:844b6d608374e7d08f4f6e6f9f7b951f9256db41421917dfb2d003dde4cd6b66 \ - --hash=sha256:9a8d6802e0825767476f62aafed40532bd435e8a5f7d23bd8b4f5fd04cc80ecf \ - --hash=sha256:aae4d918f6b180a8ab8bf6511a419473d107df4dbb4225c7b48c5c9602c38c7f \ - --hash=sha256:ac1955ce000cb29ab40def14fd1bbfa7af2017cca696ee696925615cafd0dce5 \ - --hash=sha256:b88075ada2d51aa9f18283532c9f60e72170041bba88d7f37e49cbb10275299e \ - --hash=sha256:cb013933d4c127349b3948aa8aaf2f12c0353ad0eccd715ca789c8a0f671646f \ - --hash=sha256:cc70b4b581f28d0a254d006f26949245e3657d40d8857066c2ae22a61222ef55 \ - --hash=sha256:e9c5266c432a1e23738d178e51c2c7a5e2ddf790f248be939448c0ba2021f9d1 \ - --hash=sha256:ea9e57f8ea880eeea38ab5abf9fbe39f923544d7884228ec67d666abd60f5a47 \ - --hash=sha256:ee0c405832ade84d4de74b9029bedb7b31200600fa524d218fc29bfa371e97f5 \ - --hash=sha256:fdcb265de28585de5b859ae13e3846a8e805268a823a12a4da2597f1f5afc9f0 - # via - # gcp-releasetool - # secretstorage -gcp-docuploader==0.6.5 \ - --hash=sha256:30221d4ac3e5a2b9c69aa52fdbef68cc3f27d0e6d0d90e220fc024584b8d2318 \ - --hash=sha256:b7458ef93f605b9d46a4bf3a8dc1755dad1f31d030c8679edf304e343b347eea - # via -r requirements.in -gcp-releasetool==2.0.1 \ - --hash=sha256:34314a910c08e8911d9c965bd44f8f2185c4f556e737d719c33a41f6a610de96 \ - --hash=sha256:b0d5863c6a070702b10883d37c4bdfd74bf930fe417f36c0c965d3b7c779ae62 - # via -r requirements.in -google-api-core==2.19.1 \ - --hash=sha256:f12a9b8309b5e21d92483bbd47ce2c445861ec7d269ef6784ecc0ea8c1fa6125 \ - --hash=sha256:f4695f1e3650b316a795108a76a1c416e6afb036199d1c1f1f110916df479ffd - # via - # google-cloud-core - # google-cloud-storage -google-auth==2.32.0 \ - --hash=sha256:49315be72c55a6a37d62819e3573f6b416aca00721f7e3e31a008d928bf64022 \ - --hash=sha256:53326ea2ebec768070a94bee4e1b9194c9646ea0c2bd72422785bd0f9abfad7b - # via - # gcp-releasetool - # google-api-core - # google-cloud-core - # google-cloud-storage -google-cloud-core==2.4.1 \ - --hash=sha256:9b7749272a812bde58fff28868d0c5e2f585b82f37e09a1f6ed2d4d10f134073 \ - --hash=sha256:a9e6a4422b9ac5c29f79a0ede9485473338e2ce78d91f2370c01e730eab22e61 - # via google-cloud-storage -google-cloud-storage==2.18.0 \ - --hash=sha256:0aa3f7c57f3632f81b455d91558d2b27ada96eee2de3aaa17f689db1470d9578 \ - --hash=sha256:e8e1a9577952143c3fca8163005ecfadd2d70ec080fa158a8b305000e2c22fbb - # via gcp-docuploader -google-crc32c==1.5.0 \ - --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ - --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \ - --hash=sha256:02ebb8bf46c13e36998aeaad1de9b48f4caf545e91d14041270d9dca767b780c \ - --hash=sha256:07eb3c611ce363c51a933bf6bd7f8e3878a51d124acfc89452a75120bc436289 \ - --hash=sha256:1034d91442ead5a95b5aaef90dbfaca8633b0247d1e41621d1e9f9db88c36298 \ - --hash=sha256:116a7c3c616dd14a3de8c64a965828b197e5f2d121fedd2f8c5585c547e87b02 \ - --hash=sha256:19e0a019d2c4dcc5e598cd4a4bc7b008546b0358bd322537c74ad47a5386884f \ - --hash=sha256:1c7abdac90433b09bad6c43a43af253e688c9cfc1c86d332aed13f9a7c7f65e2 \ - --hash=sha256:1e986b206dae4476f41bcec1faa057851f3889503a70e1bdb2378d406223994a \ - --hash=sha256:272d3892a1e1a2dbc39cc5cde96834c236d5327e2122d3aaa19f6614531bb6eb \ - --hash=sha256:278d2ed7c16cfc075c91378c4f47924c0625f5fc84b2d50d921b18b7975bd210 \ - --hash=sha256:2ad40e31093a4af319dadf503b2467ccdc8f67c72e4bcba97f8c10cb078207b5 \ - --hash=sha256:2e920d506ec85eb4ba50cd4228c2bec05642894d4c73c59b3a2fe20346bd00ee \ - --hash=sha256:3359fc442a743e870f4588fcf5dcbc1bf929df1fad8fb9905cd94e5edb02e84c \ - --hash=sha256:37933ec6e693e51a5b07505bd05de57eee12f3e8c32b07da7e73669398e6630a \ - --hash=sha256:398af5e3ba9cf768787eef45c803ff9614cc3e22a5b2f7d7ae116df8b11e3314 \ - --hash=sha256:3b747a674c20a67343cb61d43fdd9207ce5da6a99f629c6e2541aa0e89215bcd \ - --hash=sha256:461665ff58895f508e2866824a47bdee72497b091c730071f2b7575d5762ab65 \ - --hash=sha256:4c6fdd4fccbec90cc8a01fc00773fcd5fa28db683c116ee3cb35cd5da9ef6c37 \ - --hash=sha256:5829b792bf5822fd0a6f6eb34c5f81dd074f01d570ed7f36aa101d6fc7a0a6e4 \ - --hash=sha256:596d1f98fc70232fcb6590c439f43b350cb762fb5d61ce7b0e9db4539654cc13 \ - --hash=sha256:5ae44e10a8e3407dbe138984f21e536583f2bba1be9491239f942c2464ac0894 \ - --hash=sha256:635f5d4dd18758a1fbd1049a8e8d2fee4ffed124462d837d1a02a0e009c3ab31 \ - --hash=sha256:64e52e2b3970bd891309c113b54cf0e4384762c934d5ae56e283f9a0afcd953e \ - --hash=sha256:66741ef4ee08ea0b2cc3c86916ab66b6aef03768525627fd6a1b34968b4e3709 \ - --hash=sha256:67b741654b851abafb7bc625b6d1cdd520a379074e64b6a128e3b688c3c04740 \ - --hash=sha256:6ac08d24c1f16bd2bf5eca8eaf8304812f44af5cfe5062006ec676e7e1d50afc \ - --hash=sha256:6f998db4e71b645350b9ac28a2167e6632c239963ca9da411523bb439c5c514d \ - --hash=sha256:72218785ce41b9cfd2fc1d6a017dc1ff7acfc4c17d01053265c41a2c0cc39b8c \ - --hash=sha256:74dea7751d98034887dbd821b7aae3e1d36eda111d6ca36c206c44478035709c \ - --hash=sha256:759ce4851a4bb15ecabae28f4d2e18983c244eddd767f560165563bf9aefbc8d \ - --hash=sha256:77e2fd3057c9d78e225fa0a2160f96b64a824de17840351b26825b0848022906 \ - --hash=sha256:7c074fece789b5034b9b1404a1f8208fc2d4c6ce9decdd16e8220c5a793e6f61 \ - --hash=sha256:7c42c70cd1d362284289c6273adda4c6af8039a8ae12dc451dcd61cdabb8ab57 \ - --hash=sha256:7f57f14606cd1dd0f0de396e1e53824c371e9544a822648cd76c034d209b559c \ - --hash=sha256:83c681c526a3439b5cf94f7420471705bbf96262f49a6fe546a6db5f687a3d4a \ - --hash=sha256:8485b340a6a9e76c62a7dce3c98e5f102c9219f4cfbf896a00cf48caf078d438 \ - --hash=sha256:84e6e8cd997930fc66d5bb4fde61e2b62ba19d62b7abd7a69920406f9ecca946 \ - --hash=sha256:89284716bc6a5a415d4eaa11b1726d2d60a0cd12aadf5439828353662ede9dd7 \ - --hash=sha256:8b87e1a59c38f275c0e3676fc2ab6d59eccecfd460be267ac360cc31f7bcde96 \ - --hash=sha256:8f24ed114432de109aa9fd317278518a5af2d31ac2ea6b952b2f7782b43da091 \ - --hash=sha256:98cb4d057f285bd80d8778ebc4fde6b4d509ac3f331758fb1528b733215443ae \ - --hash=sha256:998679bf62b7fb599d2878aa3ed06b9ce688b8974893e7223c60db155f26bd8d \ - --hash=sha256:9ba053c5f50430a3fcfd36f75aff9caeba0440b2d076afdb79a318d6ca245f88 \ - --hash=sha256:9c99616c853bb585301df6de07ca2cadad344fd1ada6d62bb30aec05219c45d2 \ - --hash=sha256:a1fd716e7a01f8e717490fbe2e431d2905ab8aa598b9b12f8d10abebb36b04dd \ - --hash=sha256:a2355cba1f4ad8b6988a4ca3feed5bff33f6af2d7f134852cf279c2aebfde541 \ - --hash=sha256:b1f8133c9a275df5613a451e73f36c2aea4fe13c5c8997e22cf355ebd7bd0728 \ - --hash=sha256:b8667b48e7a7ef66afba2c81e1094ef526388d35b873966d8a9a447974ed9178 \ - --hash=sha256:ba1eb1843304b1e5537e1fca632fa894d6f6deca8d6389636ee5b4797affb968 \ - --hash=sha256:be82c3c8cfb15b30f36768797a640e800513793d6ae1724aaaafe5bf86f8f346 \ - --hash=sha256:c02ec1c5856179f171e032a31d6f8bf84e5a75c45c33b2e20a3de353b266ebd8 \ - --hash=sha256:c672d99a345849301784604bfeaeba4db0c7aae50b95be04dd651fd2a7310b93 \ - --hash=sha256:c6c777a480337ac14f38564ac88ae82d4cd238bf293f0a22295b66eb89ffced7 \ - --hash=sha256:cae0274952c079886567f3f4f685bcaf5708f0a23a5f5216fdab71f81a6c0273 \ - --hash=sha256:cd67cf24a553339d5062eff51013780a00d6f97a39ca062781d06b3a73b15462 \ - --hash=sha256:d3515f198eaa2f0ed49f8819d5732d70698c3fa37384146079b3799b97667a94 \ - --hash=sha256:d5280312b9af0976231f9e317c20e4a61cd2f9629b7bfea6a693d1878a264ebd \ - --hash=sha256:de06adc872bcd8c2a4e0dc51250e9e65ef2ca91be023b9d13ebd67c2ba552e1e \ - --hash=sha256:e1674e4307fa3024fc897ca774e9c7562c957af85df55efe2988ed9056dc4e57 \ - --hash=sha256:e2096eddb4e7c7bdae4bd69ad364e55e07b8316653234a56552d9c988bd2d61b \ - --hash=sha256:e560628513ed34759456a416bf86b54b2476c59144a9138165c9a1575801d0d9 \ - --hash=sha256:edfedb64740750e1a3b16152620220f51d58ff1b4abceb339ca92e934775c27a \ - --hash=sha256:f13cae8cc389a440def0c8c52057f37359014ccbc9dc1f0827936bcd367c6100 \ - --hash=sha256:f314013e7dcd5cf45ab1945d92e713eec788166262ae8deb2cfacd53def27325 \ - --hash=sha256:f583edb943cf2e09c60441b910d6a20b4d9d626c75a36c8fcac01a6c96c01183 \ - --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \ - --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4 - # via - # google-cloud-storage - # google-resumable-media -google-resumable-media==2.7.1 \ - --hash=sha256:103ebc4ba331ab1bfdac0250f8033627a2cd7cde09e7ccff9181e31ba4315b2c \ - --hash=sha256:eae451a7b2e2cdbaaa0fd2eb00cc8a1ee5e95e16b55597359cbc3d27d7d90e33 - # via google-cloud-storage -googleapis-common-protos==1.63.2 \ - --hash=sha256:27a2499c7e8aff199665b22741997e485eccc8645aa9176c7c988e6fae507945 \ - --hash=sha256:27c5abdffc4911f28101e635de1533fb4cfd2c37fbaa9174587c799fac90aa87 - # via google-api-core -idna==3.7 \ - --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ - --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 - # via requests -importlib-metadata==8.2.0 \ - --hash=sha256:11901fa0c2f97919b288679932bb64febaeacf289d18ac84dd68cb2e74213369 \ - --hash=sha256:72e8d4399996132204f9a16dcc751af254a48f8d1b20b9ff0f98d4a8f901e73d - # via keyring -jaraco-classes==3.4.0 \ - --hash=sha256:47a024b51d0239c0dd8c8540c6c7f484be3b8fcf0b2d85c13825780d3b3f3acd \ - --hash=sha256:f662826b6bed8cace05e7ff873ce0f9283b5c924470fe664fff1c2f00f581790 - # via keyring -jaraco-context==5.3.0 \ - --hash=sha256:3e16388f7da43d384a1a7cd3452e72e14732ac9fe459678773a3608a812bf266 \ - --hash=sha256:c2f67165ce1f9be20f32f650f25d8edfc1646a8aeee48ae06fb35f90763576d2 - # via keyring -jaraco-functools==4.0.2 \ - --hash=sha256:3460c74cd0d32bf82b9576bbb3527c4364d5b27a21f5158a62aed6c4b42e23f5 \ - --hash=sha256:c9d16a3ed4ccb5a889ad8e0b7a343401ee5b2a71cee6ed192d3f68bc351e94e3 - # via keyring -jeepney==0.8.0 \ - --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ - --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 - # via - # keyring - # secretstorage -jinja2==3.1.4 \ - --hash=sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 \ - --hash=sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d - # via gcp-releasetool -keyring==25.2.1 \ - --hash=sha256:2458681cdefc0dbc0b7eb6cf75d0b98e59f9ad9b2d4edd319d18f68bdca95e50 \ - --hash=sha256:daaffd42dbda25ddafb1ad5fec4024e5bbcfe424597ca1ca452b299861e49f1b - # via gcp-releasetool -markupsafe==2.1.5 \ - --hash=sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf \ - --hash=sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff \ - --hash=sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f \ - --hash=sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3 \ - --hash=sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532 \ - --hash=sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f \ - --hash=sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617 \ - --hash=sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df \ - --hash=sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4 \ - --hash=sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906 \ - --hash=sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f \ - --hash=sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4 \ - --hash=sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8 \ - --hash=sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371 \ - --hash=sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2 \ - --hash=sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465 \ - --hash=sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52 \ - --hash=sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6 \ - --hash=sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169 \ - --hash=sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad \ - --hash=sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2 \ - --hash=sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0 \ - --hash=sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029 \ - --hash=sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f \ - --hash=sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a \ - --hash=sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced \ - --hash=sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5 \ - --hash=sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c \ - --hash=sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf \ - --hash=sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9 \ - --hash=sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb \ - --hash=sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad \ - --hash=sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3 \ - --hash=sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1 \ - --hash=sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46 \ - --hash=sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc \ - --hash=sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a \ - --hash=sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee \ - --hash=sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900 \ - --hash=sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5 \ - --hash=sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea \ - --hash=sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f \ - --hash=sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5 \ - --hash=sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e \ - --hash=sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a \ - --hash=sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f \ - --hash=sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50 \ - --hash=sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a \ - --hash=sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b \ - --hash=sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4 \ - --hash=sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff \ - --hash=sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2 \ - --hash=sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46 \ - --hash=sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b \ - --hash=sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf \ - --hash=sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5 \ - --hash=sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5 \ - --hash=sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab \ - --hash=sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd \ - --hash=sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68 - # via jinja2 -more-itertools==10.3.0 \ - --hash=sha256:e5d93ef411224fbcef366a6e8ddc4c5781bc6359d43412a65dd5964e46111463 \ - --hash=sha256:ea6a02e24a9161e51faad17a8782b92a0df82c12c1c8886fec7f0c3fa1a1b320 - # via - # jaraco-classes - # jaraco-functools -packaging==24.1 \ - --hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \ - --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124 - # via gcp-releasetool -proto-plus==1.24.0 \ - --hash=sha256:30b72a5ecafe4406b0d339db35b56c4059064e69227b8c3bda7462397f966445 \ - --hash=sha256:402576830425e5f6ce4c2a6702400ac79897dab0b4343821aa5188b0fab81a12 - # via google-api-core -protobuf==5.27.3 \ - --hash=sha256:043853dcb55cc262bf2e116215ad43fa0859caab79bb0b2d31b708f128ece035 \ - --hash=sha256:16ddf3f8c6c41e1e803da7abea17b1793a97ef079a912e42351eabb19b2cffe7 \ - --hash=sha256:68248c60d53f6168f565a8c76dc58ba4fa2ade31c2d1ebdae6d80f969cdc2d4f \ - --hash=sha256:82460903e640f2b7e34ee81a947fdaad89de796d324bcbc38ff5430bcdead82c \ - --hash=sha256:8572c6533e544ebf6899c360e91d6bcbbee2549251643d32c52cf8a5de295ba5 \ - --hash=sha256:a55c48f2a2092d8e213bd143474df33a6ae751b781dd1d1f4d953c128a415b25 \ - --hash=sha256:af7c0b7cfbbb649ad26132e53faa348580f844d9ca46fd3ec7ca48a1ea5db8a1 \ - --hash=sha256:b8a994fb3d1c11156e7d1e427186662b64694a62b55936b2b9348f0a7c6625ce \ - --hash=sha256:c2a105c24f08b1e53d6c7ffe69cb09d0031512f0b72f812dd4005b8112dbe91e \ - --hash=sha256:c84eee2c71ed83704f1afbf1a85c3171eab0fd1ade3b399b3fad0884cbcca8bf \ - --hash=sha256:dcb307cd4ef8fec0cf52cb9105a03d06fbb5275ce6d84a6ae33bc6cf84e0a07b - # via - # gcp-docuploader - # gcp-releasetool - # google-api-core - # googleapis-common-protos - # proto-plus -pyasn1==0.6.0 \ - --hash=sha256:3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c \ - --hash=sha256:cca4bb0f2df5504f02f6f8a775b6e416ff9b0b3b16f7ee80b5a3153d9b804473 - # via - # pyasn1-modules - # rsa -pyasn1-modules==0.4.0 \ - --hash=sha256:831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6 \ - --hash=sha256:be04f15b66c206eed667e0bb5ab27e2b1855ea54a842e5037738099e8ca4ae0b - # via google-auth -pycparser==2.22 \ - --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \ - --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc - # via cffi -pyjwt==2.9.0 \ - --hash=sha256:3b02fb0f44517787776cf48f2ae25d8e14f300e6d7545a4315cee571a415e850 \ - --hash=sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c - # via gcp-releasetool -pyperclip==1.9.0 \ - --hash=sha256:b7de0142ddc81bfc5c7507eea19da920b92252b548b96186caf94a5e2527d310 - # via gcp-releasetool -python-dateutil==2.9.0.post0 \ - --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \ - --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427 - # via gcp-releasetool -requests==2.32.3 \ - --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \ - --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6 - # via - # gcp-releasetool - # google-api-core - # google-cloud-storage -rsa==4.9 \ - --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ - --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 - # via google-auth -secretstorage==3.3.3 \ - --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ - --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 - # via keyring -six==1.16.0 \ - --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ - --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 - # via - # gcp-docuploader - # python-dateutil -typing-extensions==4.12.2 \ - --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \ - --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8 - # via -r requirements.in -urllib3==2.2.2 \ - --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \ - --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168 - # via requests -wheel==0.43.0 \ - --hash=sha256:465ef92c69fa5c5da2d1cf8ac40559a8c940886afcef87dcf14b9470862f1d85 \ - --hash=sha256:55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81 - # via -r requirements.in -zipp==3.19.2 \ - --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \ - --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c - # via importlib-metadata - -# WARNING: The following packages were not pinned, but pip requires them to be -# pinned when the requirements file includes hashes and the requirement is not -# satisfied by a package already installed. Consider using the --allow-unsafe flag. -# setuptools diff --git a/synthtool/gcp/templates/java_library/.kokoro/trampoline.sh b/synthtool/gcp/templates/java_library/.kokoro/trampoline.sh deleted file mode 100644 index 8b69b793c..000000000 --- a/synthtool/gcp/templates/java_library/.kokoro/trampoline.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# 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. -# 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. -set -eo pipefail -# Always run the cleanup script, regardless of the success of bouncing into -# the container. -function cleanup() { - chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh - ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh - echo "cleanup"; -} -trap cleanup EXIT - -$(dirname $0)/populate-secrets.sh # Secret Manager secrets. -python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" diff --git a/synthtool/gcp/templates/java_library/CODE_OF_CONDUCT.md b/synthtool/gcp/templates/java_library/CODE_OF_CONDUCT.md deleted file mode 100644 index 2add2547a..000000000 --- a/synthtool/gcp/templates/java_library/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,94 +0,0 @@ - -# Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of -experience, education, socio-economic status, nationality, personal appearance, -race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, or to ban temporarily or permanently any -contributor for other behaviors that they deem inappropriate, threatening, -offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -This Code of Conduct also applies outside the project spaces when the Project -Steward has a reasonable belief that an individual's behavior may have a -negative impact on the project or its community. - -## Conflict Resolution - -We do not believe that all conflict is bad; healthy debate and disagreement -often yield positive results. However, it is never okay to be disrespectful or -to engage in behavior that violates the project’s code of conduct. - -If you see someone violating the code of conduct, you are encouraged to address -the behavior directly with those involved. Many issues can be resolved quickly -and easily, and this gives people more control over the outcome of their -dispute. If you are unable to resolve the matter for any reason, or if the -behavior is threatening or harassing, report it. We are dedicated to providing -an environment where participants feel welcome and safe. - -Reports should be directed to *googleapis-stewards@google.com*, the -Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to -receive and address reported violations of the code of conduct. They will then -work with a committee consisting of representatives from the Open Source -Programs Office and the Google Open Source Strategy team. If for any reason you -are uncomfortable reaching out to the Project Steward, please email -opensource@google.com. - -We will investigate every complaint, but you may not receive a direct response. -We will use our discretion in determining when and how to follow up on reported -incidents, which may range from not taking action to permanent expulsion from -the project and project-sponsored spaces. We will notify the accused of the -report and provide them an opportunity to discuss it before any action is taken. -The identity of the reporter will be omitted from the details of the report -supplied to the accused. In potentially harmful situations, such as ongoing -harassment or threats to anyone's safety, we may take action without notice. - -## Attribution - -This Code of Conduct is adapted from the Contributor Covenant, version 1.4, -available at -https://www.contributor-covenant.org/version/1/4/code-of-conduct.html \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/CONTRIBUTING.md b/synthtool/gcp/templates/java_library/CONTRIBUTING.md deleted file mode 100644 index b65dd279c..000000000 --- a/synthtool/gcp/templates/java_library/CONTRIBUTING.md +++ /dev/null @@ -1,92 +0,0 @@ -# How to Contribute - -We'd love to accept your patches and contributions to this project. There are -just a few small guidelines you need to follow. - -## Contributor License Agreement - -Contributions to this project must be accompanied by a Contributor License -Agreement. You (or your employer) retain the copyright to your contribution; -this simply gives us permission to use and redistribute your contributions as -part of the project. Head over to to see -your current agreements on file or to sign a new one. - -You generally only need to submit a CLA once, so if you've already submitted one -(even if it was for a different project), you probably don't need to do it -again. - -## Code reviews - -All submissions, including submissions by project members, require review. We -use GitHub pull requests for this purpose. Consult -[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more -information on using pull requests. - -## Community Guidelines - -This project follows -[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). - -## Building the project - -To build, package, and run all unit tests run the command - -``` -mvn clean verify -``` - -### Running Integration tests - -To include integration tests when building the project, you need access to -a GCP Project with a valid service account. - -For instructions on how to generate a service account and corresponding -credentials JSON see: [Creating a Service Account][1]. - -Then run the following to build, package, run all unit tests and run all -integration tests. - -```bash -export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json -mvn -Penable-integration-tests clean verify -``` - -## Code Samples - -All code samples must be in compliance with the [java sample formatting guide][3]. -Code Samples must be bundled in separate Maven modules. - -The samples must be separate from the primary project for a few reasons: -1. Primary projects have a minimum Java version of Java 8 whereas samples can have - Java version of Java 11. Due to this we need the ability to - selectively exclude samples from a build run. -2. Many code samples depend on external GCP services and need - credentials to access the service. -3. Code samples are not released as Maven artifacts and must be excluded from - release builds. - -### Building - -```bash -mvn clean verify -``` - -Some samples require access to GCP services and require a service account: - -```bash -export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json -mvn clean verify -``` - -### Code Formatting - -Code in this repo is formatted with -[google-java-format](https://github.com/google/google-java-format). -To run formatting on your project, you can run: -``` -mvn com.coveo:fmt-maven-plugin:format -``` - -[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account -[2]: https://maven.apache.org/settings.html#Active_Profiles -[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md \ No newline at end of file diff --git a/synthtool/gcp/templates/java_library/LICENSE b/synthtool/gcp/templates/java_library/LICENSE deleted file mode 100644 index 261eeb9e9..000000000 --- a/synthtool/gcp/templates/java_library/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff --git a/synthtool/gcp/templates/java_library/README.md b/synthtool/gcp/templates/java_library/README.md deleted file mode 100644 index e849a9714..000000000 --- a/synthtool/gcp/templates/java_library/README.md +++ /dev/null @@ -1,288 +0,0 @@ -{% set group_id = metadata['repo']['distribution_name'].split(':')|first -%} -{% set artifact_id = metadata['repo']['distribution_name'].split(':')|last -%} -{% set repo_short = metadata['repo']['repo'].split('/')|last -%} - -# Google {{ metadata['repo']['name_pretty'] }} Client for Java - -Java idiomatic client for [{{metadata['repo']['name_pretty']}}][product-docs]. - -[![Maven][maven-version-image]][maven-version-link] -![Stability][stability-image] - -- [Product Documentation][product-docs] -- [Client Library Documentation][javadocs] -{% if 'partials' in metadata and metadata['partials']['deprecation_warning'] -%} -{{ metadata['partials']['deprecation_warning'] }} -{% elif metadata['repo']['release_level'] in ['preview'] %} -> Note: This client is a work-in-progress, and may occasionally -> make backwards-incompatible changes. -{% endif %} -{% if migrated_split_repo %} -:bus: In October 2022, this library has moved to -[google-cloud-java/{{ metadata['repo']['repo_short'] }}]( -https://github.com/googleapis/google-cloud-java/tree/main/{{ metadata['repo']['repo_short'] }}). -This repository will be archived in the future. -Future releases will appear in the new repository (https://github.com/googleapis/google-cloud-java/releases). -The Maven artifact coordinates (`{{ group_id }}:{{ artifact_id }}`) remain the same. -{% endif %} -## Quickstart - -{% if 'snippets' in metadata and metadata['snippets'][metadata['repo']['api_shortname'] + '_install_with_bom'] -%} -If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: - -```xml -{{ metadata['snippets'][metadata['repo']['api_shortname'] + '_install_with_bom'] }} -``` - -If you are using Maven without the BOM, add this to your dependencies: -{% elif monorepo %} -If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: - -```xml - - - - com.google.cloud - libraries-bom - {{ metadata['latest_bom_version'] }} - pom - import - - - - - - - {{ group_id }} - {{ artifact_id }} - -``` - -If you are using Maven without the BOM, add this to your dependencies: -{% else %} -If you are using Maven, add this to your pom.xml file: -{% endif %} - - -```xml -{% if 'snippets' in metadata and metadata['snippets'][metadata['repo']['api_shortname'] + '_install_without_bom'] -%} -{{ metadata['snippets'][metadata['repo']['api_shortname'] + '_install_without_bom'] }} -{% else -%} - - {{ group_id }} - {{ artifact_id }} - {{ metadata['latest_version'] }} - -{% endif -%} -``` - -{% if 'snippets' in metadata and metadata['snippets'][metadata['repo']['api_shortname'] + '_install_with_bom'] -%} -If you are using Gradle 5.x or later, add this to your dependencies: - -```Groovy -implementation platform('com.google.cloud:libraries-bom:{{metadata['latest_bom_version']}}') - -implementation '{{ group_id }}:{{ artifact_id }}' -``` -{% endif -%} - -If you are using Gradle without BOM, add this to your dependencies: - -```Groovy -implementation '{{ group_id }}:{{ artifact_id }}:{{ metadata['latest_version'] }}' -``` - -If you are using SBT, add this to your dependencies: - -```Scala -libraryDependencies += "{{ group_id }}" % "{{ artifact_id }}" % "{{ metadata['latest_version'] }}" -``` - - -## Authentication - -See the [Authentication][authentication] section in the base directory's README. - -## Authorization - -The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired {{metadata['repo']['name_pretty']}} APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the {{metadata['repo']['name_pretty']}} API calls. - -## Getting Started - -### Prerequisites - -You will need a [Google Cloud Platform Console][developer-console] project with the {{metadata['repo']['name_pretty']}} [API enabled][enable-api]. -{% if metadata['repo']['requires_billing'] %}You will need to [enable billing][enable-billing] to use Google {{metadata['repo']['name_pretty']}}.{% endif %} -[Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by -[installing the Google Cloud Command Line Interface][cloud-cli] and running the following commands in command line: -`gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. - -### Installation and setup - -You'll need to obtain the `{{ artifact_id }}` library. See the [Quickstart](#quickstart) section -to add `{{ artifact_id }}` as a dependency in your code. - -## About {{metadata['repo']['name_pretty']}} - -{% if 'partials' in metadata and metadata['partials']['about'] -%} -{{ metadata['partials']['about'] }} -{% else %} -[{{ metadata['repo']['name_pretty'] }}][product-docs] {{ metadata['repo']['api_description'] }} - -See the [{{metadata['repo']['name_pretty']}} client library docs][javadocs] to learn how to -use this {{metadata['repo']['name_pretty']}} Client Library. -{% endif %} - -{% if 'partials' in metadata and metadata['partials']['custom_content'] -%} -{{ metadata['partials']['custom_content'] }} -{% endif %} - -{% if metadata['samples']|length %} -## Samples - -Samples are in the [`samples/`](https://github.com/{{ metadata['repo']['repo'] }}/tree/main/samples) directory. - -| Sample | Source Code | Try it | -| --------------------------- | --------------------------------- | ------ | -{% for sample in metadata['samples'] %}| {{ sample.title }} | [source code](https://github.com/{{ metadata['repo']['repo'] }}/blob/main/{{ sample.file }}) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/{{ metadata['repo']['repo'] }}&page=editor&open_in_editor={{ sample.file }}) | -{% endfor %} -{% endif %} - -## Troubleshooting - -To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting]. - -{% if metadata['repo']['transport'] -%} -## Transport - -{% if metadata['repo']['transport'] == 'grpc' -%} -{{metadata['repo']['name_pretty']}} uses gRPC for the transport layer. -{% elif metadata['repo']['transport'] == 'http' -%} -{{metadata['repo']['name_pretty']}} uses HTTP/JSON for the transport layer. -{% elif metadata['repo']['transport'] == 'both' -%} -{{metadata['repo']['name_pretty']}} uses both gRPC and HTTP/JSON for the transport layer. -{% endif %} -{% endif -%} - -## Supported Java Versions - -Java {{ metadata['min_java_version'] }} or above is required for using this client. - -Google's Java client libraries, -[Google Cloud Client Libraries][cloudlibs] -and -[Google Cloud API Libraries][apilibs], -follow the -[Oracle Java SE support roadmap][oracle] -(see the Oracle Java SE Product Releases section). - -### For new development - -In general, new feature development occurs with support for the lowest Java -LTS version covered by Oracle's Premier Support (which typically lasts 5 years -from initial General Availability). If the minimum required JVM for a given -library is changed, it is accompanied by a [semver][semver] major release. - -Java 11 and (in September 2021) Java 17 are the best choices for new -development. - -### Keeping production systems current - -Google tests its client libraries with all current LTS versions covered by -Oracle's Extended Support (which typically lasts 8 years from initial -General Availability). - -#### Legacy support - -Google's client libraries support legacy versions of Java runtimes with long -term stable libraries that don't receive feature updates on a best efforts basis -as it may not be possible to backport all patches. - -Google provides updates on a best efforts basis to apps that continue to use -Java 7, though apps might need to upgrade to current versions of the library -that supports their JVM. - -#### Where to find specific information - -The latest versions and the supported Java versions are identified on -the individual GitHub repository `github.com/GoogleAPIs/java-SERVICENAME` -and on [google-cloud-java][g-c-j]. - -## Versioning - -{% if 'partials' in metadata and metadata['partials']['versioning'] -%} -{{ metadata['partials']['versioning'] }} -{% else %} -This library follows [Semantic Versioning](http://semver.org/). - -{% if metadata['repo']['release_level'] in ['preview'] %} -It is currently in major version zero (``0.y.z``), which means that anything may change at any time -and the public API should not be considered stable. -{% endif %}{% endif %} - -## Contributing - -{% if 'partials' in metadata and metadata['partials']['contributing'] -%} -{{ metadata['partials']['contributing'] }} -{% else %} -Contributions to this library are always welcome and highly encouraged. - -See [CONTRIBUTING][contributing] for more information how to get started. - -Please note that this project is released with a Contributor Code of Conduct. By participating in -this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more -information. -{% endif %} - -## License - -Apache 2.0 - See [LICENSE][license] for more information. - -## CI Status - -Java Version | Status ------------- | ------{% if metadata['min_java_version'] <= 7 %} -Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1]{% endif %} -Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2] -Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3] -Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4] -Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] - -Java is a registered trademark of Oracle and/or its affiliates. - -[product-docs]: {{metadata['repo']['product_documentation']}} -[javadocs]: {{metadata['repo']['client_documentation']}} -[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java7.svg -[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java7.html -[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java8.svg -[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java8.html -[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java8-osx.svg -[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java8-osx.html -[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java8-win.svg -[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java8-win.html -[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java11.svg -[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/{{ repo_short }}/java11.html -[stability-image]: https://img.shields.io/badge/stability-{% if metadata['repo']['release_level'] == 'stable' %}stable-green{% elif metadata['repo']['release_level'] == 'preview' %}preview-yellow{% else %}unknown-red{% endif %} -[maven-version-image]: https://img.shields.io/maven-central/v/{{ group_id }}/{{ artifact_id }}.svg -[maven-version-link]: https://central.sonatype.com/artifact/{{ group_id }}/{{ artifact_id }}/{{ metadata['latest_version'] }} -[authentication]: https://github.com/googleapis/google-cloud-java#authentication -[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes -[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles -[iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy -[developer-console]: https://console.developers.google.com/ -[create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects -[cloud-cli]: https://cloud.google.com/cli -[troubleshooting]: https://github.com/googleapis/google-cloud-java/blob/main/TROUBLESHOOTING.md -[contributing]: https://github.com/{{metadata['repo']['repo']}}/blob/main/CONTRIBUTING.md -[code-of-conduct]: https://github.com/{{metadata['repo']['repo']}}/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/{{metadata['repo']['repo']}}/blob/main/LICENSE -{% if metadata['repo']['requires_billing'] %}[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing{% endif %} -{% if metadata['repo']['api_id'] %}[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid={{ metadata['repo']['api_id'] }}{% endif %} -[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png - -[semver]: https://semver.org/ -[cloudlibs]: https://cloud.google.com/apis/docs/client-libraries-explained -[apilibs]: https://cloud.google.com/apis/docs/client-libraries-explained#google_api_client_libraries -[oracle]: https://www.oracle.com/java/technologies/java-se-support-roadmap.html -[g-c-j]: http://github.com/googleapis/google-cloud-java diff --git a/synthtool/gcp/templates/java_library/SECURITY.md b/synthtool/gcp/templates/java_library/SECURITY.md deleted file mode 100644 index 8b58ae9c0..000000000 --- a/synthtool/gcp/templates/java_library/SECURITY.md +++ /dev/null @@ -1,7 +0,0 @@ -# Security Policy - -To report a security issue, please use [g.co/vulnz](https://g.co/vulnz). - -The Google Security Team will respond within 5 working days of your report on g.co/vulnz. - -We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue. diff --git a/synthtool/gcp/templates/java_library/java.header b/synthtool/gcp/templates/java_library/java.header deleted file mode 100644 index d0970ba7d..000000000 --- a/synthtool/gcp/templates/java_library/java.header +++ /dev/null @@ -1,15 +0,0 @@ -^/\*$ -^ \* Copyright \d\d\d\d,? Google (Inc\.|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$ -^ \*$ -^ \*[ ]+https?://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\.$ -^ \*/$ diff --git a/synthtool/gcp/templates/java_library/license-checks.xml b/synthtool/gcp/templates/java_library/license-checks.xml deleted file mode 100644 index 6597fced8..000000000 --- a/synthtool/gcp/templates/java_library/license-checks.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/synthtool/gcp/templates/java_library/renovate.json b/synthtool/gcp/templates/java_library/renovate.json deleted file mode 100644 index 0b4423db9..000000000 --- a/synthtool/gcp/templates/java_library/renovate.json +++ /dev/null @@ -1,104 +0,0 @@ -{% if migrated_split_repo %}{ - "enabled": false, -{% else %}{ -{% endif %} "extends": [ - ":separateMajorReleases", - ":combinePatchMinorReleases", - ":ignoreUnstable", - ":prImmediately", - ":updateNotScheduled", - ":automergeDisabled", - ":ignoreModulesAndTests", - ":maintainLockFilesDisabled", - ":autodetectPinVersions" - ], - "ignorePaths": [ - ".kokoro/requirements.txt", - ".github/workflows/approve-readme.yaml", - ".github/workflows/ci.yaml", - ".github/workflows/renovate_config_check.yaml", - ".github/workflows/samples.yaml" - ], - "customManagers": [ - { - "customType": "regex", - "fileMatch": [ - "^.kokoro/presubmit/graalvm-native.*.cfg$" - ], - "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""], - "depNameTemplate": "com.google.cloud:sdk-platform-java-config", - "datasourceTemplate": "maven" - }, - { - "customType": "regex", - "fileMatch": [ - "^.github/workflows/unmanaged_dependency_check.yaml$" - ], - "matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"], - "depNameTemplate": "com.google.cloud:sdk-platform-java-config", - "datasourceTemplate": "maven" - } - ], - "packageRules": [ - { - "packagePatterns": [ - "^com.google.guava:" - ], - "versionScheme": "docker" - }, - { - "packagePatterns": [ - "*" - ], - "semanticCommitType": "deps", - "semanticCommitScope": null - }, - { - "packagePatterns": [ - "^org.apache.maven", - "^org.jacoco:", - "^org.codehaus.mojo:", - "^org.sonatype.plugins:", - "^com.coveo:", - "^com.google.cloud:google-cloud-shared-config" - ], - "semanticCommitType": "build", - "semanticCommitScope": "deps" - }, - { - "packagePatterns": [ - "^{{metadata['repo']['distribution_name']}}", - "^com.google.cloud:libraries-bom", - "^com.google.cloud.samples:shared-configuration" - ], - "semanticCommitType": "chore", - "semanticCommitScope": "deps" - }, - { - "packagePatterns": [ - "^junit:junit", - "^com.google.truth:truth", - "^org.mockito:mockito-core", - "^org.objenesis:objenesis", - "^com.google.cloud:google-cloud-conformance-tests", - "^org.graalvm.buildtools:junit-platform-native" - ], - "semanticCommitType": "test", - "semanticCommitScope": "deps" - }, - { - "packagePatterns": [ - "^com.google.cloud:google-cloud-" - ], - "ignoreUnstable": false - }, - { - "packagePatterns": [ - "^com.fasterxml.jackson.core" - ], - "groupName": "jackson dependencies" - } - ], - "semanticCommits": true, - "dependencyDashboard": true -} diff --git a/synthtool/gcp/templates/java_library/samples/install-without-bom/pom.xml b/synthtool/gcp/templates/java_library/samples/install-without-bom/pom.xml deleted file mode 100644 index 110250d00..000000000 --- a/synthtool/gcp/templates/java_library/samples/install-without-bom/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ -{% set group_id = metadata['repo']['distribution_name'].split(':')|first -%} -{% set artifact_id = metadata['repo']['distribution_name'].split(':')|last -%} - - - 4.0.0 - com.google.cloud - {{metadata['repo']['name']}}-install-without-bom - jar - Google {{metadata['repo']['name_pretty']}} Install Without Bom - https://github.com/{{metadata['repo']['repo']}} - - - - com.google.cloud.samples - shared-configuration - 1.2.0 - - - - 1.8 - 1.8 - UTF-8 - - - - - - - {{ group_id }} - {{ artifact_id }} - {{ metadata['latest_version'] }} - - - - - junit - junit - 4.13.2 - test - - - com.google.truth - truth - 1.1.3 - test - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - add-snippets-source - - add-source - - - - ../snippets/src/main/java - - - - - add-snippets-tests - - add-test-source - - - - ../snippets/src/test/java - - - - - - - - diff --git a/synthtool/gcp/templates/java_library/samples/pom.xml b/synthtool/gcp/templates/java_library/samples/pom.xml deleted file mode 100644 index 0f1142999..000000000 --- a/synthtool/gcp/templates/java_library/samples/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-{{metadata['repo']['name']}}-samples - 0.0.1-SNAPSHOT - pom - Google {{metadata['repo']['name_pretty']}} Samples Parent - https://github.com/{{metadata['repo']['repo']}} - - Java idiomatic client for Google Cloud Platform services. - - - - - com.google.cloud.samples - shared-configuration - 1.2.0 - - - - 1.8 - 1.8 - UTF-8 - - - - install-without-bom - snapshot - snippets - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - true - - - - - diff --git a/synthtool/gcp/templates/java_library/samples/snapshot/pom.xml b/synthtool/gcp/templates/java_library/samples/snapshot/pom.xml deleted file mode 100644 index 62a83b440..000000000 --- a/synthtool/gcp/templates/java_library/samples/snapshot/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ -{% set group_id = metadata['repo']['distribution_name'].split(':')|first -%} -{% set artifact_id = metadata['repo']['distribution_name'].split(':')|last -%} - - - 4.0.0 - com.google.cloud - {{metadata['repo']['name']}}-snapshot - jar - Google {{metadata['repo']['name_pretty']}} Snapshot Samples - https://github.com/{{metadata['repo']['repo']}} - - - - com.google.cloud.samples - shared-configuration - 1.2.0 - - - - 1.8 - 1.8 - UTF-8 - - - - - - {{ group_id }} - {{ artifact_id }} - {{ metadata['latest_version'] }} - - - - - junit - junit - 4.13.2 - test - - - com.google.truth - truth - 1.1.3 - test - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - add-snippets-source - - add-source - - - - ../snippets/src/main/java - - - - - add-snippets-tests - - add-test-source - - - - ../snippets/src/test/java - - - - - - - - diff --git a/synthtool/gcp/templates/java_library/samples/snippets/pom.xml b/synthtool/gcp/templates/java_library/samples/snippets/pom.xml deleted file mode 100644 index c6b998150..000000000 --- a/synthtool/gcp/templates/java_library/samples/snippets/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ -{% set group_id = metadata['repo']['distribution_name'].split(':')|first -%} -{% set artifact_id = metadata['repo']['distribution_name'].split(':')|last -%} - - - 4.0.0 - com.google.cloud - {{metadata['repo']['name']}}-snippets - jar - Google {{metadata['repo']['name_pretty']}} Snippets - https://github.com/{{metadata['repo']['repo']}} - - - - com.google.cloud.samples - shared-configuration - 1.2.0 - - - - 1.8 - 1.8 - UTF-8 - - - - - - {{ group_id }} - {{ artifact_id }} - {{ metadata['latest_version'] }} - - - - junit - junit - 4.13.2 - test - - - com.google.truth - truth - 1.1.3 - test - - - diff --git a/synthtool/languages/java.py b/synthtool/languages/java.py deleted file mode 100644 index eb8c40dc5..000000000 --- a/synthtool/languages/java.py +++ /dev/null @@ -1,872 +0,0 @@ -# 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. -# You may obtain a copy of the License at -# -# https://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. - -import glob -import os -import xml.etree.ElementTree as ET -import re -import requests -import yaml -import synthtool as s -import synthtool.gcp as gcp -from synthtool import cache, shell -from synthtool.gcp import common, partials, pregenerated, samples, snippets -from synthtool.log import logger -from pathlib import Path -from typing import Any, Optional, Dict, Iterable, List -from datetime import date - -JAR_DOWNLOAD_URL = "https://github.com/google/google-java-format/releases/download/google-java-format-{version}/google-java-format-{version}-all-deps.jar" -DEFAULT_FORMAT_VERSION = "1.7" -CURRENT_YEAR = date.today().year -GOOD_LICENSE = f"""/* - * Copyright {CURRENT_YEAR} 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 - * - * https://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. - */ -""" -PROTOBUF_HEADER = "// Generated by the protocol buffer compiler. DO NOT EDIT!" -BAD_LICENSE = """/\\* - \\* Copyright \\d{4} 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. - \\*/ -""" -DEFAULT_MIN_SUPPORTED_JAVA_VERSION = 8 -METADATA = "metadata" -LIBRARIES_BOM_VERSION = "libraries_bom_version" -LIBRARIES_BOM_VERSION_ENV_KEY = "SYNTHTOOL_LIBRARIES_BOM_VERSION" -LIBRARY_VERSION = "library_version" -LIBRARY_VERSION_ENV_KEY = "SYNTHTOOL_LIBRARY_VERSION" - - -def format_code( - path: str, version: str = DEFAULT_FORMAT_VERSION, times: int = 2 -) -> None: - """ - Runs the google-java-format jar against all .java files found within the - provided path. - """ - jar_name = f"google-java-format-{version}.jar" - jar = cache.get_cache_dir() / jar_name - if not jar.exists(): - _download_formatter(version, jar) - - # Find all .java files in path and run the formatter on them - files = list(glob.iglob(os.path.join(path, "**/*.java"), recursive=True)) - - # Run the formatter as a jar file - logger.info("Running java formatter on {} files".format(len(files))) - for _ in range(times): - shell.run(["java", "-jar", str(jar), "--replace"] + files) - - -def _download_formatter(version: str, dest: Path) -> None: - logger.info("Downloading java formatter") - url = JAR_DOWNLOAD_URL.format(version=version) - response = requests.get(url) - response.raise_for_status() - with open(dest, "wb") as fh: - fh.write(response.content) - - -HEADER_REGEX = re.compile("\\* Copyright \\d{4} Google LLC") - - -def _file_has_header(path: Path) -> bool: - """Return true if the file already contains a license header.""" - with open(path, "rt") as fp: - for line in fp: - if HEADER_REGEX.search(line): - return True - return False - - -def _filter_no_header(paths: Iterable[Path]) -> Iterable[Path]: - """Return a subset of files that do not already have a header.""" - for path in paths: - anchor = Path(path.anchor) - remainder = str(path.relative_to(path.anchor)) - for file in anchor.glob(remainder): - if not _file_has_header(file): - yield file - - -def fix_proto_headers(proto_root: Path) -> None: - """Helper to ensure that generated proto classes have appropriate license headers. - - If the file does not already contain a license header, inject one at the top of the file. - Some resource name classes may contain malformed license headers. In those cases, replace - those with our standard license header. - """ - s.replace( - _filter_no_header([proto_root / "src/**/*.java"]), - PROTOBUF_HEADER, - f"{GOOD_LICENSE}{PROTOBUF_HEADER}", - ) - # https://github.com/googleapis/gapic-generator/issues/3074 - s.replace( - [proto_root / "src/**/*Name.java", proto_root / "src/**/*Names.java"], - BAD_LICENSE, - GOOD_LICENSE, - ) - - -def fix_grpc_headers(grpc_root: Path, package_name: str = "unused") -> None: - """Helper to ensure that generated grpc stub classes have appropriate license headers. - - If the file does not already contain a license header, inject one at the top of the file. - """ - s.replace( - _filter_no_header([grpc_root / "src/**/*.java"]), - "^package (.*);", - f"{GOOD_LICENSE}package \\1;", - ) - - -def latest_maven_version(group_id: str, artifact_id: str) -> Optional[str]: - """Helper function to find the latest released version of a Maven artifact. - - Fetches metadata from Maven Central and parses out the latest released - version. - - Args: - group_id (str): The groupId of the Maven artifact - artifact_id (str): The artifactId of the Maven artifact - - Returns: - The latest version of the artifact as a string or None - """ - group_path = "/".join(group_id.split(".")) - url = ( - f"https://repo1.maven.org/maven2/{group_path}/{artifact_id}/maven-metadata.xml" - ) - response = requests.get(url) - if response.status_code >= 400: - return "0.0.0" - - return version_from_maven_metadata(response.text) - - -def version_from_maven_metadata(metadata: str) -> Optional[str]: - """Helper function to parse the latest released version from the Maven - metadata XML file. - - Args: - metadata (str): The XML contents of the Maven metadata file - - Returns: - The latest version of the artifact as a string or None - """ - root = ET.fromstring(metadata) - latest = root.find("./versioning/latest") - if latest is not None: - return latest.text - - return None - - -def _common_generation( - service: str, - version: str, - library: Path, - package_pattern: str, - suffix: str = "", - destination_name: str = None, - cloud_api: bool = True, - diregapic: bool = False, - preserve_gapic: bool = False, -): - """Helper function to execution the common generation cleanup actions. - - Fixes headers for protobuf classes and generated gRPC stub services. Copies - code and samples to their final destinations by convention. Runs the code - formatter on the generated code. - - Args: - service (str): Name of the service. - version (str): Service API version. - library (Path): Path to the temp directory with the generated library. - package_pattern (str): Package name template for fixing file headers. - suffix (str, optional): Suffix that the generated library folder. The - artman output differs from bazel's output directory. Defaults to "". - destination_name (str, optional): Override the service name for the - destination of the output code. Defaults to the service name. - preserve_gapic (bool, optional): Whether to preserve the gapic directory - prefix. Default False. - """ - - if destination_name is None: - destination_name = service - - cloud_prefix = "cloud-" if cloud_api else "" - package_name = package_pattern.format(service=service, version=version) - fix_proto_headers( - library / f"proto-google-{cloud_prefix}{service}-{version}{suffix}" - ) - fix_grpc_headers( - library / f"grpc-google-{cloud_prefix}{service}-{version}{suffix}", package_name - ) - - if preserve_gapic: - s.copy( - [library / f"gapic-google-{cloud_prefix}{service}-{version}{suffix}/src"], - f"gapic-google-{cloud_prefix}{destination_name}-{version}/src", - required=True, - ) - else: - s.copy( - [library / f"gapic-google-{cloud_prefix}{service}-{version}{suffix}/src"], - f"google-{cloud_prefix}{destination_name}/src", - required=True, - ) - - s.copy( - [library / f"grpc-google-{cloud_prefix}{service}-{version}{suffix}/src"], - f"grpc-google-{cloud_prefix}{destination_name}-{version}/src", - # For REST-only clients, like java-compute, gRPC artifact does not exist - required=(not diregapic), - ) - s.copy( - [library / f"proto-google-{cloud_prefix}{service}-{version}{suffix}/src"], - f"proto-google-{cloud_prefix}{destination_name}-{version}/src", - required=True, - ) - - if preserve_gapic: - format_code(f"gapic-google-{cloud_prefix}{destination_name}-{version}/src") - else: - format_code(f"google-{cloud_prefix}{destination_name}/src") - format_code(f"grpc-google-{cloud_prefix}{destination_name}-{version}/src") - format_code(f"proto-google-{cloud_prefix}{destination_name}-{version}/src") - - -def gapic_library( - service: str, - version: str, - config_pattern: str = "/google/cloud/{service}/artman_{service}_{version}.yaml", - package_pattern: str = "com.google.cloud.{service}.{version}", - gapic: gcp.GAPICGenerator = None, - destination_name: str = None, - diregapic: bool = False, - preserve_gapic: bool = False, - **kwargs, -) -> Path: - """Generate a Java library using the gapic-generator via artman via Docker. - - Generates code into a temp directory, fixes missing header fields, and - copies into the expected locations. - - Args: - service (str): Name of the service. - version (str): Service API version. - config_pattern (str, optional): Path template to artman config YAML - file. Defaults to "/google/cloud/{service}/artman_{service}_{version}.yaml" - package_pattern (str, optional): Package name template for fixing file - headers. Defaults to "com.google.cloud.{service}.{version}". - gapic (GAPICGenerator, optional): Generator instance. - destination_name (str, optional): Override the service name for the - destination of the output code. Defaults to the service name. - preserve_gapic (bool, optional): Whether to preserve the gapic directory - prefix. Default False. - **kwargs: Additional options for gapic.java_library() - - Returns: - The path to the temp directory containing the generated client. - """ - if gapic is None: - gapic = gcp.GAPICGenerator() - - library = gapic.java_library( - service=service, - version=version, - config_path=config_pattern.format(service=service, version=version), - artman_output_name="", - include_samples=True, - diregapic=diregapic, - **kwargs, - ) - - _common_generation( - service=service, - version=version, - library=library, - package_pattern=package_pattern, - destination_name=destination_name, - diregapic=diregapic, - preserve_gapic=preserve_gapic, - ) - - return library - - -def bazel_library( - service: str, - version: str, - package_pattern: str = "com.google.cloud.{service}.{version}", - gapic: gcp.GAPICBazel = None, - destination_name: str = None, - cloud_api: bool = True, - diregapic: bool = False, - preserve_gapic: bool = False, - **kwargs, -) -> Path: - """Generate a Java library using the gapic-generator via bazel. - - Generates code into a temp directory, fixes missing header fields, and - copies into the expected locations. - - Args: - service (str): Name of the service. - version (str): Service API version. - package_pattern (str, optional): Package name template for fixing file - headers. Defaults to "com.google.cloud.{service}.{version}". - gapic (GAPICBazel, optional): Generator instance. - destination_name (str, optional): Override the service name for the - destination of the output code. Defaults to the service name. - preserve_gapic (bool, optional): Whether to preserve the gapic directory - prefix. Default False. - **kwargs: Additional options for gapic.java_library() - - Returns: - The path to the temp directory containing the generated client. - """ - if gapic is None: - gapic = gcp.GAPICBazel() - - library = gapic.java_library( - service=service, version=version, diregapic=diregapic, **kwargs - ) - - _common_generation( - service=service, - version=version, - library=library / f"google-cloud-{service}-{version}-java", - package_pattern=package_pattern, - suffix="-java", - destination_name=destination_name, - cloud_api=cloud_api, - diregapic=diregapic, - preserve_gapic=preserve_gapic, - ) - - return library - - -def pregenerated_library( - path: str, - service: str, - version: str, - destination_name: str = None, - cloud_api: bool = True, -) -> Path: - """Generate a Java library using the gapic-generator via bazel. - - Generates code into a temp directory, fixes missing header fields, and - copies into the expected locations. - - Args: - path (str): Path in googleapis-gen to un-versioned generated code. - service (str): Name of the service. - version (str): Service API version. - destination_name (str, optional): Override the service name for the - destination of the output code. Defaults to the service name. - cloud_api (bool, optional): Whether or not this is a cloud API (for naming) - - Returns: - The path to the temp directory containing the generated client. - """ - generator = pregenerated.Pregenerated() - library = generator.generate(path) - - cloud_prefix = "cloud-" if cloud_api else "" - _common_generation( - service=service, - version=version, - library=library / f"google-{cloud_prefix}{service}-{version}-java", - package_pattern="unused", - suffix="-java", - destination_name=destination_name, - cloud_api=cloud_api, - ) - - return library - - -def _merge_release_please(destination_text: str): - config = yaml.safe_load(destination_text) - if "handleGHRelease" in config: - return destination_text - - config["handleGHRelease"] = True - - if "branches" in config: - for branch in config["branches"]: - branch["handleGHRelease"] = True - return yaml.dump(config) - - -def _merge_common_templates( - source_text: str, destination_text: str, file_path: Path -) -> str: - # keep any existing pom.xml - if file_path.match("pom.xml") or file_path.match("sync-repo-settings.yaml"): - logger.debug(f"existing pom file found ({file_path}) - keeping the existing") - return destination_text - - if file_path.match("release-please.yml"): - return _merge_release_please(destination_text) - - # by default return the newly generated content - return source_text - - -def _common_template_metadata() -> Dict[str, Any]: - metadata = {} # type: Dict[str, Any] - repo_metadata = common._load_repo_metadata() - if repo_metadata: - metadata["repo"] = repo_metadata - group_id, artifact_id = repo_metadata["distribution_name"].split(":") - - metadata["latest_version"] = latest_maven_version( - group_id=group_id, artifact_id=artifact_id - ) - - metadata["latest_bom_version"] = latest_maven_version( - group_id="com.google.cloud", - artifact_id="libraries-bom", - ) - - metadata["samples"] = samples.all_samples(["samples/**/src/main/java/**/*.java"]) - metadata["snippets"] = snippets.all_snippets( - ["samples/**/src/main/java/**/*.java", "samples/**/pom.xml"] - ) - if repo_metadata and "min_java_version" in repo_metadata: - metadata["min_java_version"] = repo_metadata["min_java_version"] - else: - metadata["min_java_version"] = DEFAULT_MIN_SUPPORTED_JAVA_VERSION - - return metadata - - -def common_templates( - excludes: List[str] = None, - template_path: Optional[Path] = None, - **kwargs, -) -> None: - """Generate common templates for a Java Library - - Fetches information about the repository from the .repo-metadata.json file, - information about the latest artifact versions and copies the files into - their expected location. - - Args: - :param excludes: List of template paths to ignore - :param template_path: - :param kwargs: Additional options for CommonTemplates.java_library() - """ - if not excludes: - excludes = [] - metadata = _common_template_metadata() - kwargs[METADATA] = metadata - - # Generate flat to tell this repository is a split repo that have migrated - # to monorepo. The owlbot.py in the monorepo sets monorepo=True. - monorepo = kwargs.get("monorepo", False) - kwargs["monorepo"] = monorepo - split_repo = not monorepo - repo_metadata = metadata["repo"] - repo_short = repo_metadata["repo_short"] - if os.getenv(LIBRARIES_BOM_VERSION_ENV_KEY, default=None) is not None: - kwargs[METADATA][LIBRARIES_BOM_VERSION] = os.getenv( - LIBRARIES_BOM_VERSION_ENV_KEY - ) - kwargs[METADATA][LIBRARY_VERSION] = os.getenv(LIBRARY_VERSION_ENV_KEY) - # Special libraries that are not GAPIC_AUTO but in the monorepo - special_libs_in_monorepo = [ - "java-translate", - "java-dns", - "java-notification", - "java-resourcemanager", - ] - kwargs["migrated_split_repo"] = split_repo and ( - repo_metadata["library_type"] == "GAPIC_AUTO" - or (repo_short and repo_short in special_libs_in_monorepo) - ) - logger.info( - "monorepo: {}, split_repo: {}, library_type: {}," - " repo_short: {}, migrated_split_repo: {}".format( - monorepo, - split_repo, - repo_metadata["library_type"], - repo_short, - kwargs["migrated_split_repo"], - ) - ) - - templates = gcp.CommonTemplates(template_path=template_path).java_library(**kwargs) - - # skip README generation on Kokoro (autosynth) - if os.environ.get("KOKORO_ROOT") is not None: - # README.md is now synthesized separately. This prevents synthtool from deleting the - # README as it's no longer generated here. - excludes.append("README.md") - - s.copy([templates], excludes=excludes, merge=_merge_common_templates) - - -def custom_templates(files: List[str], **kwargs) -> None: - """Generate custom template files - - Fetches information about the repository from the .repo-metadata.json file, - information about the latest artifact versions and copies the files into - their expected location. - - Args: - files (List[str], optional): List of template paths to include - **kwargs: Additional options for CommonTemplates.render() - """ - kwargs["metadata"] = _common_template_metadata() - kwargs["metadata"]["partials"] = partials.load_partials() - for file in files: - template = gcp.CommonTemplates().render(file, **kwargs) - s.copy([template]) - - -def remove_method(filename: str, signature: str): - """Helper to remove an entire method. - - Goes line-by-line to detect the start of the block. Determines - the end of the block by a closing brace at the same indentation - level. This requires the file to be correctly formatted. - - Example: consider the following class: - - class Example { - public void main(String[] args) { - System.out.println("Hello World"); - } - - public String foo() { - return "bar"; - } - } - - To remove the `main` method above, use: - - remove_method('path/to/file', 'public void main(String[] args)') - - Args: - filename (str): Path to source file - signature (str): Full signature of the method to remove. Example: - `public void main(String[] args)`. - """ - lines = [] - leading_regex = None - with open(filename, "r") as fp: - line = fp.readline() - while line: - # for each line, try to find the matching - regex = re.compile("(\\s*)" + re.escape(signature) + ".*") - match = regex.match(line) - if match: - leading_regex = re.compile(match.group(1) + "}") - line = fp.readline() - continue - - # not in a ignore block - preserve the line - if not leading_regex: - lines.append(line) - line = fp.readline() - continue - - # detect the closing tag based on the leading spaces - match = leading_regex.match(line) - if match: - # block is closed, resume capturing content - leading_regex = None - - line = fp.readline() - - with open(filename, "w") as fp: - for line in lines: - # print(line) - fp.write(line) - - -def copy_and_rename_method(filename: str, signature: str, before: str, after: str): - """Helper to make a copy an entire method and rename it. - - Goes line-by-line to detect the start of the block. Determines - the end of the block by a closing brace at the same indentation - level. This requires the file to be correctly formatted. - The method is copied over and renamed in the method signature. - The calls to both methods are separate and unaffected. - - Example: consider the following class: - - class Example { - public void main(String[] args) { - System.out.println("Hello World"); - } - - public String foo() { - return "bar"; - } - } - - To copy and rename the `main` method above, use: - - copy_and_rename_method('path/to/file', 'public void main(String[] args)', - 'main', 'foo1') - - Args: - filename (str): Path to source file - signature (str): Full signature of the method to remove. Example: - `public void main(String[] args)`. - before (str): name of the method to be copied - after (str): new name of the copied method - """ - lines = [] - method = [] - leading_regex = None - with open(filename, "r") as fp: - line = fp.readline() - while line: - # for each line, try to find the matching - regex = re.compile("(\\s*)" + re.escape(signature) + ".*") - match = regex.match(line) - if match: - leading_regex = re.compile(match.group(1) + "}") - lines.append(line) - method.append(line.replace(before, after)) - line = fp.readline() - continue - - lines.append(line) - # not in a ignore block - preserve the line - if leading_regex: - method.append(line) - else: - line = fp.readline() - continue - - # detect the closing tag based on the leading spaces - match = leading_regex.match(line) - if match: - # block is closed, resume capturing content - leading_regex = None - lines.append("\n") - lines.extend(method) - - line = fp.readline() - - with open(filename, "w") as fp: - for line in lines: - # print(line) - fp.write(line) - - -def add_javadoc(filename: str, signature: str, javadoc_type: str, content: List[str]): - """Helper to add a javadoc annoatation to a method. - - Goes line-by-line to detect the start of the block. - Then finds the existing method comment (if it exists). If the - comment already exists, it will append the javadoc annotation - to the javadoc block. Otherwise, it will create a new javadoc - comment block. - - Example: consider the following class: - - class Example { - public void main(String[] args) { - System.out.println("Hello World"); - } - - public String foo() { - return "bar"; - } - } - - To add a javadoc annotation the `main` method above, use: - - add_javadoc('path/to/file', 'public void main(String[] args)', - 'deprecated', 'Please use foo instead.') - - Args: - filename (str): Path to source file - signature (str): Full signature of the method to remove. Example: - `public void main(String[] args)`. - javadoc_type (str): The type of javadoc annotation. Example: `deprecated`. - content (List[str]): The javadoc lines - """ - lines: List[str] = [] - annotations: List[str] = [] - with open(filename, "r") as fp: - line = fp.readline() - while line: - # for each line, try to find the matching - regex = re.compile("(\\s*)" + re.escape(signature) + ".*") - match = regex.match(line) - if match: - leading_spaces = len(line) - len(line.lstrip()) - indent = leading_spaces * " " - last_line = lines.pop() - while last_line.lstrip() and last_line.lstrip()[0] == "@": - annotations.append(last_line) - last_line = lines.pop() - if last_line.strip() == "*/": - first = True - for content_line in content: - if first: - lines.append( - indent - + " * @" - + javadoc_type - + " " - + content_line - + "\n" - ) - first = False - else: - lines.append(indent + " * " + content_line + "\n") - lines.append(last_line) - else: - lines.append(last_line) - lines.append(indent + "/**\n") - first = True - for content_line in content: - if first: - lines.append( - indent - + " * @" - + javadoc_type - + " " - + content_line - + "\n" - ) - first = False - else: - lines.append(indent + " * " + content_line + "\n") - lines.append(indent + " */\n") - lines.extend(annotations[::-1]) - lines.append(line) - line = fp.readline() - - with open(filename, "w") as fp: - for line in lines: - # print(line) - fp.write(line) - - -def annotate_method(filename: str, signature: str, annotation: str): - """Helper to add an annotation to a method. - - Goes line-by-line to detect the start of the block. - Then adds the annotation above the found method signature. - - Example: consider the following class: - - class Example { - public void main(String[] args) { - System.out.println("Hello World"); - } - - public String foo() { - return "bar"; - } - } - - To add an annotation the `main` method above, use: - - annotate_method('path/to/file', 'public void main(String[] args)', - '@Generated()') - - Args: - filename (str): Path to source file - signature (str): Full signature of the method to remove. Example: - `public void main(String[] args)`. - annotation (str): Full annotation. Example: `@Deprecated` - """ - lines: List[str] = [] - with open(filename, "r") as fp: - line = fp.readline() - while line: - # for each line, try to find the matching - regex = re.compile("(\\s*)" + re.escape(signature) + ".*") - match = regex.match(line) - if match: - leading_spaces = len(line) - len(line.lstrip()) - indent = leading_spaces * " " - lines.append(indent + annotation + "\n") - lines.append(line) - line = fp.readline() - - with open(filename, "w") as fp: - for line in lines: - # print(line) - fp.write(line) - - -def deprecate_method(filename: str, signature: str, alternative: str): - """Helper to deprecate a method. - - Goes line-by-line to detect the start of the block. - Then adds the deprecation comment before the method signature. - The @Deprecation annotation is also added. - - Example: consider the following class: - - class Example { - public void main(String[] args) { - System.out.println("Hello World"); - } - - public String foo() { - return "bar"; - } - } - - To deprecate the `main` method above, use: - - deprecate_method('path/to/file', 'public void main(String[] args)', - DEPRECATION_WARNING.format(new_method="foo")) - - Args: - filename (str): Path to source file - signature (str): Full signature of the method to remove. Example: - `public void main(String[] args)`. - alternative: DEPRECATION WARNING: multiline javadoc comment with user - specified leading open/close comment tags - """ - add_javadoc(filename, signature, "deprecated", alternative.splitlines()) - annotate_method(filename, signature, "@Deprecated") diff --git a/tests/fixtures/java_templates/defaults_test/.repo-metadata.json b/tests/fixtures/java_templates/defaults_test/.repo-metadata.json deleted file mode 100644 index 840e69ca7..000000000 --- a/tests/fixtures/java_templates/defaults_test/.repo-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "api_shortname": "cloudasset", - "name_pretty": "Cloud Asset Inventory", - "product_documentation": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", - "api_reference": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", - "api_description": "provides inventory services based on a time series database. This database keeps a five week history of Google Cloud asset metadata. The Cloud Asset Inventory export service allows you to export all asset metadata at a certain timestamp or export event change history during a timeframe.", - "client_documentation": "https://googleapis.dev/java/google-cloud-asset/latest/index.html", - "issue_tracker": "https://issuetracker.google.com/issues/new?component=187210&template=0", - "release_level": "stable", - "transport": "grpc", - "requires_billing": true, - "language": "java", - "repo": "googleapis/java-asset", - "repo_short": "java-asset", - "distribution_name": "com.google.cloud:google-cloud-asset", - "library_type": "GAPIC_AUTO", - "api_id": "cloudasset.googleapis.com" -} \ No newline at end of file diff --git a/tests/fixtures/java_templates/defaults_test/java11-integration-golden.cfg b/tests/fixtures/java_templates/defaults_test/java11-integration-golden.cfg deleted file mode 100644 index 5d14a782d..000000000 --- a/tests/fixtures/java_templates/defaults_test/java11-integration-golden.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/java11014" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "ENABLE_FLAKYBOT" - value: "false" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - diff --git a/tests/fixtures/java_templates/defaults_test/nightly-integration-golden.cfg b/tests/fixtures/java_templates/defaults_test/nightly-integration-golden.cfg deleted file mode 100644 index f1ccba78f..000000000 --- a/tests/fixtures/java_templates/defaults_test/nightly-integration-golden.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "ENABLE_FLAKYBOT" - value: "false" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - diff --git a/tests/fixtures/java_templates/defaults_test/presubmit-integration-golden.cfg b/tests/fixtures/java_templates/defaults_test/presubmit-integration-golden.cfg deleted file mode 100644 index 5864c603e..000000000 --- a/tests/fixtures/java_templates/defaults_test/presubmit-integration-golden.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} - -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - diff --git a/tests/fixtures/java_templates/partials_test/.integration-partials.yaml b/tests/fixtures/java_templates/partials_test/.integration-partials.yaml deleted file mode 100644 index bbc59eabd..000000000 --- a/tests/fixtures/java_templates/partials_test/.integration-partials.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integration_append: | - env_vars: { - key: "INTEGRATION_TEST_ARGS" - value: "-P bigtable-emulator-it" - } - - env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" - } diff --git a/tests/fixtures/java_templates/partials_test/.repo-metadata.json b/tests/fixtures/java_templates/partials_test/.repo-metadata.json deleted file mode 100644 index 840e69ca7..000000000 --- a/tests/fixtures/java_templates/partials_test/.repo-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "api_shortname": "cloudasset", - "name_pretty": "Cloud Asset Inventory", - "product_documentation": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", - "api_reference": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", - "api_description": "provides inventory services based on a time series database. This database keeps a five week history of Google Cloud asset metadata. The Cloud Asset Inventory export service allows you to export all asset metadata at a certain timestamp or export event change history during a timeframe.", - "client_documentation": "https://googleapis.dev/java/google-cloud-asset/latest/index.html", - "issue_tracker": "https://issuetracker.google.com/issues/new?component=187210&template=0", - "release_level": "stable", - "transport": "grpc", - "requires_billing": true, - "language": "java", - "repo": "googleapis/java-asset", - "repo_short": "java-asset", - "distribution_name": "com.google.cloud:google-cloud-asset", - "library_type": "GAPIC_AUTO", - "api_id": "cloudasset.googleapis.com" -} \ No newline at end of file diff --git a/tests/fixtures/java_templates/partials_test/java11-integration-golden.cfg b/tests/fixtures/java_templates/partials_test/java11-integration-golden.cfg deleted file mode 100644 index b83c0b7e8..000000000 --- a/tests/fixtures/java_templates/partials_test/java11-integration-golden.cfg +++ /dev/null @@ -1,47 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/java11014" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "ENABLE_FLAKYBOT" - value: "false" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - -env_vars: { - key: "INTEGRATION_TEST_ARGS" - value: "-P bigtable-emulator-it" -} - -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} diff --git a/tests/fixtures/java_templates/partials_test/nightly-integration-golden.cfg b/tests/fixtures/java_templates/partials_test/nightly-integration-golden.cfg deleted file mode 100644 index 85c9fdae3..000000000 --- a/tests/fixtures/java_templates/partials_test/nightly-integration-golden.cfg +++ /dev/null @@ -1,47 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "java-docs-samples-testing" -} - -env_vars: { - key: "ENABLE_FLAKYBOT" - value: "false" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - -env_vars: { - key: "INTEGRATION_TEST_ARGS" - value: "-P bigtable-emulator-it" -} - -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} diff --git a/tests/fixtures/java_templates/partials_test/presubmit-integration-golden.cfg b/tests/fixtures/java_templates/partials_test/presubmit-integration-golden.cfg deleted file mode 100644 index f2a119bdc..000000000 --- a/tests/fixtures/java_templates/partials_test/presubmit-integration-golden.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "integration" -} - -# TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/java-it-service-account" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "java-it-service-account" -} - -env_vars: { - key: "INTEGRATION_TEST_ARGS" - value: "-P bigtable-emulator-it" -} - -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} diff --git a/tests/fixtures/java_templates/release-please-update/.github/release-please.yml b/tests/fixtures/java_templates/release-please-update/.github/release-please.yml deleted file mode 100644 index 807174cce..000000000 --- a/tests/fixtures/java_templates/release-please-update/.github/release-please.yml +++ /dev/null @@ -1,6 +0,0 @@ -releaseType: java-yoshi -bumpMinorPreMajor: true -branches: -- releaseType: java-lts - bumpMinorPreMajor: true - branch: 1.127.12-sp \ No newline at end of file diff --git a/tests/fixtures/java_templates/release-please-update/.repo-metadata.json b/tests/fixtures/java_templates/release-please-update/.repo-metadata.json deleted file mode 100644 index 840e69ca7..000000000 --- a/tests/fixtures/java_templates/release-please-update/.repo-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "api_shortname": "cloudasset", - "name_pretty": "Cloud Asset Inventory", - "product_documentation": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", - "api_reference": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", - "api_description": "provides inventory services based on a time series database. This database keeps a five week history of Google Cloud asset metadata. The Cloud Asset Inventory export service allows you to export all asset metadata at a certain timestamp or export event change history during a timeframe.", - "client_documentation": "https://googleapis.dev/java/google-cloud-asset/latest/index.html", - "issue_tracker": "https://issuetracker.google.com/issues/new?component=187210&template=0", - "release_level": "stable", - "transport": "grpc", - "requires_billing": true, - "language": "java", - "repo": "googleapis/java-asset", - "repo_short": "java-asset", - "distribution_name": "com.google.cloud:google-cloud-asset", - "library_type": "GAPIC_AUTO", - "api_id": "cloudasset.googleapis.com" -} \ No newline at end of file diff --git a/tests/fixtures/java_templates/standard/.repo-metadata.json b/tests/fixtures/java_templates/standard/.repo-metadata.json deleted file mode 100644 index 840e69ca7..000000000 --- a/tests/fixtures/java_templates/standard/.repo-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "api_shortname": "cloudasset", - "name_pretty": "Cloud Asset Inventory", - "product_documentation": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", - "api_reference": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", - "api_description": "provides inventory services based on a time series database. This database keeps a five week history of Google Cloud asset metadata. The Cloud Asset Inventory export service allows you to export all asset metadata at a certain timestamp or export event change history during a timeframe.", - "client_documentation": "https://googleapis.dev/java/google-cloud-asset/latest/index.html", - "issue_tracker": "https://issuetracker.google.com/issues/new?component=187210&template=0", - "release_level": "stable", - "transport": "grpc", - "requires_billing": true, - "language": "java", - "repo": "googleapis/java-asset", - "repo_short": "java-asset", - "distribution_name": "com.google.cloud:google-cloud-asset", - "library_type": "GAPIC_AUTO", - "api_id": "cloudasset.googleapis.com" -} \ No newline at end of file diff --git a/tests/test_language_java.py b/tests/test_language_java.py deleted file mode 100644 index 30bf86da4..000000000 --- a/tests/test_language_java.py +++ /dev/null @@ -1,302 +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 -# -# https://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. - -import os -import shutil -import tempfile -import xml.etree.ElementTree as ET -import yaml -from pathlib import Path -from synthtool.languages import java -import requests_mock -import pytest -from . import util - -FIXTURES = Path(__file__).parent / "fixtures" -TEMPLATES_PATH = Path(__file__).parent.parent / "synthtool" / "gcp" / "templates" - -SAMPLE_METADATA = """ - - com.google.cloud - libraries-bom - - 3.3.0 - 3.3.0 - - 1.0.0 - 1.1.0 - 1.1.1 - 1.2.0 - 2.0.0 - 2.1.0 - 2.2.0 - 2.2.1 - 2.3.0 - 2.4.0 - 2.5.0 - 2.6.0 - 2.7.0 - 2.7.1 - 2.8.0 - 2.9.0 - 3.0.0 - 3.1.0 - 3.1.1 - 3.2.0 - 3.3.0 - - 20191218182827 - - -""" - - -def test_version_from_maven_metadata(): - assert "3.3.0" == java.version_from_maven_metadata(SAMPLE_METADATA) - - -def test_latest_maven_version(): - with requests_mock.Mocker() as m: - m.get( - "https://repo1.maven.org/maven2/com/google/cloud/libraries-bom/maven-metadata.xml", - text=SAMPLE_METADATA, - ) - assert "3.3.0" == java.latest_maven_version( - group_id="com.google.cloud", artifact_id="libraries-bom" - ) - - -def test_working_common_templates(): - def assert_valid_xml(file): - try: - ET.parse(file) - except ET.ParseError: - pytest.fail(f"unable to parse XML: {file}") - - def assert_valid_yaml(file): - with open(file, "r") as stream: - try: - yaml.safe_load(stream) - except yaml.YAMLError: - pytest.fail(f"unable to parse YAML: {file}") - - with util.copied_fixtures_dir(FIXTURES / "java_templates" / "standard") as workdir: - # generate the common templates - java.common_templates(template_path=TEMPLATES_PATH) - assert os.path.isfile("renovate.json") - - # lint xml, yaml files - # use os.walk because glob ignores hidden directories - for dirpath, _, filenames in os.walk(workdir): - for file in filenames: - (_, ext) = os.path.splitext(file) - if ext == ".xml": - assert_valid_xml(os.path.join(dirpath, file)) - elif ext == ".yaml" or ext == ".yml": - assert_valid_yaml(os.path.join(dirpath, file)) - - -def test_remove_method(): - with tempfile.TemporaryDirectory() as tempdir: - shutil.copyfile( - "tests/testdata/SampleClass.java", tempdir + "/SampleClass.java" - ) - - java.remove_method(tempdir + "/SampleClass.java", "public static void foo()") - java.remove_method(tempdir + "/SampleClass.java", "public void asdf()") - assert_matches_golden( - "tests/testdata/SampleClassGolden.java", tempdir + "/SampleClass.java" - ) - - -def test_copy_and_rename_method(): - with tempfile.TemporaryDirectory() as tempdir: - shutil.copyfile( - "tests/testdata/SampleClass.java", tempdir + "/SampleClass.java" - ) - - java.copy_and_rename_method( - tempdir + "/SampleClass.java", "public static void foo()", "foo", "foobar" - ) - java.copy_and_rename_method( - tempdir + "/SampleClass.java", "public void asdf()", "asdf", "xyz" - ) - assert_matches_golden( - "tests/testdata/SampleCopyMethodGolden.java", tempdir + "/SampleClass.java" - ) - - -def test_deprecate_method(): - # with tempfile.TemporaryDirectory() as tempdir: - if True: - tempdir = tempfile.mkdtemp() - shutil.copyfile( - "tests/testdata/SampleDeprecateClass.java", - tempdir + "/SampleDeprecateClass.java", - ) - DEPRECATION_WARNING = """This method will be removed in the next major version.\nUse {{@link #{new_method}()}} instead""" - ADDITIONAL_COMMENT = """{new_method} has the same functionality as foobar.""" - java.deprecate_method( - tempdir + "/SampleDeprecateClass.java", - "public void foo(String bar)", - DEPRECATION_WARNING.format(new_method="sample"), - ) - - # adding a comment when a javadoc and annotation already exists - java.deprecate_method( - tempdir + "/SampleDeprecateClass.java", - "public void bar(String bar)", - DEPRECATION_WARNING.format(new_method="sample"), - ) - java.deprecate_method( - tempdir + "/SampleDeprecateClass.java", - "public void cat(String bar)", - ADDITIONAL_COMMENT.format(new_method="sample"), - ) - - assert_matches_golden( - "tests/testdata/SampleDeprecateMethodGolden.java", - tempdir + "/SampleDeprecateClass.java", - ) - - -def test_fix_proto_license(): - with tempfile.TemporaryDirectory() as tempdir: - temppath = Path(tempdir).resolve() - os.mkdir(temppath / "src") - shutil.copyfile( - "tests/testdata/src/foo/FooProto.java", temppath / "src/FooProto.java" - ) - - java.fix_proto_headers(temppath) - assert_matches_golden( - "tests/testdata/FooProtoGolden.java", temppath / "src/FooProto.java" - ) - - -def test_fix_proto_license_idempotent(): - with tempfile.TemporaryDirectory() as tempdir: - temppath = Path(tempdir).resolve() - os.mkdir(temppath / "src") - shutil.copyfile( - "tests/testdata/src/foo/FooProto.java", temppath / "src/FooProto.java" - ) - - # run the header fix twice - java.fix_proto_headers(temppath) - java.fix_proto_headers(temppath) - assert_matches_golden( - "tests/testdata/FooProtoGolden.java", temppath / "src/FooProto.java" - ) - - -def test_fix_grpc_license(): - with tempfile.TemporaryDirectory() as tempdir: - temppath = Path(tempdir).resolve() - os.mkdir(temppath / "src") - shutil.copyfile( - "tests/testdata/src/foo/FooGrpc.java", temppath / "src/FooGrpc.java" - ) - - java.fix_grpc_headers(temppath) - assert_matches_golden( - "tests/testdata/FooGrpcGolden.java", temppath / "src/FooGrpc.java" - ) - - -def test_fix_grpc_license_idempotent(): - with tempfile.TemporaryDirectory() as tempdir: - temppath = Path(tempdir).resolve() - os.mkdir(temppath / "src") - shutil.copyfile( - "tests/testdata/src/foo/FooGrpc.java", temppath / "src/FooGrpc.java" - ) - - # run the header fix twice - java.fix_grpc_headers(temppath) - java.fix_grpc_headers(temppath) - assert_matches_golden( - "tests/testdata/FooGrpcGolden.java", temppath / "src/FooGrpc.java" - ) - - -def test_release_please_handle_releases(): - with util.copied_fixtures_dir( - FIXTURES / "java_templates" / "release-please-update" - ): - # generate the common templates - java.common_templates(template_path=TEMPLATES_PATH) - - assert os.path.isfile(".github/release-please.yml") - with open(".github/release-please.yml") as fp: - assert ( - fp.read() - == """branches: -- branch: 1.127.12-sp - bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-lts -bumpMinorPreMajor: true -handleGHRelease: true -releaseType: java-yoshi -""" - ) - - -def test_defaults(): - with util.copied_fixtures_dir(FIXTURES / "java_templates" / "defaults_test"): - java.common_templates(template_path=TEMPLATES_PATH) - assert os.path.isfile(".kokoro/nightly/integration.cfg") - assert_matches_golden( - "nightly-integration-golden.cfg", ".kokoro/nightly/integration.cfg" - ) - assert os.path.isfile(".kokoro/nightly/java11-integration.cfg") - assert_matches_golden( - "java11-integration-golden.cfg", ".kokoro/nightly/java11-integration.cfg" - ) - assert os.path.isfile(".kokoro/presubmit/integration.cfg") - assert_matches_golden( - "presubmit-integration-golden.cfg", ".kokoro/presubmit/integration.cfg" - ) - - -def test_merge_partials(): - with util.copied_fixtures_dir(FIXTURES / "java_templates" / "partials_test"): - java.common_templates(template_path=TEMPLATES_PATH) - assert os.path.isfile(".kokoro/nightly/integration.cfg") - assert_matches_golden( - "nightly-integration-golden.cfg", ".kokoro/nightly/integration.cfg" - ) - assert os.path.isfile(".kokoro/nightly/java11-integration.cfg") - assert_matches_golden( - "java11-integration-golden.cfg", ".kokoro/nightly/java11-integration.cfg" - ) - assert os.path.isfile(".kokoro/presubmit/integration.cfg") - assert_matches_golden( - "presubmit-integration-golden.cfg", ".kokoro/presubmit/integration.cfg" - ) - - -def assert_matches_golden(expected, actual): - matching_lines = 0 - with open(actual, "rt") as fp: - with open(expected, "rt") as golden: - while True: - matching_lines += 1 - log_line = fp.readline() - expected = golden.readline() - assert repr(log_line) == repr(expected) - if not log_line: - break - assert matching_lines > 0