Migrate java datastore #11874

blakeli0 · 2026-01-29T23:38:16Z

cloud-java-team-teamsync can be changed to Tomo's new alias cloud-sdk-java-team now.

blakeli0 · 2026-01-29T23:37:21Z

We probably want to trigger this on Gax changes as well. Do we want to put it there now? Or later when sdk-platform-java is being migrated?

Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@

		# java-vertexai has maintainers
		/java-vertexai/ @googleapis/vertex-java-sdk @googleapis/cloud-java-team-teamsync
		/java-datastore/ @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners @googleapis/cloud-java-team-teamsync
Copy link Contributor blakeli0 Jan 29, 2026 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. `cloud-java-team-teamsync` can be changed to Tomo's new alias `cloud-sdk-java-team` now.

-Original file line number
+Diff line change
@@ -0,0 +1,147 @@
+    # Copyright 2022 Google LLC
+    #
+    # Licensed under the Apache License, Version 2.0 (the "License");
+    # you may not use this file except in compliance with the License.
+    # You may obtain a copy of the License at
+    #
+    #      http://www.apache.org/licenses/LICENSE-2.0
+    #
+    # Unless required by applicable law or agreed to in writing, software
+    # distributed under the License is distributed on an "AS IS" BASIS,
+    # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    # See the License for the specific language governing permissions and
+    # limitations under the License.
+    # Github action job to test core java library features on
+    # downstream client libraries before they are released.
+    on:
+      push:
+        branches:
+        - main
+      pull_request:
+    name: java-datastore ci
+    env:
+      BUILD_SUBDIR: java-datastore
+    jobs:
+      filter:
+        runs-on: ubuntu-latest
+        outputs:
+          library: ${{ steps.filter.outputs.library }}
+        steps:
+        - uses: actions/checkout@v4
+        - uses: dorny/paths-filter@v3
+          id: filter
+          with:
+            filters: |
+              library:
+                - 'java-datastore/**'
+      units:
+        needs: filter
+        if: ${{ needs.filter.outputs.library == 'true' }}
+        runs-on: ubuntu-latest
+        strategy:
+          fail-fast: false
+          matrix:
+            java: [11, 17, 21, 25]
+        steps:
+        - uses: actions/checkout@v4
+        - uses: actions/setup-java@v4
+          with:
+            distribution: temurin
+            java-version: ${{matrix.java}}
+        - run: java -version
+        - run: .kokoro/build.sh
+          env:
+            JOB_TYPE: test
+      units-java8:
+        needs: filter
+        if: ${{ needs.filter.outputs.library == 'true' }}
+        # Building using Java 17 and run the tests with Java 8 runtime
+        name: "units (8)"
+        runs-on: ubuntu-latest
+        steps:
+          - uses: actions/checkout@v4
+          - uses: actions/setup-java@v4
+            with:
+              java-version: 8
+              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 -P !java17" >> $GITHUB_ENV
+            shell: bash
+          - uses: actions/setup-java@v4
+            with:
+              java-version: 17
+              distribution: temurin
+          - run: .kokoro/build.sh
+            env:
+              JOB_TYPE: test
+      windows:
+        needs: filter
+        if: ${{ needs.filter.outputs.library == 'true' }}
+        # 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
+        - name: Support longpaths
+          run: git config --system core.longpaths true
+        - uses: actions/checkout@v4
+        - uses: actions/setup-java@v4
+          with:
+            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 -P !java17" >> $GITHUB_ENV
+          shell: bash
+        - uses: actions/setup-java@v4
+          with:
+            distribution: temurin
+            java-version: 11
+        - run: java -version
+        - run: .kokoro/build.sh
+          env:
+            JOB_TYPE: test
+      dependencies:
+        needs: filter
+        if: ${{ needs.filter.outputs.library == 'true' }}
+        runs-on: ubuntu-latest
+        strategy:
+          matrix:
+            java: [17]
+        steps:
+        - uses: actions/checkout@v4
+        - uses: actions/setup-java@v4
+          with:
+            distribution: temurin
+            java-version: ${{matrix.java}}
+        - run: java -version
+        - run: .kokoro/dependencies.sh
+      javadoc:
+        needs: filter
+        if: ${{ needs.filter.outputs.library == 'true' }}
+        runs-on: ubuntu-latest
+        steps:
+        - uses: actions/checkout@v4
+        - uses: actions/setup-java@v4
+          with:
+            distribution: temurin
+            java-version: 17
+        - run: java -version
+        - run: .kokoro/build.sh
+          env:
+            JOB_TYPE: javadoc
+      lint:
+        needs: filter
+        if: ${{ needs.filter.outputs.library == 'true' }}
+        runs-on: ubuntu-latest
+        steps:
+        - uses: actions/checkout@v4
+        - uses: actions/setup-java@v4
+          with:
+            distribution: temurin
+            java-version: 17
+        - run: java -version
+        - run: .kokoro/build.sh
+          env:
+            JOB_TYPE: lint

