diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 3f95c50e6186..ea2a246aa7f9 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -93,24 +93,22 @@ case ${JOB_TYPE} in fi ;; lint) - changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}") - echo "${changed_file_list}" - has_code_change="false" - while IFS= read -r changed_file; do - if [ -n "${changed_file}" ] && [[ "${changed_file}" == *.java ]]; then - echo "Matched: ${changed_file}" - has_code_change="true" - break - fi - done <<< "${changed_file_list}" - if [ "${has_code_change}" == "false" ]; then - echo "No java modules affected. Skipping linter check." - exit 0 - fi +# changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}") +# echo "${changed_file_list}" +# has_code_change="false" +# while IFS= read -r changed_file; do +# if [ -n "${changed_file}" ] && [[ "${changed_file}" == *.java ]]; then +# echo "Matched: ${changed_file}" +# has_code_change="true" +# break +# fi +# done <<< "${changed_file_list}" +# if [ "${has_code_change}" == "false" ]; then +# echo "No java modules affected. Skipping linter check." +# exit 0 +# fi - mvn -B -ntp \ - -T 1.5C \ - com.spotify.fmt:fmt-maven-plugin:check + mvn -B -ntp com.spotify.fmt:fmt-maven-plugin:check mvn -B -ntp checkstyle:check@checkstyle ;; *) ;; diff --git a/java-translate/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java b/java-translate/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java index 26b9f11c43b4..4c41bcee96d2 100644 --- a/java-translate/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java +++ b/java-translate/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java @@ -125,6 +125,7 @@ public static RemoteTranslateHelper create(String projectId, GoogleCredentials c @Deprecated public static RemoteTranslateHelper create(String apiKey) { HttpTransportOptions transportOptions = TranslateOptions.getDefaultHttpTransportOptions(); + transportOptions = transportOptions.toBuilder().setConnectTimeout(60000).setReadTimeout(60000).build(); TranslateOptions translateOptions =