Skip to content

Commit 604fe07

Browse files
committed
Merge branch 'main' into dont-check-transport-channel-endpoint
2 parents 5fafdaf + 5977c1f commit 604fe07

File tree

5 files changed

+16
-20
lines changed

5 files changed

+16
-20
lines changed

.kokoro/presubmit/downstream-build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
2525
cd "${scriptDir}/../.." # git repo root
2626
source "$scriptDir/common.sh"
2727

28-
# Use GCP Maven Mirror
29-
mkdir -p "${HOME}/.m2"
30-
cp settings.xml "${HOME}/.m2"
31-
3228
# Publish this repo's modules to local maven to make them available for downstream libraries
3329
mvn install --projects '!gapic-generator-java' \
3430
-Danimal.sniffer.skip \

gapic-generator-java-pom-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
consistent across modules in this repository -->
2828
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
2929
<grpc.version>1.71.0</grpc.version>
30-
<google.auth.version>1.35.0</google.auth.version>
30+
<google.auth.version>1.36.0</google.auth.version>
3131
<google.http-client.version>1.47.0</google.http-client.version>
3232
<gson.version>2.12.1</gson.version>
3333
<guava.version>33.4.0-jre</guava.version>

gax-java/dependencies.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ version.io_grpc=1.71.0
3737
# 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
3838
maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.52.0
3939
maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.52.0
40-
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.35.0
41-
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.35.0
40+
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.36.0
41+
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.36.0
4242
maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.47.0
4343
maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1
4444
maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1

java-shared-dependencies/first-party-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<site.installationModule>${project.artifactId}</site.installationModule>
2525
<grpc-gcp.version>1.6.1</grpc-gcp.version>
26-
<google.oauth-client.version>1.37.0</google.oauth-client.version>
26+
<google.oauth-client.version>1.39.0</google.oauth-client.version>
2727
<google.api-client.version>2.7.2</google.api-client.version>
2828
</properties>
2929

settings.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1919
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
2020
https://maven.apache.org/xsd/settings-1.0.0.xsd">
21-
<mirrors>
22-
<mirror>
23-
<!-- Google's Maven Central mirror for Americas
24-
https://maven-central.storage.googleapis.com/index.html
25-
-->
26-
<id>google-maven-central</id>
27-
<name>GCS Maven Central mirror</name>
28-
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
29-
<mirrorOf>central</mirrorOf>
30-
</mirror>
31-
</mirrors>
32-
</settings>
21+
<!-- <mirrors>-->
22+
<!-- <mirror>-->
23+
<!-- &lt;!&ndash; Google's Maven Central mirror for Americas-->
24+
<!-- https://maven-central.storage.googleapis.com/index.html-->
25+
<!-- &ndash;&gt;-->
26+
<!-- <id>google-maven-central</id>-->
27+
<!-- <name>GCS Maven Central mirror</name>-->
28+
<!-- <url>https://maven-central.storage-download.googleapis.com/maven2/</url>-->
29+
<!-- <mirrorOf>central</mirrorOf>-->
30+
<!-- </mirror>-->
31+
<!-- </mirrors>-->
32+
</settings>

0 commit comments

Comments
 (0)