Skip to content

Commit cf4f3b4

Browse files
gcf-owl-bot[bot]dependabot[bot]SurferJeffAtGoogleparthea
committed
chore: bump urllib3 from 2.0.3 to 2.0.6 in /docker/owlbot/java/src (#1873)
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.0.3 to 2.0.6. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@2.0.3...2.0.6) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jeffrey Rennie <rennie@google.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com> Source-Link: googleapis/synthtool@e19b0b1 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:411589ea6aca20f400adb0291a11fb9f12bf3f968ff7e5ec1d2a2eb1800ea5d1
1 parent 13edd13 commit cf4f3b4

File tree

5 files changed

+380
-254
lines changed

5 files changed

+380
-254
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:c33bd13e1eab022b0499a3afbfb4b93ae10cb8ad89d8203a6343a88b1b78400f
17-
# created: 2023-06-21T18:48:32.287298785Z
16+
digest: sha256:411589ea6aca20f400adb0291a11fb9f12bf3f968ff7e5ec1d2a2eb1800ea5d1
17+
# created: 2023-10-11T14:20:39.368918544Z

.github/workflows/ci.yaml

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,39 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
java: [8, 11, 17]
28+
java: [11, 17]
2929
steps:
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
3737
env:
3838
JOB_TYPE: test
39+
units-java8:
40+
# Building using Java 17 and run the tests with Java 8 runtime
41+
name: "units (8)"
42+
runs-on: ubuntu-latest
43+
steps:
44+
- uses: actions/checkout@v3
45+
- uses: actions/setup-java@v3
46+
with:
47+
java-version: 8
48+
distribution: temurin
49+
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
50+
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
51+
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
52+
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
53+
shell: bash
54+
- uses: actions/setup-java@v3
55+
with:
56+
java-version: 17
57+
distribution: temurin
58+
- run: .kokoro/build.sh
59+
env:
60+
JOB_TYPE: test
3961
windows:
4062
runs-on: windows-latest
4163
steps:
@@ -44,7 +66,7 @@ jobs:
4466
- uses: actions/checkout@v3
4567
- uses: actions/setup-java@v3
4668
with:
47-
distribution: zulu
69+
distribution: temurin
4870
java-version: 8
4971
- run: java -version
5072
- run: .kokoro/build.bat
@@ -54,22 +76,34 @@ jobs:
5476
runs-on: ubuntu-latest
5577
strategy:
5678
matrix:
57-
java: [8, 11, 17]
79+
java: [17]
5880
steps:
5981
- uses: actions/checkout@v3
6082
- uses: actions/setup-java@v3
6183
with:
62-
distribution: zulu
84+
distribution: temurin
6385
java-version: ${{matrix.java}}
6486
- run: java -version
6587
- run: .kokoro/dependencies.sh
88+
javadoc:
89+
runs-on: ubuntu-latest
90+
steps:
91+
- uses: actions/checkout@v3
92+
- uses: actions/setup-java@v3
93+
with:
94+
distribution: temurin
95+
java-version: 17
96+
- run: java -version
97+
- run: .kokoro/build.sh
98+
env:
99+
JOB_TYPE: javadoc
66100
lint:
67101
runs-on: ubuntu-latest
68102
steps:
69103
- uses: actions/checkout@v3
70104
- uses: actions/setup-java@v3
71105
with:
72-
distribution: zulu
106+
distribution: temurin
73107
java-version: 11
74108
- run: java -version
75109
- run: .kokoro/build.sh
@@ -81,7 +115,7 @@ jobs:
81115
- uses: actions/checkout@v3
82116
- uses: actions/setup-java@v3
83117
with:
84-
distribution: zulu
118+
distribution: temurin
85119
java-version: 8
86120
- run: java -version
87121
- run: .kokoro/build.sh

.kokoro/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ set +e
4747

4848
case ${JOB_TYPE} in
4949
test)
50-
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
50+
echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
51+
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
5152
RETURN_CODE=$?
5253
;;
5354
lint)

0 commit comments

Comments
 (0)