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
7 changes: 5 additions & 2 deletions .github/scripts/test_dependency_compatibility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#
# The default upper-bound dependencies file is `dependencies.txt` located in the root
# of sdk-platform-java. The upper-bound dependencies file will be in the format of:
# ${dependency.name}=${dependency.version}
# {groupId}:{artifactId}={version} or {artifactId}={version}

set -ex

Expand All @@ -36,7 +36,10 @@ function add_dependency_to_maven_command() {
echo "Malformed dependency string: ${dep_pair}. Expected format: dependency=version"
exit 1
fi
local dependency=$(echo "${dep_pair}" | cut -d'=' -f1 | tr -d '[:space:]')
local full_dependency=$(echo "${dep_pair}" | cut -d'=' -f1 | tr -d '[:space:]')
# The dependency can be in the format of {groupId}:{artifactId} or {artifactId}
# We only want the artifactId
local dependency=$(echo "${full_dependency}" | awk -F':' '{print $NF}')
local version=$(echo "${dep_pair}" | cut -d'=' -f2 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
MAVEN_COMMAND+=" -D${dependency}.version=${version}"
}
Expand Down
4 changes: 2 additions & 2 deletions .kokoro/nightly/downstream-protobuf-source-compatibility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
-Denforcer.skip \
-Dmaven.javadoc.skip \
-Denforcer.skip \
-Dprotobuf.version=${PROTOBUF_RUNTIME_VERSION} \
-Dprotobuf-java.version=${PROTOBUF_RUNTIME_VERSION} \
-pl "${google_cloud_java_handwritten_maven_args}" -am \
"${surefire_opt}" \
-T 1C
Expand All @@ -58,7 +58,7 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
-Denforcer.skip \
-Dmaven.javadoc.skip \
-Denforcer.skip \
-Dprotobuf.version=${PROTOBUF_RUNTIME_VERSION} \
-Dprotobuf-java.version=${PROTOBUF_RUNTIME_VERSION} \
"${surefire_opt}" \
-T 1C
fi
Expand Down
2 changes: 1 addition & 1 deletion api-common-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone.version}</version>
<version>${error_prone_annotations.version}</version>
<scope>compile</scope>
</dependency>

Expand Down
67 changes: 33 additions & 34 deletions dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,47 @@
# This file contains a list of dependencies and their versions to be tested for compatibility.
# The format is key=value, where the key is the dependency name and the value is the version.
# The format is dependency name followed by version. Dependency name is separate by the equals sign.
# "1P" refers to First-Party dependencies (owned by Google).
# "3P" refers to Third-Party dependencies.

# Pom-Parent Dependencies
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml
javax.annotation-api=1.3.2
grpc=1.74.0
google.auth=1.37.1
google.http-client=1.47.1
gson=2.13.1
guava=33.4.8-jre
protobuf=4.31.1
# Note: This opentelemetry version refers to the opentelemetry-bom
opentelemetry=1.52.0
errorprone=2.41.0
j2objc-annotations=3.1
threetenbp=1.7.2
slf4j=2.0.17
javax.annotation:javax.annotation-api=1.3.2
io.grpc:grpc-bom=1.74.0
com.google.auth:google.google-auth-library-bom=1.37.1
com.google.http-client:google-http-client=1.47.1
com.google.code.gson:gson=2.13.1
com.google.guava:guava=33.4.8-jre
com.google.protobuf:protobuf-java=4.31.1
io.opentelemetry:opentelemetry-bom=1.52.0
com.google.errorprone:error_prone_annotations=2.41.0
com.google.j2objc:j2objc-annotations=3.1
org.threeten:threetenbp=1.7.2
org.slf4j:slf4j-api=2.0.17

# 1P Shared-Deps
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml
grpc-gcp=1.6.1
google.oauth-client=1.39.0
google.api-client=2.8.1
com.google.cloud:grpc-gcp=1.6.1
com.google.oauth-client:google-oauth-client=1.39.0
com.google.api-client:google-api-client=2.8.1

