Merge branch 'main' into mat-view

Author: mutianf

google-cloud-bigtable-deps-bom/pom.xml

@@ -16,6 +16,7 @@
   <version>2.60.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
 
   <packaging>pom</packaging>
+  <name>Google Cloud Bigtable Dependency BOM</name>
   <description>
     A BOM that describes all of the dependencies used by google-cloud-bigtable. It's
     mainly intended to be used by java-bigtable-hbase to align dependencies

google-cloud-bigtable-emulator-core/pom.xml

@@ -9,6 +9,7 @@
     <groupId>com.google.cloud</groupId>
     <version>2.60.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
+  <name>Google Cloud Java - Bigtable Emulator Core</name>
 
   <artifactId>google-cloud-bigtable-emulator-core</artifactId>
   <version>0.197.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->

google-cloud-bigtable/pom.xml

@@ -349,6 +349,69 @@
   </dependencies>
 
   <profiles>
+    <profile>
+      <id>enable-enforcer-rules</id>
+      <activation>
+        <property>
+          <!-- By default, Maven runs the enforcer rules. The shared release script
+            may pass profile name that doesn't exist in this project. Let's ignore
+            the enforcer rule (requireProfileIdsExist) in that case, leveraging
+            the presence of the performRelease property. -->
+          <name>!performRelease</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.5.0</version>
+            <executions>
+              <!-- Prevent users from mistyping a profile name -->
+              <execution>
+                <id>enforce-valid-profile</id>
+                <configuration>
+                  <rules>
+                    <requireProfileIdsExist/>
+                  </rules>
+                </configuration>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+              </execution>
+              <!-- Ensure that greatest version of each transitive dependency got selected -->
+              <execution>
+                <id>enforce-dependency-upper-bound</id>
+                <configuration>
+                  <rules>
+                    <requireUpperBoundDeps/>
+                  </rules>
+                </configuration>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+              </execution>
+            </executions>
+            <!--
+              workaround for https://github.com/mojohaus/extra-enforcer-rules/issues/132
+              Remove when it's fixed upstream.
+            -->
+            <dependencies>
+              <dependency>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>extra-enforcer-rules</artifactId>
+                <version>1.8.0</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.maven.shared</groupId>
+                <artifactId>maven-dependency-tree</artifactId>
+                <version>3.3.0</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>enable-verbose-grpc-logs</id>
       <properties>
@@ -668,54 +731,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.5.0</version>
-        <executions>
-          <!-- Prevent users from mistyping a profile name -->
-          <execution>
-            <id>enforce-valid-profile</id>
-            <configuration>
-              <rules>
-                <requireProfileIdsExist/>
-              </rules>
-            </configuration>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-          </execution>
-          <!-- Ensure that greatest version of each transitive dependency got selected -->
-          <execution>
-            <id>enforce-dependency-upper-bound</id>
-            <configuration>
-              <rules>
-                <requireUpperBoundDeps/>
-              </rules>
-            </configuration>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-          </execution>
-        </executions>
-        <!--
-          workaround for https://github.com/mojohaus/extra-enforcer-rules/issues/132
-          Remove when it's fixed upstream.
-        -->
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.8.0</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-dependency-tree</artifactId>
-            <version>3.3.0</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>

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"
             + //