Skip to content

Commit 10328da

Browse files
committed
Merge branch 'main' into isolation-level-samples
2 parents a2bb97a + 0aa32a4 commit 10328da

File tree

77 files changed

+1268
-898
lines changed

Some content is hidden

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

77 files changed

+1268
-898
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
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]
28+
java: [11, 17, 21, 25]
2929
steps:
3030
- uses: actions/checkout@v4
3131
- uses: actions/setup-java@v4
@@ -104,7 +104,7 @@ jobs:
104104
- uses: actions/setup-java@v4
105105
with:
106106
distribution: temurin
107-
java-version: 11
107+
java-version: 17
108108
- run: java -version
109109
- run: .kokoro/build.sh
110110
env:

.github/workflows/integration-tests-against-emulator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
- 9020:9020
1717

1818
steps:
19-
- uses: actions/checkout@v4
20-
- uses: actions/setup-java@v4
19+
- uses: actions/checkout@v5
20+
- uses: actions/setup-java@v5
2121
with:
2222
distribution: temurin
2323
java-version: 8

.github/workflows/quickperf.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
quickperf:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
24-
- uses: actions/setup-java@v4
23+
- uses: actions/checkout@v5
24+
- uses: actions/setup-java@v5
2525
with:
2626
distribution: temurin
2727
java-version: 17

.github/workflows/sample-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
test:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
24-
- uses: actions/setup-java@v4
23+
- uses: actions/checkout@v5
24+
- uses: actions/setup-java@v5
2525
with:
2626
distribution: temurin
2727
java-version: 8

.github/workflows/spring-data-jdbc-sample.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
spring-data-jdbc:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
24-
- uses: actions/setup-java@v4
23+
- uses: actions/checkout@v5
24+
- uses: actions/setup-java@v5
2525
with:
2626
distribution: temurin
2727
java-version: 17

.github/workflows/spring-data-mybatis-sample.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
spring-data-mybatis:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
24-
- uses: actions/setup-java@v4
23+
- uses: actions/checkout@v5
24+
- uses: actions/setup-java@v5
2525
with:
2626
distribution: temurin
2727
java-version: 17

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ jobs:
55
unmanaged_dependency_check:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
9-
- uses: actions/setup-java@v4
8+
- uses: actions/checkout@v5
9+
- uses: actions/setup-java@v5
1010
with:
1111
distribution: temurin
1212
java-version: 11
1313
- name: Install modules
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.2
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.3
1818
with:
1919
bom-path: pom.xml

.kokoro/build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ test)
6262
RETURN_CODE=$?
6363
;;
6464
lint)
65-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
65+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
6666
RETURN_CODE=$?
6767
;;
6868
javadoc)
@@ -76,8 +76,6 @@ integration)
7676
-DtrimStackTrace=false \
7777
-Dclirr.skip=true \
7878
-Denforcer.skip=true \
79-
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-test \
80-
-Dspanner.gce.config.project_id=span-cloud-testing \
8179
-fae \
8280
verify
8381
RETURN_CODE=$?

.kokoro/presubmit/graalvm-native-a.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.52.3"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-b.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.52.3"
77
}
88

99
env_vars: {

0 commit comments

Comments
 (0)