Skip to content
Draft
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
2 changes: 1 addition & 1 deletion google-auth-library-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-jar-parent</artifactId>
<version>1.83.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
<version>1.82.0</version><!-- {x-version-update:google-cloud-java:current} -->
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion google-cloud-jar-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>3.58.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<version>3.58.1</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.58.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<version>3.58.1</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<relativePath>../sdk-platform-java/sdk-platform-java-config</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.58.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.58.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.58.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
options:
machineType: 'E2_HIGHCPU_8'
Expand Down
2 changes: 1 addition & 1 deletion sdk-platform-java/.cloudbuild/graalvm/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.58.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_SHARED_DEPENDENCIES_VERSION: '3.58.1' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.17.0'
steps:
# GraalVM A build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_GAPIC_GENERATOR_JAVA_VERSION: '2.57.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
_GAPIC_GENERATOR_JAVA_VERSION: '2.68.1' # {x-version-update:gapic-generator-java:current}
_IMAGE_NAME: "us-central1-docker.pkg.dev/cloud-sdk-production-pipeline/images-dev/java-library-generation"
_SHA_IMAGE_ID: "${_IMAGE_NAME}:${COMMIT_SHA}"
_VERSIONED_IMAGE_ID: "${_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_GAPIC_GENERATOR_JAVA_VERSION: '2.68.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
_GAPIC_GENERATOR_JAVA_VERSION: '2.68.1' # {x-version-update:gapic-generator-java:current}
_PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
_PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
_PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"
Expand Down
4 changes: 2 additions & 2 deletions sdk-platform-java/api-common-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<packaging>jar</packaging>
<version>2.59.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
<version>2.59.1</version><!-- {x-version-update:api-common:current} -->
<name>API Common</name>
<description>Common utilities for Google APIs in Java</description>

<parent>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-pom-parent</artifactId>
<version>2.68.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.68.1</version><!-- {x-version-update:gapic-generator-java:current} -->
<relativePath>../gapic-generator-java-pom-parent</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions sdk-platform-java/coverage-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<version>2.76.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
<version>2.76.1</version> <!-- {x-version-update:gax:current} -->
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
<version>2.76.1-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
<version>2.76.1</version> <!-- {x-version-update:gax-grpc:current} -->
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-httpjson</artifactId>
<version>2.76.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
<version>2.76.1</version> <!-- {x-version-update:gax:current} -->
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>2.59.1-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
<version>2.59.1</version> <!-- {x-version-update:api-common:current} -->
</dependency>
</dependencies>

Expand Down
38 changes: 19 additions & 19 deletions sdk-platform-java/gapic-generator-java-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-bom</artifactId>
<packaging>pom</packaging>
<version>2.68.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.68.1</version><!-- {x-version-update:gapic-generator-java:current} -->
<name>GAPIC Generator Java BOM</name>
<description>
BOM for the libraries in gapic-generator-java repository. Users should not
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-pom-parent</artifactId>
<version>2.68.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.68.1</version><!-- {x-version-update:gapic-generator-java:current} -->
<relativePath>../gapic-generator-java-pom-parent</relativePath>
</parent>

Expand All @@ -25,14 +25,14 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>1.43.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library:current} -->
<version>1.43.0</version><!-- {x-version-update:google-auth-library:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.43.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library:current} -->
<version>1.43.0</version><!-- {x-version-update:google-auth-library:current} -->
<type>test-jar</type>
<classifier>testlib</classifier>
<scope>test</scope>
Expand Down Expand Up @@ -75,81 +75,81 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>2.59.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
<version>2.59.1</version><!-- {x-version-update:api-common:current} -->
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-bom</artifactId>
<version>2.76.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
<version>2.76.1</version><!-- {x-version-update:gax:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java</artifactId>
<version>2.68.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.68.1</version><!-- {x-version-update:gapic-generator-java:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-common-protos</artifactId>
<version>2.67.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
<version>2.67.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>2.67.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
<version>2.67.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v1:current} -->
<version>1.62.0</version><!-- {x-version-update:proto-google-iam-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v2</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2:current} -->
<version>1.62.0</version><!-- {x-version-update:proto-google-iam-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v2beta</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
<version>1.62.0</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v3</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v3:current} -->
<version>1.62.0</version><!-- {x-version-update:proto-google-iam-v3:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v3beta</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v3beta:current} -->
<version>1.62.0</version><!-- {x-version-update:proto-google-iam-v3beta:current} -->
</dependency>

<!-- Following test deps are kept to keep them consistent with versions above -->
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v1</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
<version>1.62.0</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v2</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
<version>1.62.0</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v2beta</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
<version>1.62.0</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v3</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v3:current} -->
<version>1.62.0</version><!-- {x-version-update:grpc-google-iam-v3:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v3beta</artifactId>
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v3beta:current} -->
<version>1.62.0</version><!-- {x-version-update:grpc-google-iam-v3beta:current} -->
Comment on lines +95 to +152
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.

high

Multiple dependencies in this BOM (including common-protos and various iam modules) are being set to versions ending in .0 (e.g., 2.67.0, 1.62.0), while other modules in the same PR are moving to .1. This is particularly problematic for the IAM modules since google-iam-policy is being released as 1.62.1. These should likely all be updated to their .1 counterparts to ensure a consistent release state.

</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-pom-parent</artifactId>
<version>2.68.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.68.1</version><!-- {x-version-update:gapic-generator-java:current} -->
<packaging>pom</packaging>
<name>GAPIC Generator Java POM Parent</name>
<url>https://github.com/googleapis/sdk-platform-java</url>
Expand Down
6 changes: 3 additions & 3 deletions sdk-platform-java/gapic-generator-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java</artifactId>
<version>2.68.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.68.1</version><!-- {x-version-update:gapic-generator-java:current} -->
<name>GAPIC Generator Java</name>
<description>GAPIC generator Java</description>

Expand All @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-pom-parent</artifactId>
<version>2.68.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.68.1</version><!-- {x-version-update:gapic-generator-java:current} -->
<relativePath>../gapic-generator-java-pom-parent</relativePath>
</parent>

Expand All @@ -32,7 +32,7 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-bom</artifactId>
<version>2.68.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.68.1</version><!-- {x-version-update:gapic-generator-java:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Loading
Loading