Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/restore-hermetic-bu…
Browse files Browse the repository at this point in the history
…ild-for-hw-libs' into restore-hermetic-build-for-hw-libs
  • Loading branch information
diegomarquezp committed Feb 27, 2024
2 parents 3f0c7b3 + 07b9d69 commit 2974141
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gapic-generator-java-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<!-- 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.61.1</grpc.version>
<grpc.version>1.62.2</grpc.version>
<google.auth.version>1.23.0</google.auth.version>
<google.http-client.version>1.44.1</google.http-client.version>
<gson.version>2.10.1</gson.version>
Expand Down
4 changes: 2 additions & 2 deletions gax-java/dependencies.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ version.gax_httpjson=2.43.1-SNAPSHOT

version.com_google_protobuf=3.25.2
version.google_java_format=1.15.0
version.io_grpc=1.61.1
version.io_grpc=1.62.2

# Maven artifacts.
# Note, the actual name of each property matters (bazel build scripts depend on it).
Expand Down Expand Up @@ -74,7 +74,7 @@ maven.com_google_http_client_google_http_client=com.google.http-client:google-ht
maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.44.1
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.3
maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.5

# Testing maven artifacts
maven.junit_junit=junit:junit:4.13.2
Expand Down
35 changes: 35 additions & 0 deletions java-shared-dependencies/third-party-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<site.installationModule>${project.artifactId}</site.installationModule>

<threeten.version>1.6.8</threeten.version>
<threeten-extra.version>1.7.2</threeten-extra.version>
<javax.annotations.version>1.3.2</javax.annotations.version>
<animal-sniffer.version>1.23</animal-sniffer.version>
<opencensus.version>0.31.1</opencensus.version>
Expand All @@ -38,10 +39,27 @@
<perfmark-api.version>0.27.0</perfmark-api.version>
<j2objc-annotations.version>2.8</j2objc-annotations.version>
<opentelemetry.version>1.34.1</opentelemetry.version>
<flogger.version>0.8</flogger.version>
<arrow.version>15.0.0</arrow.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-core</artifactId>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-vector</artifactId>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand All @@ -57,6 +75,11 @@
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threeten-extra</artifactId>
<version>${threeten-extra.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
Expand All @@ -78,6 +101,18 @@
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone.version}</version>
</dependency>
<!-- Legacy exemption of java-pubsublite's flogger dependencies.
In general, let's avoid declaring logging backend dependencies -->
<dependency>
<groupId>com.google.flogger</groupId>
<artifactId>google-extensions</artifactId>
<version>${flogger.version}</version>
</dependency>
<dependency>
<groupId>com.google.flogger</groupId>
<artifactId>flogger-system-backend</artifactId>
<version>${flogger.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
Expand Down

0 comments on commit 2974141

Please sign in to comment.