Skip to content
This repository was archived by the owner on Jan 22, 2024. It is now read-only.

Commit 0f37f96

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
build: add jdk 17 to java units and dependency builds (#1216) (#344)
* update dependencies.sh to not pass MaxPermSize when jdk 17 is used. MaxPermSize is an unrecognized flag in jdk 17. Source-Link: googleapis/synthtool@a4be338 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 79a4e82 commit 0f37f96

5 files changed

Lines changed: 44 additions & 18 deletions

File tree

‎.github/.OwlBot.lock.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
22
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
3-
digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a
3+
digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5

‎.github/blunderbuss.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Configuration for the Blunderbuss GitHub app. For more info see
2-
# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
2+
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
33
assign_prs_by:
44
- labels:
55
- samples

‎.github/workflows/ci.yaml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
on:
22
push:
33
branches:
4-
- master
4+
- main
55
pull_request:
66
name: ci
77
jobs:
88
units:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [8, 11]
12+
java: [8, 11, 17]
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: stCarolas/setup-maven@v4
1616
with:
1717
maven-version: 3.8.1
18-
- uses: actions/setup-java@v1
18+
- uses: actions/setup-java@v2
1919
with:
20+
distribution: zulu
2021
java-version: ${{matrix.java}}
2122
- run: java -version
2223
- run: .kokoro/build.sh
@@ -29,8 +30,9 @@ jobs:
2930
- uses: stCarolas/setup-maven@v4
3031
with:
3132
maven-version: 3.8.1
32-
- uses: actions/setup-java@v1
33+
- uses: actions/setup-java@v2
3334
with:
35+
distribution: zulu
3436
java-version: 8
3537
- run: java -version
3638
- run: .kokoro/build.bat
@@ -40,14 +42,15 @@ jobs:
4042
runs-on: ubuntu-latest
4143
strategy:
4244
matrix:
43-
java: [8, 11]
45+
java: [8, 11, 17]
4446
steps:
4547
- uses: actions/checkout@v2
4648
- uses: stCarolas/setup-maven@v4
4749
with:
4850
maven-version: 3.8.1
49-
- uses: actions/setup-java@v1
51+
- uses: actions/setup-java@v2
5052
with:
53+
distribution: zulu
5154
java-version: ${{matrix.java}}
5255
- run: java -version
5356
- run: .kokoro/dependencies.sh
@@ -58,8 +61,9 @@ jobs:
5861
- uses: stCarolas/setup-maven@v4
5962
with:
6063
maven-version: 3.8.1
61-
- uses: actions/setup-java@v1
64+
- uses: actions/setup-java@v2
6265
with:
66+
distribution: zulu
6367
java-version: 8
6468
- run: java -version
6569
- run: .kokoro/build.sh
@@ -72,8 +76,9 @@ jobs:
7276
- uses: stCarolas/setup-maven@v4
7377
with:
7478
maven-version: 3.8.1
75-
- uses: actions/setup-java@v1
79+
- uses: actions/setup-java@v2
7680
with:
81+
distribution: zulu
7782
java-version: 8
7883
- run: java -version
7984
- run: .kokoro/build.sh

‎.kokoro/dependencies.sh‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,28 @@ source ${scriptDir}/common.sh
2828
java -version
2929
echo $JOB_TYPE
3030

31-
export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
31+
function determineMavenOpts() {
32+
local javaVersion=$(
33+
# filter down to the version line, then pull out the version between quotes,
34+
# then trim the version number down to its minimal number (removing any
35+
# update or suffix number).
36+
java -version 2>&1 | grep "version" \
37+
| sed -E 's/^.*"(.*?)".*$/\1/g' \
38+
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
39+
)
40+
41+
case $javaVersion in
42+
"17")
43+
# MaxPermSize is no longer supported as of jdk 17
44+
echo -n "-Xmx1024m"
45+
;;
46+
*)
47+
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
48+
;;
49+
esac
50+
}
51+
52+
export MAVEN_OPTS=$(determineMavenOpts)
3253

3354
# this should run maven enforcer
3455
retry_with_backoff 3 10 \

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ use this Analytics Data Client Library.
7575

7676
## Samples
7777

78-
Samples are in the [`samples/`](https://github.com/googleapis/java-analytics-data/tree/master/samples) directory.
78+
Samples are in the [`samples/`](https://github.com/googleapis/java-analytics-data/tree/main/samples) directory.
7979

8080
| Sample | Source Code | Try it |
8181
| --------------------------- | --------------------------------- | ------ |
82-
| Quickstart Json Credentials Sample | [source code](https://github.com/googleapis/java-analytics-data/blob/master/samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-analytics-data&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java) |
83-
| Quickstart Sample | [source code](https://github.com/googleapis/java-analytics-data/blob/master/samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-analytics-data&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java) |
82+
| Quickstart Json Credentials Sample | [source code](https://github.com/googleapis/java-analytics-data/blob/main/samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-analytics-data&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java) |
83+
| Quickstart Sample | [source code](https://github.com/googleapis/java-analytics-data/blob/main/samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-analytics-data&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java) |
8484

8585

8686

@@ -196,10 +196,10 @@ Java is a registered trademark of Oracle and/or its affiliates.
196196
[developer-console]: https://console.developers.google.com/
197197
[create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
198198
[cloud-sdk]: https://cloud.google.com/sdk/
199-
[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting
200-
[contributing]: https://github.com/googleapis/java-analytics-data/blob/master/CONTRIBUTING.md
201-
[code-of-conduct]: https://github.com/googleapis/java-analytics-data/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
202-
[license]: https://github.com/googleapis/java-analytics-data/blob/master/LICENSE
199+
[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
200+
[contributing]: https://github.com/googleapis/java-analytics-data/blob/main/CONTRIBUTING.md
201+
[code-of-conduct]: https://github.com/googleapis/java-analytics-data/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
202+
[license]: https://github.com/googleapis/java-analytics-data/blob/main/LICENSE
203203
[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
204204
[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=analytics-data.googleapis.com
205205
[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM

0 commit comments

Comments
 (0)