Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 38 additions & 68 deletions boms/cloud-lts-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,55 +48,55 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Layer 1: Core -->
<guava.version>33.4.0-jre</guava.version>
<guava.version>33.5.0-jre</guava.version>
<autovalue.version>1.11.0</autovalue.version>
<protobuf.version>3.25.8</protobuf.version>
<io.grpc.version>1.71.0</io.grpc.version>
<google-http-client.version>1.47.0</google-http-client.version>
<protobuf.version>4.33.2</protobuf.version>
<io.grpc.version>1.76.3</io.grpc.version>
<google-http-client.version>2.1.0</google-http-client.version>
<google-oauth-client.version>1.39.0</google-oauth-client.version>
<google-auth-library.version>1.36.0</google-auth-library.version>
<google-auth-library.version>1.43.0</google-auth-library.version>
<google-api-client.version>2.7.2</google-api-client.version>
<!-- We don't use gax-bom because it includes the artifacts with 'testlib' classifier. -->
<gax.version>2.67.0</gax.version>
<api-common.version>2.50.0</api-common.version>
<google-cloud-core.version>2.57.0</google-cloud-core.version>
<proto-google-common-protos.version>2.58.0</proto-google-common-protos.version>
<gax.version>2.76.0</gax.version>
<api-common.version>2.59.0</api-common.version>
<google-cloud-core.version>2.66.0</google-cloud-core.version>
<proto-google-common-protos.version>2.67.0</proto-google-common-protos.version>

<!-- Layer 2: Cloud -->
<google-cloud-container.version>2.67.0</google-cloud-container.version>
<google-cloud-kms.version>2.67.0</google-cloud-kms.version>
<google-cloud-monitoring.version>3.65.0</google-cloud-monitoring.version>
<google-cloud-orchestration-airflow.version>1.64.0</google-cloud-orchestration-airflow.version>
<google-cloud-redis.version>2.67.0</google-cloud-redis.version>
<google-cloud-resourcemanager.version>1.66.0</google-cloud-resourcemanager.version>
<google-cloud-service-usage.version>2.64.0</google-cloud-service-usage.version>
<google-cloud-tasks.version>2.64.0</google-cloud-tasks.version>
<google-cloud-trace.version>2.64.0</google-cloud-trace.version>
<google-cloud-translate.version>2.64.0</google-cloud-translate.version>
<google-cloud-vision.version>3.62.0</google-cloud-vision.version>
<google-iam-admin.version>3.59.0</google-iam-admin.version>
<google-cloud-iamcredentials.version>2.64.0</google-cloud-iamcredentials.version>
<google-cloud-secretmanager.version>2.64.0</google-cloud-secretmanager.version>
<google-api-services-androidpublisher.version>v3-rev20250602-2.0.0</google-api-services-androidpublisher.version>
<appengine-api-1.0-sdk.version>2.0.34</appengine-api-1.0-sdk.version>
<gcs-connector.version>3.0.9</gcs-connector.version>
<google-cloud-bigquery.version>2.51.0</google-cloud-bigquery.version>
<google-cloud-container.version>2.88.0</google-cloud-container.version>
<google-cloud-kms.version>2.88.0</google-cloud-kms.version>
<google-cloud-monitoring.version>3.89.0</google-cloud-monitoring.version>
<google-cloud-orchestration-airflow.version>1.85.0</google-cloud-orchestration-airflow.version>
<google-cloud-redis.version>2.88.0</google-cloud-redis.version>
<google-cloud-resourcemanager.version>1.87.0</google-cloud-resourcemanager.version>
<google-cloud-service-usage.version>2.85.0</google-cloud-service-usage.version>
<google-cloud-tasks.version>2.85.0</google-cloud-tasks.version>
<google-cloud-trace.version>2.85.0</google-cloud-trace.version>
<google-cloud-translate.version>2.85.0</google-cloud-translate.version>
<google-cloud-vision.version>3.83.0</google-cloud-vision.version>
<google-iam-admin.version>3.80.0</google-iam-admin.version>
<google-cloud-iamcredentials.version>2.85.0</google-cloud-iamcredentials.version>
<google-cloud-secretmanager.version>2.85.0</google-cloud-secretmanager.version>
<google-api-services-androidpublisher.version>v3-rev20260318-2.0.0</google-api-services-androidpublisher.version>
<appengine-api-1.0-sdk.version>4.0.0</appengine-api-1.0-sdk.version>
<gcs-connector.version>3.1.13</gcs-connector.version>
<google-cloud-bigquery.version>2.59.0</google-cloud-bigquery.version>
<!-- the google-api-services-bigquery version used by the google-cloud-bigquery version above -->
<google-api-services-bigquery.version>v2-rev20250511-2.0.0</google-api-services-bigquery.version>
<google-cloud-bigquerystorage.version>3.15.0</google-cloud-bigquerystorage.version>
<google-cloud-bigtable.version>2.60.0</google-cloud-bigtable.version>
<google-cloud-datastore.version>2.29.1</google-cloud-datastore.version>
<google-cloud-logging.version>3.22.5</google-cloud-logging.version>
<google-cloud-pubsub.version>1.140.1</google-cloud-pubsub.version>
<google-api-services-bigquery.version>v2-rev20251012-2.0.0</google-api-services-bigquery.version>
<google-cloud-bigquerystorage.version>3.21.0</google-cloud-bigquerystorage.version>
<google-cloud-bigtable.version>2.75.1</google-cloud-bigtable.version>
<google-cloud-datastore.version>2.34.0</google-cloud-datastore.version>
<google-cloud-logging.version>3.24.0</google-cloud-logging.version>
<google-cloud-pubsub.version>1.148.0</google-cloud-pubsub.version>
<!-- the proto-google-cloud-pubsub-v1 used by the google-cloud-pubsub version above -->
<proto-google-cloud-pubsub-v1.version>1.122.1</proto-google-cloud-pubsub-v1.version>
<google-cloud-spanner.version>6.95.1</google-cloud-spanner.version>
<google-cloud-storage.version>2.53.0</google-cloud-storage.version>
<proto-google-cloud-pubsub-v1.version>1.130.0</proto-google-cloud-pubsub-v1.version>
<google-cloud-spanner.version>6.111.0</google-cloud-spanner.version>
<google-cloud-storage.version>2.63.0</google-cloud-storage.version>

<!-- Layer 3: Beam -->
<beam.version>2.67.0</beam.version>
<beam.version>2.72.0</beam.version>
<!-- Layer 4: HBase Connector -->
<bigtable-hbase-beam.version>2.15.3</bigtable-hbase-beam.version>
<bigtable-hbase-beam.version>2.16.2</bigtable-hbase-beam.version>
</properties>

<distributionManagement>
Expand Down Expand Up @@ -479,31 +479,11 @@
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-core</artifactId>
<version>${beam.version}</version>
<exclusions>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this because beam was bringing protobuf 4.x since before our upgrade to protobuf 4.x?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think so.

<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-extensions-google-cloud-platform-core</artifactId>
<version>${beam.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.beam</groupId>
Expand All @@ -524,16 +504,6 @@
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-io-google-cloud-platform</artifactId>
<version>${beam.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Layer 4: HBase Connector -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private void checkBom(Path bomPath) throws Exception {
}
}
// Temporarily ignore due to inability to process exclusion statements
//assertNoDowngradeRule(bom);
assertNoDowngradeRule(bom);
assertUniqueClasses(artifacts);
assertBomIsImported(bom);
}
Expand Down
2 changes: 1 addition & 1 deletion boms/upper-bounds-check/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>25.3.1-SNAPSHOT</version>
<version>26.76.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Loading