From d42155e2903958f9b85681cbd2c37091644bda92 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Mon, 6 Apr 2026 23:10:32 +0000 Subject: [PATCH] chore: ensure we use the current version of the auth library in the monorepo current versions fix double annotation fix sdk-platform-java install scripts declare individual auth library versions auth library is required build fix downstream tests cleanup downstream tests fix common test fix path to downstream script fix setup maven mirror fix unmanaged dependency check fix showcase tests build: fix jar location fix jar location skip auth-library tests for bulk tests fix tests fix sdk-platform-java dependency compatibility unit test fix image version remove dep versions for common packages in storage fix compatibility check --- .github/workflows/sdk-platform-java-ci.yaml | 141 ++++++++++-------- ...rm-java-dependency_compatibility_test.yaml | 13 +- .../sdk-platform-java-downstream.yaml | 11 +- ...latform-java-java_compatibility_check.yaml | 8 +- .kokoro/common.sh | 104 +++++++++++++ .../presubmit => .kokoro}/common_test.sh | 8 +- .../downstream-compatibility-spring.sh | 5 +- .../downstream-compatibility.sh | 6 +- ...-library-java-graalvm-native-presubmit.cfg | 10 +- google-auth-library-java/pom.xml | 8 + google-cloud-jar-parent/pom.xml | 2 +- java-bigquery/pom.xml | 2 +- java-datastore/pom.xml | 2 +- java-spanner/google-cloud-spanner/pom.xml | 10 +- .../google-cloud-storage-control/pom.xml | 8 - java-storage/google-cloud-storage/pom.xml | 9 -- .../pom.xml | 2 - .../grpc-google-cloud-storage-v2/pom.xml | 1 - .../pom.xml | 3 - .../proto-google-cloud-storage-v2/pom.xml | 3 - .../library_generation.Dockerfile | 11 +- .../gapic-generator-java-bom/pom.xml | 4 +- .../gapic-generator-java-pom-parent/pom.xml | 1 - sdk-platform-java/gax-java/pom.xml | 21 ++- sdk-platform-java/settings.xml | 32 ---- 25 files changed, 252 insertions(+), 173 deletions(-) rename {sdk-platform-java/.kokoro/presubmit => .kokoro}/common_test.sh (89%) rename {sdk-platform-java/.kokoro/presubmit => .kokoro}/downstream-compatibility-spring.sh (95%) rename {sdk-platform-java/.kokoro/presubmit => .kokoro}/downstream-compatibility.sh (93%) delete mode 100644 sdk-platform-java/settings.xml diff --git a/.github/workflows/sdk-platform-java-ci.yaml b/.github/workflows/sdk-platform-java-ci.yaml index a88d45304d8e..06b94a09c6ee 100644 --- a/.github/workflows/sdk-platform-java-ci.yaml +++ b/.github/workflows/sdk-platform-java-ci.yaml @@ -33,10 +33,11 @@ jobs: cache: maven - run: java -version - name: Unit Tests - run: | - mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \ - -Dfmt.skip -DenableTestCoverage - working-directory: sdk-platform-java + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: test # The `envVarTest` profile runs tests that require an environment variable - name: Env Var Tests run: | @@ -49,10 +50,12 @@ jobs: GOOGLE_SDK_JAVA_LOGGING: true working-directory: sdk-platform-java - run: bazelisk version - - name: Install Maven modules - run: | - mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip - working-directory: sdk-platform-java + - name: Install all modules using Java 11 + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - name: Integration Tests run: | bazelisk --batch test //sdk-platform-java/test/integration/... @@ -89,26 +92,29 @@ jobs: cache: maven - run: java -version - name: Unit Tests - run: | - mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \ - -Dfmt.skip -DenableTestCoverage - working-directory: sdk-platform-java + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: test # The `envVarTest` profile runs tests that require an environment variable - name: Env Var Tests - run: | - mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \ - -Dfmt.skip -DenableTestCoverage -PenvVarTest - # Set the Env Var for this step only + shell: bash + run: .kokoro/build.sh env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: test + SUREFIRE_JVM_OPT: '-PenvVarTest' GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true GOOGLE_SDK_JAVA_LOGGING: true - working-directory: sdk-platform-java - run: bazelisk version - - name: Install Maven modules - run: | - mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip - working-directory: sdk-platform-java + - name: Install all modules using Java 11 + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - name: Integration Tests run: | bazelisk --batch test //sdk-platform-java/test/integration/... @@ -127,26 +133,29 @@ jobs: cache: maven - run: java -version - name: Unit Tests - run: | - mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \ - -Dfmt.skip -DenableTestCoverage - working-directory: sdk-platform-java + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: test # The `envVarTest` profile runs tests that require an environment variable - name: Env Var Tests - run: | - mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \ - -Dfmt.skip -DenableTestCoverage -PenvVarTest - # Set the Env Var for this step only + shell: bash + run: .kokoro/build.sh env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: test + SUREFIRE_JVM_OPT: '-PenvVarTest' GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true GOOGLE_SDK_JAVA_LOGGING: true - working-directory: sdk-platform-java - run: bazelisk version - - name: Install Maven modules - run: | - mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip - working-directory: sdk-platform-java + - name: Install all modules using Java 11 + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - name: Integration Tests # note need to set shouldInstallTestSecurityManager=false due to https://github.com/bazelbuild/bazel/issues/24354 run: | @@ -164,12 +173,17 @@ jobs: java-version: 8 distribution: temurin cache: maven + - name: Compile with Java 17 and run tests with Java 8 + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV - uses: actions/setup-java@v3 with: java-version: 17 distribution: temurin - - name: Compile with Java 17 and run tests with Java 8 shell: bash run: | set -x @@ -215,9 +229,10 @@ jobs: cache: maven - name: Install all modules using Java 11 shell: bash - run: | - mvn -V -B -ntp clean install -DskipTests -Dfmt.skip -Dcheckstyle.skip - working-directory: sdk-platform-java + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - uses: actions/setup-java@v3 with: java-version: 8 @@ -265,9 +280,10 @@ jobs: cache: maven - name: Install all modules using Java 11 shell: bash - run: | - mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip - working-directory: sdk-platform-java + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - uses: actions/setup-java@v3 with: java-version: 8 @@ -339,9 +355,11 @@ jobs: distribution: temurin - run: mvn -version - name: Install Maven modules - run: | - mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip - working-directory: sdk-platform-java + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: test - name: Showcase golden tests working-directory: sdk-platform-java/java-showcase run: | @@ -418,9 +436,11 @@ jobs: distribution: temurin cache: maven - name: Install Maven modules - run: | - mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip - working-directory: sdk-platform-java + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - name: Install showcase to local maven repository run: | mvn install -B -ntp -T 1C -DskipTests @@ -454,20 +474,11 @@ jobs: distribution: temurin cache: maven - name: Install Maven modules to local Maven repository - run: | - mvn install \ - -B -ntp \ - -Dorg.slf4j.simpleLogger.showDateTime=true \ - -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ - -DskipTests \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dcheckstyle.skip=true \ - -Dflatten.skip=true \ - -Danimal.sniffer.skip=true \ - -Dmaven.wagon.http.retryHandler.count=5 \ - -T 1C - working-directory: sdk-platform-java + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - name: Validate gapic-generator-java-bom uses: googleapis/java-cloud-bom/tests/validate-bom@47ad868794c5d38ee7eb95d69371a7a79f84d890 with: @@ -491,9 +502,11 @@ jobs: mvn test --batch-mode --no-transfer-progress working-directory: sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check - name: Install Maven modules - run: | - mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip - working-directory: sdk-platform-java + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: test - name: Unmanaged dependency check uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check with: diff --git a/.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml b/.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml index d55c98019c0f..31e1dece4a04 100644 --- a/.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml +++ b/.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml @@ -50,6 +50,13 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.dependencies-list != '' }} run: echo "DEPENDENCIES_LIST=${{ github.event.inputs.dependencies-list }}" >> $GITHUB_ENV + - name: Install sdk-platform-java modules + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install + # Run in the root module which should test for everything except for showcase - name: Perform Dependency Compatibility Unit Testing shell: bash @@ -61,12 +68,6 @@ jobs: fi working-directory: sdk-platform-java - # Install the modules for showcase (Shared-Deps is required to run showcase) - - name: Install sdk-platform-java's modules - # gapic-generator-java requires Java 8 and is irrelevant for this CI - run: mvn -q -B -ntp install --projects '!gapic-generator-java' -Dcheckstyle.skip -Dfmt.skip -DskipTests -Dclirr.skip -T 1C - working-directory: sdk-platform-java - # Set up local showcase server to run the showcase ITs - name: Parse showcase version working-directory: sdk-platform-java/java-showcase/gapic-showcase diff --git a/.github/workflows/sdk-platform-java-downstream.yaml b/.github/workflows/sdk-platform-java-downstream.yaml index a1fc625653de..9a4b4ced3669 100644 --- a/.github/workflows/sdk-platform-java-downstream.yaml +++ b/.github/workflows/sdk-platform-java-downstream.yaml @@ -32,14 +32,9 @@ jobs: matrix: repo: - java-bigtable - - java-bigquery - java-firestore - java-pubsub - java-pubsublite - - java-spanner-jdbc - - java-spanner - - java-storage - - java-storage-nio steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -52,9 +47,9 @@ jobs: sudo apt-get update sudo apt-get -y install libxml2-utils - name: Test helper scripts - run: ./sdk-platform-java/.kokoro/presubmit/common_test.sh + run: .kokoro/common_test.sh - name: Perform downstream compatibility testing - run: REPOS_UNDER_TEST="${{ matrix.repo }}" ./sdk-platform-java/.kokoro/presubmit/downstream-compatibility.sh + run: REPOS_UNDER_TEST="${{ matrix.repo }}" .kokoro/downstream-compatibility.sh downstream-compatibility-spring-generator: needs: filter if: ${{ needs.filter.outputs.library == 'true' }} @@ -73,4 +68,4 @@ jobs: sudo apt-get update sudo apt-get -y install libxml2-utils - name: Perform downstream compatibility testing - run: ./sdk-platform-java/.kokoro/presubmit/downstream-compatibility-spring.sh + run: .kokoro/downstream-compatibility-spring.sh diff --git a/.github/workflows/sdk-platform-java-java_compatibility_check.yaml b/.github/workflows/sdk-platform-java-java_compatibility_check.yaml index ffd41e991db9..9684dbd134e6 100644 --- a/.github/workflows/sdk-platform-java-java_compatibility_check.yaml +++ b/.github/workflows/sdk-platform-java-java_compatibility_check.yaml @@ -43,9 +43,11 @@ jobs: distribution: temurin cache: maven - name: Install sdk-platform-modules to local Maven repository - run: | - mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip - working-directory: sdk-platform-java + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install - name: Check Java 8 compatibility for class files shell: bash run: | diff --git a/.kokoro/common.sh b/.kokoro/common.sh index 8dcac6113b35..aac5159433d7 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +commonScriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") excluded_modules=( 'gapic-libraries-bom' 'google-cloud-jar-parent' @@ -32,6 +33,7 @@ excluded_modules=( 'java-spanner' 'java-spanner-jdbc' 'google-auth-library-java' + 'google-auth-library-java/oauth2_http' 'java-storage' 'java-storage-nio' ) @@ -305,6 +307,7 @@ function run_integration_tests() { ${INTEGRATION_TEST_ARGS} \ -B -ntp -fae \ --also-make \ + -PbulkTests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ @@ -419,6 +422,10 @@ function install_modules() { printf "Installing submodules:\n%s\n" "$all_submodules" always_install_deps_list=( + 'google-auth-library-java/appengine' + 'google-auth-library-java/bom' + 'google-auth-library-java/credentials' + 'google-auth-library-java/oauth2_http' 'sdk-platform-java/java-shared-dependencies' 'sdk-platform-java/java-shared-dependencies/first-party-dependencies' 'sdk-platform-java/java-shared-dependencies/third-party-dependencies' @@ -478,3 +485,100 @@ function install_modules() { -T 1C fi } + + +# In the given directory ($1), +# update the pom.xml's dependency on the given artifact ($2) to the given version ($3) +# ex: update_dependency google-cloud-java/google-cloud-jar-parent google-cloud-shared-dependencies 1.2.3 +function update_pom_dependency { + pushd "$1" || exit 1 + xmllint --shell pom.xml &>/dev/null </dev/null; then + found+=("$pom") + fi + done + POMS=(${found[@]}) + unset found + export POMS +} + +# In the given directory ($1), +# find and update all pom.xmls' dependencies on the given artifact ($2) to the given version ($3) +# ex: update_all_poms_dependency google-cloud-java google-cloud-shared-dependencies 1.2.3 +function update_all_poms_dependency { + pushd "$1" || exit 1 + find_all_poms_with_versioned_dependency "$2" + for pom in $POMS; do + update_pom_dependency "$(dirname "$pom")" "$2" "$3" + done + git diff + popd || exit 1 +} + +# Parse the version of the pom.xml file in the given directory ($1) +# ex: VERSION=$(parse_pom_version java-shared-dependencies) +function parse_pom_version { + # Namespace (xmlns) prevents xmllint from specifying tag names in XPath + result=$(sed -e 's/xmlns=".*"//' "$1/pom.xml" | xmllint --xpath '/project/version/text()' -) + + if [ -z "${result}" ]; then + echo "Version is not found in $1" + exit 1 + fi + echo "$result" +} + +# ex: find_last_release_version java-bigtable +# ex: find_last_release_version java-storage 2.22.x +function find_last_release_version { + repo=$1 + branch=${2-"main"} # Default to using main branch + org=${3-"googleapis"} + curl -s -o "versions_${repo}.txt" "https://raw.githubusercontent.com/${org}/${repo}/${branch}/versions.txt" + + # First check to see if there's an entry for the overall repo. Used for google-cloud-java. + primary_artifact=$(grep -E "^${repo}" "versions_${repo}.txt" | head -n 1) + if [ -z "${primary_artifact}" ]; then + # Otherwise, use the first google-cloud-* artifact's version. + primary_artifact=$(grep -E "^google-cloud-" "versions_$1.txt" | head -n 1) + fi + if [ -z "${primary_artifact}" ]; then + echo "Unable to identify primary artifact for $1" + exit 1 + fi + + parts=($(echo "$primary_artifact" | tr ":" "\n")) + echo "${parts[1]}" +} + +# copies settings.xml from the root of sdk-platform-java into Maven's home +# folder +function setup_maven_mirror { + echo "Setup maven mirror" + mkdir -p "${HOME}/.m2" + cp "${commonScriptDir}/../settings.xml" "${HOME}/.m2" +} + +function install_repo_modules { + target_projects="$1" + projects_arg="" + if [ -n "${target_projects}" ]; then + projects_arg="--projects ${target_projects}" + fi + echo "Installing this repo's modules to local maven." + mvn -q -B -ntp install ${projects_arg} \ + -Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C +} diff --git a/sdk-platform-java/.kokoro/presubmit/common_test.sh b/.kokoro/common_test.sh similarity index 89% rename from sdk-platform-java/.kokoro/presubmit/common_test.sh rename to .kokoro/common_test.sh index fcc9638eb74d..3572b659fcaa 100755 --- a/sdk-platform-java/.kokoro/presubmit/common_test.sh +++ b/.kokoro/common_test.sh @@ -14,7 +14,7 @@ # limitations under the License. scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") -cd "${scriptDir}/../.." # cd to the root of this repo +cd "${scriptDir}/.." # cd to the root of this repo source "$scriptDir/common.sh" mkdir -p target cd target @@ -22,7 +22,7 @@ cd target function test_find_all_poms_with_versioned_dependency { mkdir -p test_find_all_poms_with_dependency pushd test_find_all_poms_with_dependency - cp ../../java-showcase/gapic-showcase/pom.xml pom.xml + cp ../../sdk-platform-java/java-showcase/gapic-showcase/pom.xml pom.xml find_all_poms_with_versioned_dependency 'truth' if [ "${#POMS[@]}" != 1 ]; then @@ -45,7 +45,7 @@ function test_find_all_poms_with_versioned_dependency { function test_update_pom_dependency { mkdir -p test_update_pom_dependency pushd test_update_pom_dependency - cp ../../java-showcase/gapic-showcase/pom.xml pom.xml + cp ../../sdk-platform-java/java-showcase/gapic-showcase/pom.xml pom.xml update_pom_dependency . truth "99.88.77" @@ -66,7 +66,7 @@ EOF function test_parse_pom_version { mkdir -p test_parse_pom_version pushd test_parse_pom_version - cp ../../java-showcase/gapic-showcase/pom.xml pom.xml + cp ../../sdk-platform-java/java-showcase/gapic-showcase/pom.xml pom.xml VERSION=$(parse_pom_version .) if [ "$VERSION" != "0.0.1-SNAPSHOT" ]; then diff --git a/sdk-platform-java/.kokoro/presubmit/downstream-compatibility-spring.sh b/.kokoro/downstream-compatibility-spring.sh similarity index 95% rename from sdk-platform-java/.kokoro/presubmit/downstream-compatibility-spring.sh rename to .kokoro/downstream-compatibility-spring.sh index edc99d6cb756..aaba72372b2c 100755 --- a/sdk-platform-java/.kokoro/presubmit/downstream-compatibility-spring.sh +++ b/.kokoro/downstream-compatibility-spring.sh @@ -20,10 +20,11 @@ set -eox pipefail # Get the directory of the build script scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") -cd "${scriptDir}/../.." # cd to the root of this repo +cd "${scriptDir}/.." # cd to the root of this repo source "$scriptDir/common.sh" -install_repo_modules +install_modules "sdk-platform-java" +cd sdk-platform-java GAPIC_GENERATOR_VERSION=$(parse_pom_version "gapic-generator-java-bom") echo "Install complete. gapic-generator-java-bom = $GAPIC_GENERATOR_VERSION" diff --git a/sdk-platform-java/.kokoro/presubmit/downstream-compatibility.sh b/.kokoro/downstream-compatibility.sh similarity index 93% rename from sdk-platform-java/.kokoro/presubmit/downstream-compatibility.sh rename to .kokoro/downstream-compatibility.sh index 2e0b8c7c123c..6f9dcfb016f3 100755 --- a/sdk-platform-java/.kokoro/presubmit/downstream-compatibility.sh +++ b/.kokoro/downstream-compatibility.sh @@ -24,12 +24,14 @@ fi # Get the directory of the build script scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") -cd "${scriptDir}/../.." # cd to the root of this repo +cd "${scriptDir}/.." # cd to the root of this repo source "$scriptDir/common.sh" setup_maven_mirror -install_repo_modules '!gapic-generator-java' +install_modules "sdk-platform-java" +cd sdk-platform-java + SHARED_DEPS_VERSION=$(parse_pom_version java-shared-dependencies) echo "Install complete. java-shared-dependencies = $SHARED_DEPS_VERSION" diff --git a/.kokoro/presubmit/google-auth-library-java-graalvm-native-presubmit.cfg b/.kokoro/presubmit/google-auth-library-java-graalvm-native-presubmit.cfg index dacef5d75fa1..15cf4809e57e 100644 --- a/.kokoro/presubmit/google-auth-library-java-graalvm-native-presubmit.cfg +++ b/.kokoro/presubmit/google-auth-library-java-graalvm-native-presubmit.cfg @@ -1,7 +1,4 @@ # Format: //devtools/kokoro/config/proto/build.proto - -build_file: "google-auth-library-java/.kokoro/build.sh" - env_vars: { key: "JOB_TYPE" value: "graalvm-single" @@ -43,11 +40,12 @@ env_vars: { value: "gcloud-devel" } -container_properties { - docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.17.0" +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" } - env_vars: { key: "BUILD_SUBDIR" value: "google-auth-library-java" diff --git a/google-auth-library-java/pom.xml b/google-auth-library-java/pom.xml index 40642a6233ee..68f4b5e51ae8 100644 --- a/google-auth-library-java/pom.xml +++ b/google-auth-library-java/pom.xml @@ -393,5 +393,13 @@ + + + + bulkTests + + true + + diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml index 170a68efb89c..c0d633fb3849 100644 --- a/google-cloud-jar-parent/pom.xml +++ b/google-cloud-jar-parent/pom.xml @@ -46,7 +46,7 @@ com.google.cloud google-cloud-storage - 2.63.0 + 2.64.2-SNAPSHOT com.google.apis diff --git a/java-bigquery/pom.xml b/java-bigquery/pom.xml index e3818fef269d..4db55b6bfbdd 100644 --- a/java-bigquery/pom.xml +++ b/java-bigquery/pom.xml @@ -88,7 +88,7 @@ com.google.cloud google-cloud-storage - 2.53.3 + 2.64.2-SNAPSHOT test diff --git a/java-datastore/pom.xml b/java-datastore/pom.xml index ef7709bc84a4..e5eb47aa6529 100644 --- a/java-datastore/pom.xml +++ b/java-datastore/pom.xml @@ -181,7 +181,7 @@ com.google.cloud google-cloud-datastore-utils - 2.31.2 + 2.38.0-SNAPSHOT com.google.cloud.datastore diff --git a/java-spanner/google-cloud-spanner/pom.xml b/java-spanner/google-cloud-spanner/pom.xml index 4fa14c33adfa..b36fd5131328 100644 --- a/java-spanner/google-cloud-spanner/pom.xml +++ b/java-spanner/google-cloud-spanner/pom.xml @@ -310,7 +310,7 @@ com.google.cloud google-cloud-monitoring - ${google.cloud.monitoring.version} + 3.90.0-SNAPSHOT @@ -322,7 +322,7 @@ com.google.api.grpc proto-google-cloud-monitoring-v3 - ${google.cloud.monitoring.version} + 3.90.0-SNAPSHOT @@ -334,7 +334,7 @@ com.google.api.grpc grpc-google-cloud-monitoring-v3 - ${google.cloud.monitoring.version} + 3.90.0-SNAPSHOT test @@ -523,13 +523,13 @@ com.google.cloud google-cloud-trace - 2.87.0 + 2.89.0-SNAPSHOT test com.google.api.grpc proto-google-cloud-trace-v1 - 2.87.0 + 2.89.0-SNAPSHOT test diff --git a/java-storage/google-cloud-storage-control/pom.xml b/java-storage/google-cloud-storage-control/pom.xml index 5a9aedd29505..2da6b5a7e799 100644 --- a/java-storage/google-cloud-storage-control/pom.xml +++ b/java-storage/google-cloud-storage-control/pom.xml @@ -38,17 +38,14 @@ com.google.api.grpc proto-google-common-protos - 2.67.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.62.1-SNAPSHOT com.google.api api-common - 2.59.1-SNAPSHOT com.google.api @@ -59,25 +56,21 @@ gax test testlib - 2.76.1-SNAPSHOT com.google.api gax-grpc - 2.76.1-SNAPSHOT com.google.api gax-httpjson - 2.76.1-SNAPSHOT com.google.api gax-httpjson test testlib - 2.76.1-SNAPSHOT com.google.guava @@ -93,7 +86,6 @@ gax-grpc testlib test - 2.76.1-SNAPSHOT com.google.api.grpc diff --git a/java-storage/google-cloud-storage/pom.xml b/java-storage/google-cloud-storage/pom.xml index fcf317f0f9c8..339a1c74db15 100644 --- a/java-storage/google-cloud-storage/pom.xml +++ b/java-storage/google-cloud-storage/pom.xml @@ -66,27 +66,22 @@ com.google.cloud google-cloud-core - 2.66.1-SNAPSHOT com.google.cloud google-cloud-core-http - 2.66.1-SNAPSHOT com.google.cloud google-cloud-core-grpc - 2.66.1-SNAPSHOT com.google.api gax - 2.76.1-SNAPSHOT com.google.api gax-grpc - 2.76.1-SNAPSHOT com.google.auth @@ -99,7 +94,6 @@ com.google.api api-common - 2.59.1-SNAPSHOT io.opencensus @@ -112,7 +106,6 @@ com.google.api.grpc proto-google-iam-v1 - 1.62.1-SNAPSHOT com.google.protobuf @@ -133,7 +126,6 @@ com.google.api.grpc proto-google-common-protos - 2.67.1-SNAPSHOT org.threeten @@ -284,7 +276,6 @@ google-cloud-core test-jar test - 2.66.1-SNAPSHOT com.google.truth diff --git a/java-storage/grpc-google-cloud-storage-control-v2/pom.xml b/java-storage/grpc-google-cloud-storage-control-v2/pom.xml index 63a14c8eca34..92ad631cf8bc 100644 --- a/java-storage/grpc-google-cloud-storage-control-v2/pom.xml +++ b/java-storage/grpc-google-cloud-storage-control-v2/pom.xml @@ -32,7 +32,6 @@ com.google.api.grpc proto-google-common-protos - 2.67.1-SNAPSHOT com.google.api.grpc @@ -45,7 +44,6 @@ com.google.api.grpc proto-google-iam-v1 - 1.62.1-SNAPSHOT diff --git a/java-storage/grpc-google-cloud-storage-v2/pom.xml b/java-storage/grpc-google-cloud-storage-v2/pom.xml index 46d3a8ad1b48..0eb6a13d522a 100644 --- a/java-storage/grpc-google-cloud-storage-v2/pom.xml +++ b/java-storage/grpc-google-cloud-storage-v2/pom.xml @@ -40,7 +40,6 @@ com.google.api.grpc proto-google-iam-v1 - 1.62.1-SNAPSHOT diff --git a/java-storage/proto-google-cloud-storage-control-v2/pom.xml b/java-storage/proto-google-cloud-storage-control-v2/pom.xml index 6232da05abec..52c3899a4091 100644 --- a/java-storage/proto-google-cloud-storage-control-v2/pom.xml +++ b/java-storage/proto-google-cloud-storage-control-v2/pom.xml @@ -20,17 +20,14 @@ com.google.api.grpc proto-google-common-protos - 2.67.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.62.1-SNAPSHOT com.google.api api-common - 2.59.1-SNAPSHOT com.google.guava diff --git a/java-storage/proto-google-cloud-storage-v2/pom.xml b/java-storage/proto-google-cloud-storage-v2/pom.xml index f51c42edc985..58d85a21f186 100644 --- a/java-storage/proto-google-cloud-storage-v2/pom.xml +++ b/java-storage/proto-google-cloud-storage-v2/pom.xml @@ -20,17 +20,14 @@ com.google.api.grpc proto-google-common-protos - 2.67.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.62.1-SNAPSHOT com.google.api api-common - 2.59.1-SNAPSHOT com.google.guava diff --git a/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile b/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile index 8178e63379ed..bbd361222d00 100644 --- a/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile @@ -18,19 +18,20 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-17-alpine@sha256:969014ee8852c9910ff5ef09de17541c2587819364b79d7dc044634dfb8a3388 AS ggj-build -WORKDIR /sdk-platform-java -COPY sdk-platform-java/ . +WORKDIR /google-cloud-java + +COPY . . # {x-version-update-start:gapic-generator-java:current} ENV DOCKER_GAPIC_GENERATOR_VERSION="2.68.1-SNAPSHOT" # {x-version-update-end} # Download the java formatter -RUN mvn -pl gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version +RUN mvn -pl sdk-platform-java/gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version RUN cat /java-formatter-version RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${V}/google-java-format-${V}-all-deps.jar" # Compile and install packages -RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip +RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip -pl sdk-platform-java/gapic-generator-java --also-make RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \ "./gapic-generator-java.jar" @@ -93,7 +94,7 @@ ENV JAVA_FORMATTER_LOCATION="${HOME}/.library_generation/google-java-format.jar" # Note that the destination is a well-known location that will be assumed at runtime # We hard-code the location string to avoid making it configurable (via ARG) as # well as to avoid it making it overridable at runtime (via ENV). -COPY --from=ggj-build "/sdk-platform-java/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar" +COPY --from=ggj-build "/google-cloud-java/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar" RUN chmod 755 "${HOME}/.library_generation/gapic-generator-java.jar" ENV GAPIC_GENERATOR_LOCATION="${HOME}/.library_generation/gapic-generator-java.jar" diff --git a/sdk-platform-java/gapic-generator-java-bom/pom.xml b/sdk-platform-java/gapic-generator-java-bom/pom.xml index b54c6a7684a3..f3e7a915a280 100644 --- a/sdk-platform-java/gapic-generator-java-bom/pom.xml +++ b/sdk-platform-java/gapic-generator-java-bom/pom.xml @@ -25,14 +25,14 @@ com.google.auth google-auth-library-bom - ${google.auth.version} + 1.43.1-SNAPSHOT pom import com.google.auth google-auth-library-oauth2-http - ${google.auth.version} + 1.43.1-SNAPSHOT test-jar testlib test diff --git a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml index ada07cbb63bb..6f6ccf74b30b 100644 --- a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml +++ b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml @@ -27,7 +27,6 @@ consistent across modules in this repository --> 1.3.2 1.80.0 - 1.43.0 2.1.0 2.12.1 33.5.0-jre diff --git a/sdk-platform-java/gax-java/pom.xml b/sdk-platform-java/gax-java/pom.xml index 3ef24a0b1059..fce864a2c38c 100644 --- a/sdk-platform-java/gax-java/pom.xml +++ b/sdk-platform-java/gax-java/pom.xml @@ -54,10 +54,23 @@ com.google.auth - google-auth-library-bom - ${google.auth.version} - pom - import + google-auth-library-credentials + 1.43.1-SNAPSHOT + + + com.google.auth + google-auth-library-oauth2-http + 1.43.1-SNAPSHOT + + + com.google.auth + google-auth-library-appengine + 1.43.1-SNAPSHOT + + + com.google.auth + google-auth-library-cab-token-generator + 1.43.1-SNAPSHOT org.threeten diff --git a/sdk-platform-java/settings.xml b/sdk-platform-java/settings.xml deleted file mode 100644 index 5f2958623a89..000000000000 --- a/sdk-platform-java/settings.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - -