Resolve conflicts

Author: cindy-peng

.kokoro/build.sh

@@ -60,16 +60,16 @@ javadoc)
     RETURN_CODE=$?
     ;;
 integration)
-    # Kokoro integration test uses both JDK 11 and JDK 8. Integration
-    # tests require JDK 11 to compile the classes.
+    # 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
-      echo "Java:${JAVA}"
-      echo "Java 11:${JAVA11_HOME}"
-      echo "Java 8:${JAVA8_HOME}"
-      echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
     fi
 
     mvn -B ${INTEGRATION_TEST_ARGS} \

google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java

@@ -188,6 +188,8 @@ private LocalDatastoreHelper(Builder builder) {
     List<String> binCommand = new ArrayList<>(Arrays.asList(binName, "start"));
     binCommand.add("--testing");
     if (builder.firestoreInDatastoreMode) {
+      // Downloadable emulator runner takes the flag in a different
+      // format: --firestore_in_datastore_mode
       binCommand.add("--firestore_in_datastore_mode");
     } else {
       // At most one of --consistency | --firestore_in_datastore_mode can be specified.