Rebase & spotless

Author: Haizhou Zhao

spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMetadataTables.java

@@ -403,11 +403,6 @@ public void testAllFilesPartitioned() throws Exception {
 
   @TestTemplate
   public void testMetadataLogEntries() throws Exception {
-    if (Set.of(ICEBERG_CATALOG_TYPE_REST).contains(catalogConfig.get(ICEBERG_CATALOG_TYPE))) {
-      // need to fix https://github.com/apache/iceberg/issues/11103 before enabling this test on
-      // rest catalog
-      return;
-    }
     // Create table and insert data
     sql(
         "CREATE TABLE %s (id bigint, data string) "

spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/CatalogTestBase.java

@@ -18,10 +18,10 @@
  */
 package org.apache.iceberg.spark;
 
-import com.google.common.collect.ImmutableMap;
 import org.apache.iceberg.CatalogProperties;
 import org.apache.iceberg.ParameterizedTestExtension;
 import org.apache.iceberg.Parameters;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 @ExtendWith(ParameterizedTestExtension.class)