# 3P Shared-Deps
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/third-party-dependencies/pom.xml
threeten-extra=1.8.0
opencensus=0.31.0
findbugs=3.0.2
jackson=2.19.2
codec=1.19.0
httpcomponents.httpcore=4.4.16
httpcomponents.httpclient=4.5.14
apache-httpclient-5=5.5
apache-httpcore-5=5.3.4
perfmark-api=0.27.0
org.threeten:threeten-extra=1.8.0
io.opencensus:opencensus-api=0.31.0
com.google.code.findbugs:jsr305=3.0.2
com.fasterxml.jackson:jackson-bom=2.19.2
commons-codec:commons-codec=1.19.0
org.apache.httpcomponents:httpclient=4.5.14
org.apache.httpcomponents:httpcore=4.4.16
org.apache.httpcomponents.client5:httpclient5=5.5
org.apache.httpcomponents.core5:httpcore5=5.3.4
io.perfmark:perfmark-api=0.27.0
# Note: This is the google opentelemetry exporter and not the general opentelemetry project
google.cloud.opentelemetry=0.36.0
flogger=0.9
arrow=18.3.0
dev.cel=0.10.1
com.google.crypto.tink=1.18.0
com.google.cloud.opentelemetry:exporter-metrics=0.36.0
com.google.flogger:flogger=0.9
org.apache.arrow:arrow-memory-core=18.3.0
dev.cel:cel=0.10.1
com.google.crypto.tink:tink=1.18.0
# The follow opentelemetry dependencies have a different version from the opentelemetry-bom
opentelemetry-semconv=1.34.0
io.opentelemetry.contrib.opentelemetry-gcp-resources=1.48.0-alpha
io.opentelemetry.semconv:opentelemetry-semconv=1.34.0
io.opentelemetry.contrib:opentelemetry-gcp-resources=1.48.0-alpha
10 changes: 5 additions & 5 deletions gapic-generator-java-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>${google.auth.version}</version>
<version>${google-auth-library-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>${google.auth.version}</version>
<version>${google-auth-library-bom.version}</version>
<type>test-jar</type>
<classifier>testlib</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>${google.http-client.version}</version>
<version>${google-http-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -59,14 +59,14 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>${protobuf.version}</version>
<version>${protobuf-java.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<version>${grpc-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
16 changes: 8 additions & 8 deletions gapic-generator-java-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@
<properties>
<skipUnitTests>false</skipUnitTests>
<checkstyle.header.file>java.header</checkstyle.header.file>
<maven.compiler.release>8</maven.compiler.release>

<!-- External dependencies, especially gRPC and Protobuf version, should be
consistent across modules in this repository -->
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<grpc.version>1.71.0</grpc.version>
<google.auth.version>1.37.1</google.auth.version>
<google.http-client.version>1.47.1</google.http-client.version>
<grpc-bom.version>1.71.0</grpc-bom.version>
Copy link
Member Author

Choose a reason for hiding this comment

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

There is a possibility that there are other pom.xml files that inherit from here and shared-deps that use these values. Would we consider changing these property names a breaking change?

<google-auth-library-bom.version>1.37.1</google-auth-library-bom.version>
<google-http-client.version>1.47.1</google-http-client.version>
<gson.version>2.12.1</gson.version>
<guava.version>33.4.0-jre</guava.version>
<protobuf.version>3.25.8</protobuf.version>
<opentelemetry.version>1.47.0</opentelemetry.version>
<maven.compiler.release>8</maven.compiler.release>
<errorprone.version>2.38.0</errorprone.version>
<protobuf-java.version>3.25.8</protobuf-java.version>
<opentelemetry-bom.version>1.47.0</opentelemetry-bom.version>
<error_prone_annotations.version>2.38.0</error_prone_annotations.version>
<j2objc-annotations.version>3.0.0</j2objc-annotations.version>
<threetenbp.version>1.7.0</threetenbp.version>
<junit.version>5.11.4</junit.version>
<mockito.version>4.11.0</mockito.version>
<slf4j.version>2.0.16</slf4j.version>
<slf4j-api.version>2.0.16</slf4j-api.version>
</properties>

<developers>
Expand Down
4 changes: 2 additions & 2 deletions gapic-generator-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
<version>0.6.1</version>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
<executions>
Expand Down Expand Up @@ -450,7 +450,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone.version}</version>
<version>${error_prone_annotations.version}</version>
</dependency>

<!--
Expand Down
12 changes: 6 additions & 6 deletions gax-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>${google.auth.version}</version>
<version>${google-auth-library-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -120,7 +120,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<version>${grpc-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -137,26 +137,26 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>${google.http-client.version}</version>
<version>${google-http-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>${protobuf.version}</version>
<version>${protobuf-java.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<version>${opentelemetry-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions java-common-protos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>${protobuf.version}</version>
<version>${protobuf-java.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -70,7 +70,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<version>${grpc-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions java-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotationsa</artifactId>
<version>${errorprone.version}</version>
<artifactId>error_prone_annotations</artifactId>
<version>${error_prone_annotations.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions java-iam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>${protobuf.version}</version>
<version>${protobuf-java.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<version>${grpc-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions java-shared-dependencies/first-party-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.installationModule>${project.artifactId}</site.installationModule>
<grpc-gcp.version>1.6.1</grpc-gcp.version>
<google.oauth-client.version>1.39.0</google.oauth-client.version>
<google.api-client.version>2.7.2</google.api-client.version>
<google-oauth-client.version>1.39.0</google-oauth-client.version>
<google-api-client.version>2.7.2</google-api-client.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -52,14 +52,14 @@
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-bom</artifactId>
<version>${google.oauth-client.version}</version>
<version>${google-oauth-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-bom</artifactId>
<version>${google.api-client.version}</version>
<version>${google-api-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Loading
Loading