From ce6f467fab57b95ac6c62e40ac6b1452b2b356c7 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Sun, 22 Jun 2025 21:31:29 -0400 Subject: [PATCH 1/3] ci: allow nonexistent profile in google-cloud-bigtable Our release job specifies profiles that may or may not exist in all Java projects in our release pipeline. The requireProfileIdsExist enforcer rule fails in that case. Therefore, let's remove the requireProfileIdsExist rule. --- google-cloud-bigtable/pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index d0414c6c6405..6545dbe14f8b 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -673,18 +673,6 @@ maven-enforcer-plugin 3.5.0 - - - enforce-valid-profile - - - - - - - enforce - - enforce-dependency-upper-bound From 4efc30bbb1c6b421909c58ad94aeb376e4a246db Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Mon, 23 Jun 2025 01:36:37 +0000 Subject: [PATCH 2/3] chore: generate libraries at Mon Jun 23 01:34:13 UTC 2025 --- .../com/google/cloud/bigtable/admin/v2/models/TableTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableTest.java index 427e532ffb1f..cf11121455dc 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableTest.java @@ -90,7 +90,8 @@ public void testFromProto() { assertThat(result.isAutomatedBackupEnabled()).isTrue(); assertEquals( result.getAutomatedBackupPolicy().viewConfig(), - "AutomatedBackupPolicy{com.google.bigtable.admin.v2.Table$AutomatedBackupPolicy.retention_period=seconds: 1\n" + "AutomatedBackupPolicy{com.google.bigtable.admin.v2.Table$AutomatedBackupPolicy.retention_period=seconds:" + + " 1\n" + // "nanos: 99\n" + // From 081a508b3f4b4adec3affeb45ca226b77f035f04 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 23 Jun 2025 11:07:53 -0400 Subject: [PATCH 3/3] wrap the enforcer rule with a profile that is activated by default --- google-cloud-bigtable/pom.xml | 99 ++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 36 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 6545dbe14f8b..9278db700d02 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -349,6 +349,69 @@ + + enable-enforcer-rules + + + + !performRelease + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + + enforce-valid-profile + + + + + + + enforce + + + + + enforce-dependency-upper-bound + + + + + + + enforce + + + + + + + org.codehaus.mojo + extra-enforcer-rules + 1.8.0 + + + org.apache.maven.shared + maven-dependency-tree + 3.3.0 + + + + + + enable-verbose-grpc-logs @@ -668,42 +731,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 3.5.0 - - - - enforce-dependency-upper-bound - - - - - - - enforce - - - - - - - org.codehaus.mojo - extra-enforcer-rules - 1.8.0 - - - org.apache.maven.shared - maven-dependency-tree - 3.3.0 - - - - org.apache.maven.plugins maven-dependency-plugin