Merge branch 'main' into cindy/vector-search-1

Author: cindy-peng

.cloudbuild/samples_build.yaml

@@ -1,19 +1,19 @@
 steps:
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: ls
   args: [
     '-alt',
   ]
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: curl
   args: [
     '--header',
     'Metadata-Flavor: Google',
     'http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email'
   ]
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: pwd
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: bash
   args: [
     '.kokoro/build.sh'
@@ -22,7 +22,7 @@ steps:
   - 'JOB_TYPE=samples'
   - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-sample'
   - 'KOKORO_GITHUB_PULL_REQUEST_NUMBER=$_PR_NUMBER'
-- name: gcr.io/cloud-devrel-public-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java11
   entrypoint: echo
   args: [
     'Sample job succeeded',

.github/dependabot.yml

@@ -17,4 +17,15 @@ updates:
     # If a security vulnerability comes in, we will be notified about 
     # it via template in the synthtool repository.
     ignore:
-      - dependency-name: "*"
+    - dependency-name: "*"
+
+# rules for the `grpc-experimental` branch
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: daily
+    commit-message:
+      # Prefix all commit messages with "deps: "
+      prefix: "deps"
+    open-pull-requests-limit: 10
+    target-branch: "grpc-experimental"

.github/release-please.yml

@@ -34,3 +34,7 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 2.19.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    branch: 2.26.x

.github/sync-repo-settings.yaml

@@ -109,6 +109,22 @@ branchProtectionRules:
       - cla/google
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
+  - pattern: grpc-experimental
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+        - dependencies (17)
+        - lint
+        - clirr
+        - units (8)
+        - units (11)
+        - 'Kokoro - Test: Integration'
+        - cla/google
+        - 'Kokoro - Test: Java GraalVM Native Image'
+        - 'Kokoro - Test: Java 17 GraalVM Native Image'
+        - javadoc
   - pattern: 2.15.x
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
@@ -172,6 +188,24 @@ branchProtectionRules:
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
+  - pattern: 2.26.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - 'Kokoro - Test: Java GraalVM Native Image'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
+      - library_generation
+      - unmanaged_dependency_check
 permissionRules:
   - team: yoshi-admins
     permission: admin

.github/workflows/ci.yaml

@@ -59,15 +59,23 @@ jobs:
         env:
           JOB_TYPE: test
   windows:
+    # Building using Java 11 and run the tests with Java 8 runtime
     runs-on: windows-latest
     steps:
     - name: Support longpaths
       run: git config --system core.longpaths true
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
       with:
-        distribution: temurin
         java-version: 8
+        distribution: temurin
+    - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
+      run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}\bin\java" >> $GITHUB_ENV
+      shell: bash
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 11
     - run: java -version
     - run: .kokoro/build.bat
       env:

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.51.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

.github/workflows/unmanaged_dependency_check.yaml

@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1
       with:
         bom-path: google-cloud-datastore-bom/pom.xml

.kokoro/build.sh

@@ -60,6 +60,18 @@ javadoc)
     RETURN_CODE=$?
     ;;
 integration)
+    # Kokoro integration tests use both JDK 11 and JDK 8. Integration
+    # tests require JDK 11 export as JAVA env variable to run cloud datastore
+    # emulator (https://cloud.google.com/sdk/docs/release-notes#39300_2022-07-12).
+    # For Java 8 environment, we will still run the tests using Java 8 with
+    # SUREFIRE_JVM_OPT for Maven surefire plugin:
+    # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
+    if [[ -n "${JAVA11_HOME}"  &&  -n "${JAVA8_HOME}" ]]
+    then
+      export JAVA=${JAVA11_HOME}/bin/java
+      export SUREFIRE_JVM_OPT=-Djvm=${JAVA8_HOME}/bin/java
+    fi
+
     mvn -B ${INTEGRATION_TEST_ARGS} \
       -ntp \
       -Penable-integration-tests \

.kokoro/common.sh

@@ -52,7 +52,7 @@ function retry_with_backoff {
     return $exit_code
 }
 
-## Helper functionss
+## Helper functions
 function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
 function msg() { println "$*" >&2; }
 function println() { printf '%s\n' "$(now) $*"; }

.kokoro/presubmit/graalvm-native-17.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
 }
 
 env_vars: {