Merge branch 'main' into jinseop/cleanup-split-repo-logic

jinseopkim0 · web-flow · commit f4d7e3b7f5aa · 2026-07-07T15:00:11.000-04:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -155,34 +155,49 @@ jobs:
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-bigquerystorage:
             - 'java-bigquerystorage/**'
             - 'google-auth-library-java/**/*.java'
             - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-datastore:
             - 'java-datastore/**'
             - 'google-auth-library-java/**/*.java'
             - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-logging-logback:
             - 'java-logging-logback/**'
             - 'google-auth-library-java/**/*.java'
             - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-logging:
             - 'java-logging/**'
             - 'google-auth-library-java/**/*.java'
             - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-spanner:
             - 'java-spanner/**'
             - 'grpc-gcp-java/**'
@@ -191,34 +206,49 @@ jobs:
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-storage:
             - 'java-storage/**'
             - 'google-auth-library-java/**/*.java'
             - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-pubsub:
             - 'java-pubsub/**'
             - 'google-auth-library-java/**/*.java'
             - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-bigtable:
             - 'java-bigtable/**'
             - 'google-auth-library-java/**/*.java'
             - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-firestore:
             - 'java-firestore/**'
             - 'google-auth-library-java/**/*.java'
             - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
+            - 'google-cloud-jar-parent/pom.xml'
+            - 'google-cloud-pom-parent/pom.xml'
+            - 'pom.xml'
           java-shared-config:
             - 'java-shared-config/**'
   split-units:
diff --git a/gapic-libraries-bom/pom.xml b/gapic-libraries-bom/pom.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!-- This file is fully generated. Do not edit this file directly. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.5.25</version>
+        <version>1.5.33</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/java-common-protos/.repo-metadata.json b/java-common-protos/.repo-metadata.json
@@ -12,6 +12,5 @@
   "distribution_name": "com.google.api.grpc:proto-google-common-protos",
   "library_type": "OTHER",
   "requires_billing": true,
-  "excluded_dependencies": "grpc-google-common-protos,proto-google-common-protos,proto-google-common-protos-parent",
   "excluded_poms": "proto-google-common-protos-bom,proto-google-common-protos"
 }
diff --git a/java-compute/.repo-metadata.json b/java-compute/.repo-metadata.json
@@ -13,6 +13,5 @@
   "api_id": "compute.googleapis.com",
   "library_type": "GAPIC_AUTO",
   "requires_billing": true,
-  "excluded_dependencies": "grpc-google-cloud-compute-v1",
   "excluded_poms": "grpc-google-cloud-compute-v1"
 }
diff --git a/java-datastore/.repo-metadata.json b/java-datastore/.repo-metadata.json
@@ -13,7 +13,6 @@
   "api_id": "datastore.googleapis.com",
   "library_type": "GAPIC_COMBO",
   "requires_billing": true,
-  "excluded_dependencies": "grpc-google-cloud-datastore-v1",
   "excluded_poms": "grpc-google-cloud-datastore-v1",
   "issue_tracker": "https://issuetracker.google.com/savedsearches/559768",
   "extra_versioned_modules": "datastore-v1-proto-client",
diff --git a/java-iam-policy/.repo-metadata.json b/java-iam-policy/.repo-metadata.json
@@ -13,6 +13,5 @@
   "api_id": "iam.googleapis.com",
   "library_type": "GAPIC_AUTO",
   "requires_billing": true,
-  "excluded_dependencies": "google-iam-policy",
   "excluded_poms": "proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1"
 }
diff --git a/java-iam/.repo-metadata.json b/java-iam/.repo-metadata.json
@@ -12,6 +12,5 @@
   "distribution_name": "com.google.api.grpc:proto-google-iam-v1",
   "library_type": "OTHER",
   "requires_billing": true,
-  "excluded_dependencies": "grpc-google-iam-v1",
   "excluded_poms": "proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1"
 }
diff --git a/java-storage/google-cloud-storage/pom.xml b/java-storage/google-cloud-storage/pom.xml
@@ -359,7 +359,6 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.3.16</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/java-storage/pom.xml b/java-storage/pom.xml
@@ -193,5 +193,31 @@
         <skipTests>true</skipTests>
       </properties>
     </profile>