-Original file line number
+Diff line change
@@ Expand Up @@
       source "${KOKORO_GFILE_DIR}/secret_manager/java-bigqueryconnection-samples-secrets"
     fi
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
+    fi
     RETURN_CODE=0
     case ${JOB_TYPE} in
       test)
+        echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
         retry_with_backoff 3 10 \
           mvn test \
             -B -ntp \
@@ Expand All / @@ -48,11 +55,12 @@ case ${JOB_TYPE} in @@
             -Dflatten.skip=true \
             -Danimal.sniffer.skip=true \
             -Dmaven.wagon.http.retryHandler.count=5 \
-            -T 1C
+            -T 1C ${SUREFIRE_JVM_OPT}
         RETURN_CODE=$?
         echo "Finished running unit tests"
         ;;
       integration)
+        export DATASTORE_PROJECT_ID="${GOOGLE_CLOUD_PROJECT}"
         generate_modified_modules_list
         if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
           echo "Skipping integration tests as this is Release Please SNAPSHOT pull request."
@@ Expand Down Expand Up / @@ -125,6 +133,12 @@ case ${JOB_TYPE} in @@
     esac
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "restoring directory"
+      popd
+    fi
     if [ "${REPORT_COVERAGE}" == "true" ]; then
       bash ${KOKORO_GFILE_DIR}/codecov.sh
     fi
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,12 @@ function determineMavenOpts() { @@
     export MAVEN_OPTS=$(determineMavenOpts)
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
+    fi
     # this should run maven enforcer
     retry_with_backoff 3 10 \
       mvn install -B -V -ntp \
@@ Expand All / @@ -57,3 +63,9 @@ retry_with_backoff 3 10 \ @@
         -Dclirr.skip=true
     mvn -B dependency:analyze -DfailOnWarning=true
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "Leaving subdir: ${BUILD_SUBDIR}"
+      popd
+    fi

-Original file line number
+Diff line change
@@ Expand Up / @@ -497,6 +497,13 @@ @@
             <type>pom</type>
             <scope>import</scope>
           </dependency>
+          <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-datastore-bom</artifactId>
+            <version>2.33.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+            <type>pom</type>
+            <scope>import</scope>
+          </dependency>
           <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-datastream-bom</artifactId>
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate java datastore #11874

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

blakeli0 Jan 29, 2026

Uh oh!

blakeli0 Jan 29, 2026

Uh oh!

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up @@
         echo "Skipping version check for java-samples directory"
         continue
       fi
+      if [[ "${pomFile}" =~ .*/samples/.* ]]; then
+        echo "Skipping version check for samples directory"
+        continue
+      fi
       if grep -n '<version>.*</version>' "$pomFile" | grep -v 'x-version-update'; then
         echo "Found version declaration(s) without x-version-update in: $pomFile"
@@ Expand Down @@

Migrate java datastore #11874

Are you sure you want to change the base?

Uh oh!

Migrate java datastore #11874

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

blakeli0 Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

blakeli0 Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!