From 4d93690c038c3780a1f902f28aad647d384fbc78 Mon Sep 17 00:00:00 2001 From: Neenu1995 Date: Mon, 7 Mar 2022 15:26:58 -0500 Subject: [PATCH 1/4] chore: update java template --- docker/owlbot/java/templates/poms/bom_pom.xml.j2 | 2 +- .../owlbot/java/templates/poms/parent_pom.xml.j2 | 4 ++-- .../java_library/.github/sync-repo-settings.yaml | 14 +++++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/docker/owlbot/java/templates/poms/bom_pom.xml.j2 b/docker/owlbot/java/templates/poms/bom_pom.xml.j2 index 572465ec2..68cb457b9 100644 --- a/docker/owlbot/java/templates/poms/bom_pom.xml.j2 +++ b/docker/owlbot/java/templates/poms/bom_pom.xml.j2 @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 Google {{name}} BOM diff --git a/docker/owlbot/java/templates/poms/parent_pom.xml.j2 b/docker/owlbot/java/templates/poms/parent_pom.xml.j2 index 7d49643a7..7f4d99dfe 100644 --- a/docker/owlbot/java/templates/poms/parent_pom.xml.j2 +++ b/docker/owlbot/java/templates/poms/parent_pom.xml.j2 @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 @@ -75,7 +75,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.8.0 pom import diff --git a/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml b/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml index f65f1896f..4ebfe4b91 100644 --- a/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml +++ b/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml @@ -1,4 +1,16 @@ - +# 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 From c8458e16d85112b318c79b4f90909a3c56fe244c Mon Sep 17 00:00:00 2001 From: Neenu1995 Date: Mon, 7 Mar 2022 15:42:26 -0500 Subject: [PATCH 2/4] chore: fix tests --- docker/owlbot/java/tests/fix-poms/golden/pom.xml | 4 ++-- .../java/tests/new-client/golden/google-cloud-foo-bom/pom.xml | 2 +- docker/owlbot/java/tests/new-client/golden/pom.xml | 4 ++-- .../tests/new-version/golden/google-cloud-foo-bom/pom.xml | 2 +- docker/owlbot/java/tests/new-version/golden/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/owlbot/java/tests/fix-poms/golden/pom.xml b/docker/owlbot/java/tests/fix-poms/golden/pom.xml index 885c7ea7c..3a53faacb 100644 --- a/docker/owlbot/java/tests/fix-poms/golden/pom.xml +++ b/docker/owlbot/java/tests/fix-poms/golden/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 @@ -90,7 +90,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.8.0 pom import 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 index 9a8f273cb..a0221179f 100644 --- 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 @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 Google Example API BOM diff --git a/docker/owlbot/java/tests/new-client/golden/pom.xml b/docker/owlbot/java/tests/new-client/golden/pom.xml index c00dfa826..fc2a97d02 100644 --- a/docker/owlbot/java/tests/new-client/golden/pom.xml +++ b/docker/owlbot/java/tests/new-client/golden/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.8.0 pom import 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 index 5079feb38..6fe084bc8 100644 --- 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 @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 Google Example API BOM diff --git a/docker/owlbot/java/tests/new-version/golden/pom.xml b/docker/owlbot/java/tests/new-version/golden/pom.xml index 0b5c09624..18273e765 100644 --- a/docker/owlbot/java/tests/new-version/golden/pom.xml +++ b/docker/owlbot/java/tests/new-version/golden/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 @@ -95,7 +95,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.8.0 pom import From 6ddfbfc19fe1aab283d7996d3fb03dcf1b882dcb Mon Sep 17 00:00:00 2001 From: Neenu1995 Date: Mon, 7 Mar 2022 16:00:34 -0500 Subject: [PATCH 3/4] chore: fix tests --- docker/owlbot/java/tests/fix-poms/input/pom.xml | 4 ++-- .../java/tests/new-version/input/google-cloud-foo-bom/pom.xml | 2 +- docker/owlbot/java/tests/new-version/input/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/owlbot/java/tests/fix-poms/input/pom.xml b/docker/owlbot/java/tests/fix-poms/input/pom.xml index 885c7ea7c..3a53faacb 100644 --- a/docker/owlbot/java/tests/fix-poms/input/pom.xml +++ b/docker/owlbot/java/tests/fix-poms/input/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 @@ -90,7 +90,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.8.0 pom import 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 index 092f553cc..ef3faf464 100644 --- 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 @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 Google Example API BOM diff --git a/docker/owlbot/java/tests/new-version/input/pom.xml b/docker/owlbot/java/tests/new-version/input/pom.xml index cf268af81..14bdcb4f4 100644 --- a/docker/owlbot/java/tests/new-version/input/pom.xml +++ b/docker/owlbot/java/tests/new-version/input/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.7 @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.8.0 pom import From 33c42b6e2f22a0776625f6ef563ff29c7387a889 Mon Sep 17 00:00:00 2001 From: Neenu1995 Date: Mon, 7 Mar 2022 16:55:54 -0500 Subject: [PATCH 4/4] chore: update project --- .../templates/java_library/.kokoro/nightly/integration.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg index e51c7b4c6..a2907a257 100644 --- a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg +++ b/synthtool/gcp/templates/java_library/.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: {