+    <profile>
+      <!--
+        Logback 1.5.x requires Java 11+. To support running tests on Java 8,
+        we downgrade to 1.3.x when running in a Java 8 environment.
+      -->
+      <id>java8-logback</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.3.16</version>
+            <scope>test</scope>
+          </dependency>
+          <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.3.16</version>
+            <scope>test</scope>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
   </profiles>
 </project>
diff --git a/librarian.yaml b/librarian.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 language: java
-version: v0.24.1-0.20260701202128-6037497ba994
+version: v0.24.1-0.20260707150039-db37cc1a8f59
 repo: googleapis/google-cloud-java
 sources:
   googleapis:
@@ -1109,7 +1109,6 @@ libraries:
       api_shortname_override: common-protos
       artifact_id: proto-google-common-protos
       client_documentation_override: https://cloud.google.com/java/docs/reference/proto-google-common-protos/latest/history
-      excluded_dependencies: grpc-google-common-protos,proto-google-common-protos,proto-google-common-protos-parent
       excluded_poms:
         - proto-google-common-protos-bom
         - proto-google-common-protos
@@ -1135,7 +1134,6 @@ libraries:
       - google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/Util.java
     java:
       api_description_override: 'delivers virtual machines running in Google''s innovative data centers and worldwide fiber network. Compute Engine''s tooling and workflow support enable scaling from single instances to global, load-balanced cloud computing. Compute Engine''s VMs boot quickly, come with persistent disk storage, deliver consistent performance and are available in many configurations. '
-      excluded_dependencies: grpc-google-cloud-compute-v1
       excluded_poms:
         - grpc-google-cloud-compute-v1
       name_pretty_override: Compute Engine
@@ -1422,7 +1420,6 @@ libraries:
       api_id_override: datastore.googleapis.com
       api_description_override: is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.
       client_documentation_override: https://cloud.google.com/java/docs/reference/google-cloud-datastore/latest/history
-      excluded_dependencies: grpc-google-cloud-datastore-v1
       excluded_poms:
         - grpc-google-cloud-datastore-v1
       extra_versioned_modules: datastore-v1-proto-client
@@ -2111,7 +2108,6 @@ libraries:
       api_description_override: Manages access control for Google Cloud Platform resources
       artifact_id: proto-google-iam-v1
       client_documentation_override: https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/overview
-      excluded_dependencies: grpc-google-iam-v1
       excluded_poms:
         - proto-google-iam-v1-bom
         - google-iam-policy
@@ -2171,7 +2167,6 @@ libraries:
       api_shortname_override: iam-policy
       artifact_id: google-iam-policy
       client_documentation_override: https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/history
-      excluded_dependencies: google-iam-policy
       excluded_poms:
         - proto-google-iam-v1-bom
         - google-iam-policy
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is fully generated. Do not edit this file directly. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-java</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?xml version='1.0' encoding='UTF-8'?>`
	`2`	`+<!-- This file is fully generated. Do not edit this file directly. -->`
`2`	`3`	`<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">`
`3`	`4`	`<modelVersion>4.0.0</modelVersion>`
`4`	`5`	`<groupId>com.google.cloud</groupId>`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,5 @@`
`12`	`12`	`"distribution_name": "com.google.api.grpc:proto-google-common-protos",`
`13`	`13`	`"library_type": "OTHER",`
`14`	`14`	`"requires_billing": true,`
`15`		`- "excluded_dependencies": "grpc-google-common-protos,proto-google-common-protos,proto-google-common-protos-parent",`
`16`	`15`	`"excluded_poms": "proto-google-common-protos-bom,proto-google-common-protos"`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,5 @@`
`13`	`13`	`"api_id": "compute.googleapis.com",`
`14`	`14`	`"library_type": "GAPIC_AUTO",`
`15`	`15`	`"requires_billing": true,`
`16`		`- "excluded_dependencies": "grpc-google-cloud-compute-v1",`
`17`	`16`	`"excluded_poms": "grpc-google-cloud-compute-v1"`
`18`	`17`	`}`