diff --git a/.kokoro/build.sh b/.kokoro/build.sh index ee3e4d95..55158ab7 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,6 +69,11 @@ integration) verify RETURN_CODE=$? ;; +graalvm) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7..d7476cfe 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,15 +38,13 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - case $javaVersion in - "17") + if [[ $javaVersion == 17* ]] + then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" - ;; - *) + else echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; - esac + fi } export MAVEN_OPTS=$(determineMavenOpts) diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg new file mode 100644 index 00000000..4c7225ec --- /dev/null +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/CHANGELOG.md b/CHANGELOG.md index bf2b8651..7e0a518a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.2.0](https://www.github.com/googleapis/java-containeranalysis/compare/v2.1.9...v2.2.0) (2021-10-27) + + +### Features + +* Introduce Native Image testing build script changes ([#733](https://www.github.com/googleapis/java-containeranalysis/issues/733)) ([2b2e65f](https://www.github.com/googleapis/java-containeranalysis/commit/2b2e65ffbe3da4a27070a0e6e15af9f1f42ef8fb)) + + +### Bug Fixes + +* **java:** java 17 dependency arguments ([#740](https://www.github.com/googleapis/java-containeranalysis/issues/740)) ([e9261d2](https://www.github.com/googleapis/java-containeranalysis/commit/e9261d203ee7b5f577e5d5843845a3a033e4dac3)) + ### [2.1.9](https://www.github.com/googleapis/java-containeranalysis/compare/v2.1.8...v2.1.9) (2021-10-19) diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index b3f1a8ce..a11523a9 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 2.1.9 + 2.2.0 pom com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.0 Google Cloud Container Analysis BOM @@ -53,27 +53,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.9 + 2.2.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.9 + 0.92.0 com.google.cloud google-cloud-containeranalysis - 2.1.9 + 2.2.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.9 + 2.2.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.9 + 0.92.0 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 24cb1b9f..38098c16 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 2.1.9 + 2.2.0 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 2.1.9 + 2.2.0 google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index 983835c6..fa0e8e77 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.9 + 2.2.0 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.9 + 2.2.0 diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index c344412a..f8445aaa 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.9 + 0.92.0 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.9 + 2.2.0 diff --git a/pom.xml b/pom.xml index 0769dbef..88d28985 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 2.1.9 + 2.2.0 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.0 @@ -61,27 +61,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.9 + 2.2.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.9 + 0.92.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.9 + 0.92.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.9 + 2.2.0 com.google.cloud google-cloud-containeranalysis - 2.1.9 + 2.2.0 diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index de16783d..7d97fb35 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.9 + 2.2.0 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.9 + 2.2.0 diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index a822764c..1f7938ab 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.9 + 0.92.0 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.9 + 2.2.0 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index f86008d8..dc1c6129 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-containeranalysis - 2.1.8 + 2.1.9 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 209c1143..5606724a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-containeranalysis - 2.1.8 + 2.1.9 diff --git a/synth.metadata b/synth.metadata index a0a9e98a..77fce3cd 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "e82b1fc8fd69b6fd8711fa0c576ceb2897f00c3a" + "sha": "ed0df7d8cf7850854844826362d401e87d3870db" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "a4be3384ccb92364795d981f2863f6986fcee620" + "sha": "cb2755306975de4c54ea549c9deb25703b3731bb" } } ], @@ -71,6 +71,7 @@ ".kokoro/presubmit/clirr.cfg", ".kokoro/presubmit/common.cfg", ".kokoro/presubmit/dependencies.cfg", + ".kokoro/presubmit/graalvm-native.cfg", ".kokoro/presubmit/integration.cfg", ".kokoro/presubmit/java11.cfg", ".kokoro/presubmit/java7.cfg", diff --git a/versions.txt b/versions.txt index 6f409334..e13bec78 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:2.1.9:2.1.9 -proto-google-cloud-containeranalysis-v1beta1:0.91.9:0.91.9 -grpc-google-cloud-containeranalysis-v1beta1:0.91.9:0.91.9 -grpc-google-cloud-containeranalysis-v1:2.1.9:2.1.9 -google-cloud-containeranalysis:2.1.9:2.1.9 +proto-google-cloud-containeranalysis-v1:2.2.0:2.2.0 +proto-google-cloud-containeranalysis-v1beta1:0.92.0:0.92.0 +grpc-google-cloud-containeranalysis-v1beta1:0.92.0:0.92.0 +grpc-google-cloud-containeranalysis-v1:2.2.0:2.2.0 +google-cloud-containeranalysis:2.2.0:2.2.0