Skip to content

Commit

Permalink
Merge branch 'parent-native-image-config' of github.com:googleapis/go…
Browse files Browse the repository at this point in the history
…ogle-http-java-client into parent-native-image-config
  • Loading branch information
mpeddada1 committed Dec 11, 2023
2 parents 2fef0f8 + 7f75542 commit c5e64ee
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 2 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,27 @@ jobs:
- run: .kokoro/build.sh
env:
JOB_TYPE: clirr
# compilation failure for sub-modules using source and target options 7 (this setting cannot be upgraded to Java 21 because some modules support max of Java 8)
# Hence compile in Java 8 and test in Java 21.
units-java21:
# Building using Java 8 and run the tests with Java 21 runtime
name: "units (21)"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: 21
distribution: temurin
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
shell: bash
- uses: actions/setup-java@v3
with:
java-version: 8
distribution: temurin
- run: .kokoro/build.sh
env:
JOB_TYPE: test
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* Thread-safe abstract HTTP transport.
*
* <p>Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
* <p>Implementation is thread-safe, and subclasses must be thread-safe. For maximum efficiency,
* applications should use a single globally-shared instance of the HTTP transport.
*
* <p>The recommended concrete implementation HTTP transport library to use depends on what
Expand Down Expand Up @@ -158,4 +158,14 @@ public boolean isMtls() {
* @since 1.4
*/
public void shutdown() throws IOException {}

/**
* Returns whether the transport is shutdown or not.
*
* @return true if the transport is shutdown.
* @since 1.44.0
*/
public boolean isShutdown() {
return true;
}
}
3 changes: 2 additions & 1 deletion owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"license-checks.xml",
".github/workflows/samples.yaml",
".kokoro/build.sh",
"renovate.json"
"renovate.json",
".github/workflows/ci.yaml"
]
)

0 comments on commit c5e64ee

Please sign in to comment.