Skip to content

Commit afb6ae6

Browse files
JoeWang1127JoeWang1127
committed
merge main branch
2 parents c26da4b + ce5998f commit afb6ae6

File tree

52 files changed

+383
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+383
-217
lines changed

‎.cloudbuild/graalvm/cloudbuild-test-a.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.45.1' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

‎.cloudbuild/graalvm/cloudbuild-test-b.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.45.1' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

‎.cloudbuild/graalvm/cloudbuild.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.45.1' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
steps:
2020
# GraalVM A build

‎.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_GAPIC_GENERATOR_JAVA_VERSION: '2.55.1' # {x-version-update:gapic-generator-java:current}
17+
_GAPIC_GENERATOR_JAVA_VERSION: '2.55.2-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
1818
_PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
1919
_PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
2020
_PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"

‎.cloudbuild/library_generation/library_generation.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-11-alpine@sha256:456f60c1643c
2020
WORKDIR /sdk-platform-java
2121
COPY . .
2222
# {x-version-update-start:gapic-generator-java:current}
23-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.55.1"
23+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.55.2-SNAPSHOT"
2424
# {x-version-update-end}
2525

2626
RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip

‎.cloudbuild/library_generation/library_generation_airlock.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f0
2121
WORKDIR /sdk-platform-java
2222
COPY . .
2323
# {x-version-update-start:gapic-generator-java:current}
24-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.55.1"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.55.2-SNAPSHOT"
2525
# {x-version-update-end}
2626

2727
RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip

‎.github/workflows/java_sdk_logging.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
# Github action job to test core java library features on
15+
# downstream client libraries before they are released.
16+
on:
17+
push:
18+
branches:
19+
- main
20+
pull_request:
21+
paths:
22+
- java-sdk-logging/**
23+
24+
name: java-sdk-logging-ci
25+
jobs:
26+
unit-test:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@v4
30+
- uses: actions/setup-java@v4
31+
with:
32+
java-version: 8
33+
distribution: temurin
34+
- name: Install parent module
35+
run: |
36+
mvn install -B -ntp -pl gapic-generator-java-pom-parent
37+
- name: Unit Tests
38+
working-directory: java-sdk-logging
39+
run: |
40+
mvn test -B -ntp -Dcheckstyle.skip -Dfmt.skip
41+
module-lint:
42+
runs-on: ubuntu-latest
43+
steps:
44+
- uses: actions/checkout@v4
45+
- uses: actions/setup-java@v4
46+
with:
47+
java-version: 11
48+
distribution: temurin
49+
- name: Install parent module
50+
run: |
51+
mvn install -B -ntp -pl gapic-generator-java-pom-parent
52+
- name: Java Linter
53+
run: |
54+
mvn -B -ntp fmt:check
55+
working-directory: java-sdk-logging

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
5858
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
5959
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
6060

61-
_gapic_generator_java_version = "2.55.1" # {x-version-update:gapic-generator-java:current}
61+
_gapic_generator_java_version = "2.55.2-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
6262

6363
maven_install(
6464
artifacts = [

‎api-common-java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<groupId>com.google.api</groupId>
66
<artifactId>api-common</artifactId>
77
<packaging>jar</packaging>
8-
<version>2.46.1</version><!-- {x-version-update:api-common:current} -->
8+
<version>2.46.2-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
99
<name>API Common</name>
1010
<description>Common utilities for Google APIs in Java</description>
1111

1212
<parent>
1313
<groupId>com.google.api</groupId>
1414
<artifactId>gapic-generator-java-pom-parent</artifactId>
15-
<version>2.55.1</version><!-- {x-version-update:gapic-generator-java:current} -->
15+
<version>2.55.2-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
1616
<relativePath>../gapic-generator-java-pom-parent</relativePath>
1717
</parent>
1818

‎coverage-report/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@
3131
<dependency>
3232
<groupId>com.google.api</groupId>
3333
<artifactId>gax</artifactId>
34-
<version>2.63.1</version> <!-- {x-version-update:gax:current} -->
34+
<version>2.63.2-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
3535
</dependency>
3636
<dependency>
3737
<groupId>com.google.api</groupId>
3838
<artifactId>gax-grpc</artifactId>
39-
<version>2.63.1</version> <!-- {x-version-update:gax-grpc:current} -->
39+
<version>2.63.2-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
4040
</dependency>
4141
<dependency>
4242
<groupId>com.google.api</groupId>
4343
<artifactId>gax-httpjson</artifactId>
44-
<version>2.63.1</version> <!-- {x-version-update:gax:current} -->
44+
<version>2.63.2-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
4545
</dependency>
4646
<dependency>
4747
<groupId>com.google.api</groupId>
4848
<artifactId>api-common</artifactId>
49-
<version>2.46.1</version> <!-- {x-version-update:api-common:current} -->
49+
<version>2.46.2-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
5050
</dependency>
5151
</dependencies>
5252

0 commit comments

Comments
 (0)