Merge remote-tracking branch 'origin/main' into bump-firestore-3.43.1

Author: blakeli0

java-firestore/.OwlBot-hermetic.yaml

@@ -4,7 +4,7 @@ deep-remove-regex:
 - /java-firestore/google-cloud-firestore/src/.*/java/com/google/cloud/firestore/v1/
 - /java-firestore/google-cloud-firestore-admin/src
 deep-preserve-regex:
-- /java-firestore/.*google-.*/src/main/java/.*/stub/Version.java
+- /java-firestore/.*google-.*/src/main/java/.*/stub/(Version|FirestoreAdminVersion).java
 - /java-firestore/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java
 - /java-firestore/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentPathName.java
 - /java-firestore/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/AnyPathName.java

java-firestore/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java

@@ -757,7 +757,7 @@ protected LibraryMetadata getLibraryMetadata() {
     return LibraryMetadata.newBuilder()
         .setArtifactName("com.google.cloud:google-cloud-firestore")
         .setRepository("googleapis/google-cloud-java")
-        .setVersion(Version.VERSION)
+        .setVersion(FirestoreAdminVersion.VERSION)
         .build();
   }
 

…gle/cloud/firestore/v1/stub/Version.java …store/v1/stub/FirestoreAdminVersion.javajava-firestore/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/Version.java renamed to java-firestore/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminVersion.java java-firestore/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/Version.java renamed to java-firestore/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminVersion.java

@@ -19,7 +19,7 @@
 import com.google.api.core.InternalApi;
 
 @InternalApi("For internal use only")
-final class Version {
+final class FirestoreAdminVersion {
   // {x-version-update-start:google-cloud-firestore:current}
   static final String VERSION = "3.43.1";
   // {x-version-update-end}

java-firestore/owlbot.py

@@ -38,10 +38,28 @@
     service = 'firestore'
     version = 'v1'
     s.replace(f'owl-bot-staging/v1/proto-google-cloud-{service}-{version}-java/src/**/*.java', protobuf_header, f'{license_header}{protobuf_header}')
-    service == 'firestore-admin'
+    service = 'firestore-admin'
     s.replace(f'owl-bot-staging/v1/grpc-google-cloud-{service}-{version}-java/src/**/*.java', bad_license_header, license_header)
     s.replace(f'owl-bot-staging/v1/proto-google-cloud-{service}-{version}-java/src/**/*.java', bad_license_header, license_header)
-    s.move(library)
+    if "firestore-admin" in str(library):
+        s.move(library, excludes=["**/Version.java"])
+        s.move(
+            f"{library}/src/main/java/com/google/cloud/firestore/v1/stub/Version.java",
+            "google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminVersion.java"
+        )
+        s.replace(
+            "google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminVersion.java",
+            "class Version",
+            "class FirestoreAdminVersion"
+        )
+        # Replace Version.VERSION with FirestoreAdminVersion.VERSION in stub files
+        s.replace(
+            "google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/**/*.java",
+            "Version.VERSION",
+            "FirestoreAdminVersion.VERSION",
+        )
+    else:
+        s.move(library)
 s.remove_staging_dirs()
 java.common_templates(
     monorepo=True,

java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java

@@ -64,6 +64,7 @@
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -512,6 +513,7 @@ public void testEnableMessageOrdering_overwritesMaxAttempts() throws Exception {
    *   <li>publish with key orderA, which should now succeed
    * </ol>
    */
+  @Ignore("https://github.com/googleapis/google-cloud-java/issues/13394")
   @Test
   public void testResumePublish() throws Exception {
     Publisher publisher =
@@ -591,6 +593,7 @@ public void testResumePublish() throws Exception {
     shutdownTestPublisher(publisher);
   }
 
+  @Ignore("https://github.com/googleapis/google-cloud-java/issues/13394")
   @Test
   public void testPublishThrowExceptionForUnsubmittedOrderingKeyMessage() throws Exception {
     Publisher publisher =