From 446f7b6aded35356c2e42ff6dbb070a6615c7b74 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Tue, 19 Sep 2023 18:42:40 +0000 Subject: [PATCH 1/7] chore: ignore grpc-binder and grpc-cronet in bom validation --- .../java/com/google/cloud/CreateBomCanaryProject.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java index bebc300f80f3..85efe021de78 100644 --- a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java +++ b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java @@ -111,12 +111,14 @@ private static String calculateDependenciesSection(Bom bom) { continue; } - // Skipping grpc-android as it is not used by Google Cloud Client Libraries for Java. Checking - // for availability of - // this unused artifact on Maven Central has caused BOM validation check to fail in the past. + // Skipping grpc-android, grpc-binder and grpc-cronet as it is not used by Google Cloud Client + // Libraries for Java. Checking for availability of this unused artifact on Maven Central has + // caused BOM validation check to fail in the past. // See // https://github.com/googleapis/sdk-platform-java/pull/1989#issuecomment-1724039670 - if ("grpc-android".equals(managedDependency.getArtifactId())) { + if ("grpc-android".equals(managedDependency.getArtifactId()) + || "grpc-binder".equals(managedDependency.getArtifactId()) + || "grpc-cronet".equals(managedDependency.getArtifactId())) { continue; } From 688953d5bcc0f768c10ca12f562da5d9bf080c32 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Tue, 19 Sep 2023 18:45:11 +0000 Subject: [PATCH 2/7] format comment --- .../main/java/com/google/cloud/CreateBomCanaryProject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java index 85efe021de78..602ef896ed6d 100644 --- a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java +++ b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java @@ -111,8 +111,8 @@ private static String calculateDependenciesSection(Bom bom) { continue; } - // Skipping grpc-android, grpc-binder and grpc-cronet as it is not used by Google Cloud Client - // Libraries for Java. Checking for availability of this unused artifact on Maven Central has + // Skipping grpc-android, grpc-binder and grpc-cronet as they are not used by Google Cloud Client + // Libraries for Java. Checking for availability of these unused artifacts on Maven Central has // caused BOM validation check to fail in the past. // See // https://github.com/googleapis/sdk-platform-java/pull/1989#issuecomment-1724039670 From e5a06564c622d4ea3cc629bfeaf76c4a7f34d20a Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 19 Sep 2023 18:46:00 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .github/workflows/ci.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8447862019ac..e27b2c57563c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,7 +27,7 @@ jobs: matrix: java: [11, 17] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -41,7 +41,7 @@ jobs: name: "units (8)" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: java-version: 8 @@ -63,7 +63,7 @@ jobs: steps: - name: Support longpaths run: git config --system core.longpaths true - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -78,7 +78,7 @@ jobs: matrix: java: [17] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -88,7 +88,7 @@ jobs: javadoc: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -100,7 +100,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -112,7 +112,7 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin From 3e5317c0fd0542960af75a65135015d4854161bc Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 19 Sep 2023 18:47:25 +0000 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .github/workflows/ci.yaml | 14 +++++++------- .../com/google/cloud/CreateBomCanaryProject.java | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8447862019ac..e27b2c57563c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,7 +27,7 @@ jobs: matrix: java: [11, 17] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -41,7 +41,7 @@ jobs: name: "units (8)" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: java-version: 8 @@ -63,7 +63,7 @@ jobs: steps: - name: Support longpaths run: git config --system core.longpaths true - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -78,7 +78,7 @@ jobs: matrix: java: [17] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -88,7 +88,7 @@ jobs: javadoc: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -100,7 +100,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin @@ -112,7 +112,7 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: temurin diff --git a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java index 602ef896ed6d..81c50b85feb9 100644 --- a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java +++ b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java @@ -111,8 +111,10 @@ private static String calculateDependenciesSection(Bom bom) { continue; } - // Skipping grpc-android, grpc-binder and grpc-cronet as they are not used by Google Cloud Client - // Libraries for Java. Checking for availability of these unused artifacts on Maven Central has + // Skipping grpc-android, grpc-binder and grpc-cronet as they are not used by Google Cloud + // Client + // Libraries for Java. Checking for availability of these unused artifacts on Maven Central + // has // caused BOM validation check to fail in the past. // See // https://github.com/googleapis/sdk-platform-java/pull/1989#issuecomment-1724039670 From 48427d1041d667da8235af22585403dcce87bf75 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 19 Sep 2023 18:48:28 +0000 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .../main/java/com/google/cloud/CreateBomCanaryProject.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java index 602ef896ed6d..81c50b85feb9 100644 --- a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java +++ b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java @@ -111,8 +111,10 @@ private static String calculateDependenciesSection(Bom bom) { continue; } - // Skipping grpc-android, grpc-binder and grpc-cronet as they are not used by Google Cloud Client - // Libraries for Java. Checking for availability of these unused artifacts on Maven Central has + // Skipping grpc-android, grpc-binder and grpc-cronet as they are not used by Google Cloud + // Client + // Libraries for Java. Checking for availability of these unused artifacts on Maven Central + // has // caused BOM validation check to fail in the past. // See // https://github.com/googleapis/sdk-platform-java/pull/1989#issuecomment-1724039670 From 743b9f7e3dd59909c74d14c11cf5d3f45e8054ea Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Tue, 19 Sep 2023 20:00:55 +0000 Subject: [PATCH 6/7] fix formatting --- .../java/com/google/cloud/CreateBomCanaryProject.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java index 602ef896ed6d..d81a34d1f870 100644 --- a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java +++ b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java @@ -111,14 +111,11 @@ private static String calculateDependenciesSection(Bom bom) { continue; } - // Skipping grpc-android, grpc-binder and grpc-cronet as they are not used by Google Cloud Client - // Libraries for Java. Checking for availability of these unused artifacts on Maven Central has - // caused BOM validation check to fail in the past. - // See + // Skipping grpc-android, grpc-binder and grpc-cronet as they are not used by Google Cloud + // Client Libraries for Java. Checking for availability of these unused artifacts on Maven + // Central has caused BOM validation check to fail in the past. See // https://github.com/googleapis/sdk-platform-java/pull/1989#issuecomment-1724039670 - if ("grpc-android".equals(managedDependency.getArtifactId()) - || "grpc-binder".equals(managedDependency.getArtifactId()) - || "grpc-cronet".equals(managedDependency.getArtifactId())) { + if ("grpc-android".equals(managedDependency.getArtifactId())) { continue; } From 8f98f1482a60eb46f70b66d9bb6437361df63e4f Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Tue, 19 Sep 2023 20:05:37 +0000 Subject: [PATCH 7/7] restore changes --- .../main/java/com/google/cloud/CreateBomCanaryProject.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java index d81a34d1f870..544d0fe06ac8 100644 --- a/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java +++ b/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java @@ -115,7 +115,9 @@ private static String calculateDependenciesSection(Bom bom) { // Client Libraries for Java. Checking for availability of these unused artifacts on Maven // Central has caused BOM validation check to fail in the past. See // https://github.com/googleapis/sdk-platform-java/pull/1989#issuecomment-1724039670 - if ("grpc-android".equals(managedDependency.getArtifactId())) { + if ("grpc-android".equals(managedDependency.getArtifactId()) + || "grpc-binder".equals(managedDependency.getArtifactId()) + || "grpc-cronet".equals(managedDependency.getArtifactId())) { continue; }