Skip to content
This repository was archived by the owner on May 14, 2026. It is now read-only.

Commit 75ac219

Browse files
authored
Merge branch 'main' into release-please--branches--main
2 parents 5d0d007 + 90b0a33 commit 75ac219

4 files changed

Lines changed: 18 additions & 23 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ jobs:
9191
- name: Integration Tests
9292
run: |
9393
bazelisk --batch test //test/integration/...
94-
build-java-24:
95-
name: "build(24) except self-service clients"
96-
# Support for Java 24 is available for all use cases except self-service clients.
94+
build-java-25:
95+
name: "build(25) except self-service clients"
96+
# Support for Java 25 is available for all use cases except self-service clients.
9797
runs-on: ubuntu-22.04
9898
steps:
9999
- uses: actions/checkout@v4
100100
- uses: actions/setup-java@v4
101101
with:
102-
java-version: 24
102+
java-version: 25
103103
distribution: temurin
104104
cache: maven
105105
- run: java -version
@@ -120,7 +120,7 @@ jobs:
120120
- run: bazelisk version
121121
- name: Install Maven modules
122122
run: |
123-
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
123+
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
124124
- name: Integration Tests
125125
# note need to set shouldInstallTestSecurityManager=false due to https://github.com/bazelbuild/bazel/issues/24354
126126
run: |
@@ -307,7 +307,7 @@ jobs:
307307
runs-on: ubuntu-22.04
308308
strategy:
309309
matrix:
310-
java: [ 11, 17, 21, 24 ]
310+
java: [ 11, 17, 21, 25 ]
311311
steps:
312312
- uses: actions/checkout@v4
313313
- uses: actions/setup-java@v4
@@ -318,11 +318,6 @@ jobs:
318318
- name: Install Maven modules
319319
run: |
320320
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
321-
- name: Java Linter
322-
if: matrix.java >= 17
323-
working-directory: java-showcase
324-
run: |
325-
mvn -B -ntp fmt:check
326321
- name: Showcase golden tests
327322
working-directory: java-showcase
328323
run: |

dependencies.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@
77
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml
88
javax.annotation-api=1.3.2
99
grpc=1.75.0
10-
google.auth=1.39.0
11-
google.http-client=2.0.0
10+
google.auth=1.39.1
11+
google.http-client=2.0.1
1212
gson=2.13.2
13-
guava=33.4.8-jre
13+
guava=33.5.0-jre
1414
protobuf=4.32.1
1515
# Note: This opentelemetry version refers to the opentelemetry-bom
16-
opentelemetry=1.54.0
17-
errorprone=2.41.0
16+
opentelemetry=1.54.1
17+
errorprone=2.42.0
1818
j2objc-annotations=3.1
1919
threetenbp=1.7.2
2020
slf4j=2.0.17
2121

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

2828
# 3P Shared-Deps
2929
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/third-party-dependencies/pom.xml
3030
threeten-extra=1.8.0
31-
opencensus=0.31.0
31+
opencensus=0.31.1
3232
findbugs=3.0.2
3333
jackson=2.20.0
3434
codec=1.19.0
3535
httpcomponents.httpcore=4.4.16
3636
httpcomponents.httpclient=4.5.14
37-
apache-httpclient-5=5.5
38-
apache-httpcore-5=5.3.5
37+
apache-httpclient-5=5.5.1
38+
apache-httpcore-5=5.3.6
3939
perfmark-api=0.27.0
4040
# Note: This is the google opentelemetry exporter and not the general opentelemetry project
4141
google.cloud.opentelemetry=0.36.0
@@ -45,4 +45,4 @@ dev.cel=0.11.0
4545
com.google.crypto.tink=1.18.0
4646
# The follow opentelemetry dependencies have a different version from the opentelemetry-bom
4747
opentelemetry-semconv=1.37.0
48-
io.opentelemetry.contrib.opentelemetry-gcp-resources=1.49.0-alpha
48+
io.opentelemetry.contrib.opentelemetry-gcp-resources=1.50.0-alpha

hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
java: [11, 17, 21, 24]
28+
java: [11, 17, 21, 25]
2929
steps:
3030
- uses: actions/checkout@v4
3131
- uses: actions/setup-java@v4

java-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>org.easymock</groupId>
5555
<artifactId>easymock</artifactId>
56-
<version>5.5.0</version>
56+
<version>5.6.0</version>
5757
<scope>test</scope>
5858
</dependency>
5959
<dependency>

0 commit comments

Comments
 (0)