diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f60d7749..a79f0627 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 -# created: 2022-04-06T16:30:03.627422514Z + digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74 +# created: 2022-05-19T15:12:45.278246753Z diff --git a/.github/release-please.yml b/.github/release-please.yml index d17a48e9..bf18750f 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -10,3 +10,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.2.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.3.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 92e335f0..3116ad37 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -48,6 +48,21 @@ branchProtectionRules: - 'Kokoro - Test: Integration' - cla/google - OwlBot Post Processor + - pattern: 2.3.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor permissionRules: - team: yoshi-admins permission: admin diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 4e4103a8..e46e457d 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -74,6 +74,11 @@ graalvm) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; +graalvm17) + # Run Unit and Integration Tests with Native Image + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + 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/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg new file mode 100644 index 00000000..a3f7fb9d --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-17.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/graalvm17" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm17" +} + +# 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" +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 416ba798..20a5fde4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [2.4.0](https://github.com/googleapis/java-container/compare/v2.3.7...v2.4.0) (2022-05-24) + + +### Features + +* add build scripts for native image testing in Java 17 ([#1440](https://github.com/googleapis/java-container/issues/1440)) ([#734](https://github.com/googleapis/java-container/issues/734)) ([4352159](https://github.com/googleapis/java-container/commit/4352159757856a07383958d028d392e536ebb44a)) +* next release from main branch is 2.4.0 ([#721](https://github.com/googleapis/java-container/issues/721)) ([559523d](https://github.com/googleapis/java-container/commit/559523d7ec19d5498dd1aa7d9e08368ddb283671)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.11.0 ([#733](https://github.com/googleapis/java-container/issues/733)) ([f65c10f](https://github.com/googleapis/java-container/commit/f65c10f4a6211dc85a3c8a54212f843a65b771cd)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.12.0 ([#735](https://github.com/googleapis/java-container/issues/735)) ([c48441f](https://github.com/googleapis/java-container/commit/c48441f78bf04de0d8072d8c0a13726436618e5e)) + ### [2.3.7](https://github.com/googleapis/java-container/compare/v2.3.6...v2.3.7) (2022-04-15) diff --git a/README.md b/README.md index 10872c72..373dbfb9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 25.1.0 + 25.3.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-container - 2.3.6 + 2.3.7 ``` @@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:25.1.0') +implementation platform('com.google.cloud:libraries-bom:25.3.0') implementation 'com.google.cloud:google-cloud-container' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-container:2.3.6' +implementation 'com.google.cloud:google-cloud-container:2.3.7' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.3.6" +libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.3.7" ``` ## Authentication diff --git a/google-cloud-container-bom/pom.xml b/google-cloud-container-bom/pom.xml index 7fdb5d5f..1093763c 100644 --- a/google-cloud-container-bom/pom.xml +++ b/google-cloud-container-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-container-bom - 2.3.7 + 2.4.0 pom com.google.cloud google-cloud-shared-config - 1.3.2 + 1.4.0 Google Cloud container BOM @@ -52,27 +52,27 @@ com.google.cloud google-cloud-container - 2.3.7 + 2.4.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.7 + 2.4.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.7 + 2.4.0 com.google.api.grpc proto-google-cloud-container-v1 - 2.3.7 + 2.4.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.7 + 2.4.0 diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml index 0813316b..80580684 100644 --- a/google-cloud-container/pom.xml +++ b/google-cloud-container/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-container - 2.3.7 + 2.4.0 jar Google Cloud Container https://github.com/googleapis/java-container @@ -11,7 +11,7 @@ com.google.cloud google-cloud-container-parent - 2.3.7 + 2.4.0 google-cloud-container diff --git a/grpc-google-cloud-container-v1/pom.xml b/grpc-google-cloud-container-v1/pom.xml index eb72af04..6dce90cb 100644 --- a/grpc-google-cloud-container-v1/pom.xml +++ b/grpc-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.7 + 2.4.0 grpc-google-cloud-container-v1 GRPC library for grpc-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.3.7 + 2.4.0 diff --git a/grpc-google-cloud-container-v1beta1/pom.xml b/grpc-google-cloud-container-v1beta1/pom.xml index c0058924..e76ee988 100644 --- a/grpc-google-cloud-container-v1beta1/pom.xml +++ b/grpc-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.7 + 2.4.0 grpc-google-cloud-container-v1beta1 GRPC library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.3.7 + 2.4.0 diff --git a/pom.xml b/pom.xml index a83f27f4..bf125525 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-container-parent pom - 2.3.7 + 2.4.0 Google Cloud Container Parent https://github.com/googleapis/java-container @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.3.2 + 1.4.0 @@ -61,33 +61,33 @@ com.google.api.grpc proto-google-cloud-container-v1 - 2.3.7 + 2.4.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.7 + 2.4.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.7 + 2.4.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.7 + 2.4.0 com.google.cloud google-cloud-container - 2.3.7 + 2.4.0 com.google.cloud google-cloud-shared-dependencies - 2.10.0 + 2.12.0 pom import @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.2.2 + 3.3.0 @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 html diff --git a/proto-google-cloud-container-v1/pom.xml b/proto-google-cloud-container-v1/pom.xml index 11ba2404..acceeaf6 100644 --- a/proto-google-cloud-container-v1/pom.xml +++ b/proto-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1 - 2.3.7 + 2.4.0 proto-google-cloud-container-v1 PROTO library for proto-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.3.7 + 2.4.0 diff --git a/proto-google-cloud-container-v1beta1/pom.xml b/proto-google-cloud-container-v1beta1/pom.xml index 42f6296f..903669fd 100644 --- a/proto-google-cloud-container-v1beta1/pom.xml +++ b/proto-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.7 + 2.4.0 proto-google-cloud-container-v1beta1 Proto library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.3.7 + 2.4.0 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 2a47c1b7..8c9a4bb8 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-container - 2.3.6 + 2.3.7 diff --git a/samples/pom.xml b/samples/pom.xml index b7510220..66fb5dd2 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -46,7 +46,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.12 + 1.6.13 true diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5a04c7c0..55711776 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-container - 2.3.6 + 2.3.7 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 7308e6a5..4c8080b8 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 25.1.0 + 25.3.0 pom import diff --git a/versions.txt b/versions.txt index 2a38abe2..b86ed446 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-container:2.3.7:2.3.7 -grpc-google-cloud-container-v1:2.3.7:2.3.7 -grpc-google-cloud-container-v1beta1:2.3.7:2.3.7 -proto-google-cloud-container-v1:2.3.7:2.3.7 -proto-google-cloud-container-v1beta1:2.3.7:2.3.7 +google-cloud-container:2.4.0:2.4.0 +grpc-google-cloud-container-v1:2.4.0:2.4.0 +grpc-google-cloud-container-v1beta1:2.4.0:2.4.0 +proto-google-cloud-container-v1:2.4.0:2.4.0 +proto-google-cloud-container-v1beta1:2.4.0:2.4.0