Skip to content

Commit ed00a55

Browse files
authored
Merge branch 'googleapis:main' into docFix
2 parents 7a7700e + b14ee87 commit ed00a55

File tree

8 files changed

+32
-20
lines changed

8 files changed

+32
-20
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
16-
digest: sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7
17-
# created: 2023-06-22T15:06:52.039318836Z
16+
digest: sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9
17+
# created: 2023-06-27T18:51:58.922150125Z

.github/workflows/ci.yaml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v3
3131
- uses: actions/setup-java@v3
3232
with:
33-
distribution: zulu
33+
distribution: temurin
3434
java-version: ${{matrix.java}}
3535
- run: java -version
3636
- run: .kokoro/build.sh
@@ -45,13 +45,13 @@ jobs:
4545
- uses: actions/setup-java@v3
4646
with:
4747
java-version: 8
48-
distribution: zulu
48+
distribution: temurin
4949
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
5050
shell: bash
5151
- uses: actions/setup-java@v3
5252
with:
5353
java-version: 17
54-
distribution: zulu
54+
distribution: temurin
5555
- run: .kokoro/build.sh
5656
env:
5757
JOB_TYPE: test
@@ -62,13 +62,13 @@ jobs:
6262
- uses: actions/setup-java@v3
6363
with:
6464
java-version: 8
65-
distribution: zulu
65+
distribution: temurin
6666
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
6767
shell: bash
6868
- uses: actions/setup-java@v3
6969
with:
7070
java-version: 11
71-
distribution: zulu
71+
distribution: temurin
7272
- run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
7373
shell: bash
7474
- run: java -version
@@ -84,17 +84,29 @@ jobs:
8484
- uses: actions/checkout@v3
8585
- uses: actions/setup-java@v3
8686
with:
87-
distribution: zulu
87+
distribution: temurin
8888
java-version: ${{matrix.java}}
8989
- run: java -version
9090
- run: .kokoro/dependencies.sh
91+
javadoc:
92+
runs-on: ubuntu-latest
93+
steps:
94+
- uses: actions/checkout@v3
95+
- uses: actions/setup-java@v3
96+
with:
97+
distribution: temurin
98+
java-version: 17
99+
- run: java -version
100+
- run: .kokoro/build.sh
101+
env:
102+
JOB_TYPE: javadoc
91103
lint:
92104
runs-on: ubuntu-latest
93105
steps:
94106
- uses: actions/checkout@v3
95107
- uses: actions/setup-java@v3
96108
with:
97-
distribution: zulu
109+
distribution: temurin
98110
java-version: 17
99111
- run: java -version
100112
- run: .kokoro/build.sh
@@ -106,7 +118,7 @@ jobs:
106118
- uses: actions/checkout@v3
107119
- uses: actions/setup-java@v3
108120
with:
109-
distribution: zulu
121+
distribution: temurin
110122
java-version: 17
111123
- run: java -version
112124
- run: .kokoro/build.sh

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
- uses: actions/setup-java@v3
2525
with:
2626
java-version: 11
27-
distribution: zulu
27+
distribution: temurin
2828
- name: Compiling main library
2929
run: .kokoro/build.sh
3030
- uses: actions/setup-java@v3
3131
with:
3232
java-version: 8
33-
distribution: zulu
33+
distribution: temurin
3434
- name: Running tests
3535
run: |
3636
mvn -V -B -Dspanner.testenv.instance="" -Penable-integration-tests \

.github/workflows/samples.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
with:
2222
# Java 11 to generate class file targeting Java 8
2323
java-version: 11
24-
distribution: zulu
24+
distribution: temurin
2525
- name: Compile Spanner
2626
run: mvn clean install -Dclirr.skip=true
2727
- uses: actions/setup-java@v3
2828
with:
2929
java-version: 8
30-
distribution: zulu
30+
distribution: temurin
3131
- name: Compile samples
3232
run: mvn compile
3333
working-directory: samples
@@ -42,7 +42,7 @@ jobs:
4242
- uses: actions/setup-java@v3
4343
with:
4444
java-version: ${{matrix.java}}
45-
distribution: zulu
45+
distribution: temurin
4646
- name: Compile Spanner
4747
run: mvn clean install -Dclirr.skip=true
4848
- name: Compile samples

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>26.18.0</version>
22+
<version>26.19.0</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -50,7 +50,7 @@ If you are using Maven without the BOM, add this to your dependencies:
5050
If you are using Gradle 5.x or later, add this to your dependencies:
5151

5252
```Groovy
53-
implementation platform('com.google.cloud:libraries-bom:26.18.0')
53+
implementation platform('com.google.cloud:libraries-bom:26.19.0')
5454
5555
implementation 'com.google.cloud:google-cloud-spanner'
5656
```

google-cloud-spanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<site.installationModule>google-cloud-spanner</site.installationModule>
1818
<opencensus.version>0.31.1</opencensus.version>
19-
<graalvm.version>22.3.2</graalvm.version>
19+
<graalvm.version>22.3.3</graalvm.version>
2020
<spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
2121
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-east1</spanner.testenv.instance>
2222
<spanner.gce.config.project_id>gcloud-devel</spanner.gce.config.project_id>

samples/native-image/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.google.cloud</groupId>
3030
<artifactId>libraries-bom</artifactId>
31-
<version>26.18.0</version>
31+
<version>26.19.0</version>
3232
<type>pom</type>
3333
<scope>import</scope>
3434
</dependency>

samples/snippets/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>com.google.cloud</groupId>
3535
<artifactId>libraries-bom</artifactId>
36-
<version>26.18.0</version>
36+
<version>26.19.0</version>
3737
<type>pom</type>
3838
<scope>import</scope>
3939
</dependency>

0 commit comments

Comments
 (0)