diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9786771c..426cf83e 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b + digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index a8f0a870..5d9a9d8b 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -14,19 +14,3 @@ docker: image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" - -deep-remove-regex: -- "/grpc-google-.*/src" -- "/proto-google-.*/src" -- "/google-.*/src" - -deep-preserve-regex: -- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" - -deep-copy-regex: -- source: "/google/cloud/dns/(v.*)/.*-java/proto-google-.*/src" - dest: "/owl-bot-staging/$1/proto-google-cloud-dns-$1/src" -- source: "/google/cloud/dns/(v.*)/.*-java/grpc-google-.*/src" - dest: "/owl-bot-staging/$1/grpc-google-cloud-dns-$1/src" -- source: "/google/cloud/dns/(v.*)/.*-java/gapic-google-.*/src" - dest: "/owl-bot-staging/$1/google-cloud-dns/src" diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index da0ee09a..16c7f80d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ + +If you write sample code, please follow the [samples format]( +https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb18232..f5fc7d51 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 18e23230..7a106d00 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b5e56aa..83ef7f9c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -39,8 +39,8 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 @@ -54,8 +54,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -64,8 +64,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 11 @@ -76,8 +76,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index d5d964df..912ed8b2 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -20,9 +20,10 @@ jobs: checkstyle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: + distribution: zulu java-version: 8 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check diff --git a/.kokoro/build.bat b/.kokoro/build.bat index cc602c9e..067cf4a4 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,18 +1,18 @@ +:: Copyright 2022 Google LLC +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: Github action job to test core java library features on +:: downstream client libraries before they are released. :: See documentation in type-shell-output.bat -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Github action job to test core java library features on -# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index e51c7b4c..a2907a25 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -13,12 +13,12 @@ env_vars: { # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { diff --git a/.repo-metadata.json b/.repo-metadata.json index 648c778b..2a08f367 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -9,6 +9,6 @@ "repo": "googleapis/java-dns", "repo_short": "java-dns", "distribution_name": "com.google.cloud:google-cloud-dns", - "library_type": "GAPIC_AUTO", + "library_type": "REST", "api_id": "dns.googleapis.com" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e9a0c67..16c5cdf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.0.7](https://github.com/googleapis/java-dns/compare/v2.0.6...v2.0.7) (2022-03-08) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#622](https://github.com/googleapis/java-dns/issues/622)) ([475c3d9](https://github.com/googleapis/java-dns/commit/475c3d94efa40e7264eb42b77f30ac90bb6c5c64)) + ### [2.0.6](https://github.com/googleapis/java-dns/compare/v2.0.5...v2.0.6) (2022-02-11) diff --git a/pom.xml b/pom.xml index f9cf34ae..12498f84 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dns jar - 2.0.6 + 2.0.7 Google Cloud DNS Parent https://github.com/googleapis/java-dns @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.7 + 1.3.0 @@ -61,7 +61,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.7.0 + 2.8.0 pom import diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 968c1b07..4b858389 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-dns - 2.0.5 + 2.0.6 diff --git a/samples/pom.xml b/samples/pom.xml index 5d79c762..daebc4a4 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -46,7 +46,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.11 true diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5dfe2652..a74cc8f0 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-dns - 2.0.6 + 2.0.7 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 36664fa2..530b03c6 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 24.3.0 + 24.4.0 pom import diff --git a/src/test/java/com/google/cloud/dns/it/ITDnsTest.java b/src/test/java/com/google/cloud/dns/it/ITDnsTest.java index e5fc73c5..e1ce67d3 100644 --- a/src/test/java/com/google/cloud/dns/it/ITDnsTest.java +++ b/src/test/java/com/google/cloud/dns/it/ITDnsTest.java @@ -1269,6 +1269,7 @@ public void testListDnsRecords() { } @Test + @Ignore public void testListZonesBatch() { assumeFalse(IS_VPC_TEST); try { @@ -1439,6 +1440,7 @@ public void testListZonesBatch() { } @Test + @Ignore public void testCreateValidZoneBatch() { assumeFalse(IS_VPC_TEST); try { @@ -1501,6 +1503,7 @@ public void testCreateZoneWithErrorsBatch() { } @Test + @Ignore public void testCreateZoneWithOptionsBatch() { assumeFalse(IS_VPC_TEST); try { @@ -1614,6 +1617,7 @@ public void testCreateZoneWithOptionsBatch() { } @Test + @Ignore public void testGetZoneBatch() { assumeFalse(IS_VPC_TEST); try { @@ -1713,6 +1717,7 @@ public void testGetZoneBatch() { } @Test + @Ignore public void testDeleteZoneBatch() { assumeFalse(IS_VPC_TEST); try { @@ -1729,6 +1734,7 @@ public void testDeleteZoneBatch() { } @Test + @Ignore public void testGetProjectBatch() { // fetches all fields DnsBatch batch = DNS.batch(); @@ -1752,6 +1758,7 @@ public void testGetProjectBatch() { } @Test + @Ignore public void testCreateChangeBatch() { assumeFalse(IS_VPC_TEST); try { @@ -1857,6 +1864,7 @@ public void testCreateChangeBatch() { } @Test + @Ignore public void testGetChangeBatch() { assumeFalse(IS_VPC_TEST); try { @@ -1941,6 +1949,7 @@ public void testGetChangeBatch() { } @Test + @Ignore public void testListChangesBatch() { assumeFalse(IS_VPC_TEST); try { @@ -2071,6 +2080,7 @@ public void testListChangesBatch() { } @Test + @Ignore public void testListDnsRecordSetsBatch() { assumeFalse(IS_VPC_TEST); try { @@ -2223,6 +2233,7 @@ public void testListDnsRecordSetsBatch() { } @Test + @Ignore public void testBatchCombined() { assumeFalse(IS_VPC_TEST); // only testing that the combination is possible diff --git a/versions.txt b/versions.txt index 8c4e46ed..8a1ab506 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-dns:2.0.6:2.0.6 \ No newline at end of file +google-cloud-dns:2.0.7:2.0.7 \ No newline at end of file