Merge branch 'main' into generate-libraries-main

Author: mpeddada1

.github/release-please.yml

@@ -23,3 +23,8 @@ branches:
     manifest: true
     handleGHRelease: true
     branch: 1.53.x
+  - primaryBranch: main
+    releaseType: java-backport
+    manifest: true
+    handleGHRelease: true
+    branch: 1.61.x

.github/sync-repo-settings.yaml

@@ -97,6 +97,24 @@ branchProtectionRules:
       - header-check
       - library_generation
       - unmanaged_dependency_check
+  - pattern: 1.61.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - units (8)
+      - units (11)
+      - units (17)
+      - cla/google
+      - lint
+      - 'Kokoro - Test: Integration'
+      - 'Kokoro - Test: GraalVM Native Image A'
+      - 'Kokoro - Test: GraalVM Native Image B'
+      - 'Kokoro - Test: GraalVM Native Image C'
+      - header-check
+      - library_generation
+      - unmanaged_dependency_check
 permissionRules:
   - team: yoshi-admins
     permission: admin

java-network-management/owlbot.py

@@ -120,18 +120,18 @@
     s.replace(
               v1beta1_org_vpcflowlogs_file_name,
               r'\s+@Test\n\s+public void createVpcFlowLogsConfigTest\(\) throws Exception.*',
-              @Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void createVpcFlowLogsConfigTest() throws Exception {'
+              '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void createVpcFlowLogsConfigTest() throws Exception {'
     )
     s.replace(
               v1beta1_org_vpcflowlogs_file_name,
               r'\s+@Test\n\s+public void createVpcFlowLogsConfigTest2\(\) throws Exception.*',
-              @Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void createVpcFlowLogsConfigTest2() throws Exception {'
+              '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void createVpcFlowLogsConfigTest2() throws Exception {'
     )
     s.replace(
               v1beta1_org_vpcflowlogs_file_name,
               r'\s+@Test\n\s+public void listVpcFlowLogsConfigsTest\(\) throws Exception.*',
-              @Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void listVpcFlowLogsConfigsTest() throws Exception {'
-        )
+              '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void listVpcFlowLogsConfigsTest() throws Exception {'
+    )
     s.move(library)
 
 s.remove_staging_dirs()