chore: address PR review feedback for java-shared-config CI, triggers, and Cloud Build

Author: jinseopkim0

.github/workflows/ci.yaml

@@ -221,11 +221,6 @@ jobs:
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-shared-config:
             - 'java-shared-config/**'
-            - 'google-auth-library-java/**/*.java'
-            - 'google-auth-library-java/**/pom.xml'
-            - 'sdk-platform-java/**/*.java'
-            - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
-            - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
   split-units:
     runs-on: ubuntu-latest
     needs: changes

.github/workflows/java-shared-config-downstream-dependencies.yaml

@@ -42,6 +42,11 @@ jobs:
     - run: java -version
     - run: sudo apt-get update -y
     - run: sudo apt-get install libxml2-utils
+    - name: Pre-build dependencies
+      run: |
+        LIB_DIR="${{matrix.repo}}"
+        LIB_NAME="google-cloud-${LIB_DIR#java-}"
+        mvn install -pl ${LIB_DIR}/${LIB_NAME} -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
     - run: .kokoro/client-library-check.sh ${{matrix.repo}} dependencies
 
   flatten-plugin-check:
@@ -57,7 +62,8 @@ jobs:
     - run: java -version
     - run: sudo apt-get update -y
     - run: sudo apt-get install libxml2-utils
+    - name: Pre-build dependencies
+      run: mvn install -pl java-storage/google-cloud-storage -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
     - run: .kokoro/client-library-check.sh java-storage flatten-plugin
       env:
-        REPO_TAG: v2.9.3
-        EXPECTED_DEPENDENCIES_LIST: java-storage-v2.9.3-expected-flattened-dependencies.txt
+        EXPECTED_DEPENDENCIES_LIST: java-storage-expected-flattened-dependencies.txt

.github/workflows/java-shared-config-downstream-maven-plugins.yaml

@@ -41,6 +41,15 @@ jobs:
         - javadoc-with-doclet # test javadoc generation with doclet
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: zulu
+        java-version: 11
+    - name: Pre-build dependencies
+      run: |
+        LIB_DIR="${{matrix.repo}}"
+        LIB_NAME="google-cloud-${LIB_DIR#java-}"
+        mvn install -pl ${LIB_DIR}/${LIB_NAME} -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
     - uses: actions/setup-java@v4
       with:
         distribution: zulu
@@ -73,6 +82,11 @@ jobs:
     - run: java -version
     - run: sudo apt-get update -y
     - run: sudo apt-get install libxml2-utils
+    - name: Pre-build dependencies
+      run: |
+        LIB_DIR="${{matrix.repo}}"
+        LIB_NAME="google-cloud-${LIB_DIR#java-}"
+        mvn install -pl ${LIB_DIR}/${LIB_NAME} -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
     - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}}
   javadoc-with-doclet:
     needs: filter
@@ -104,4 +118,9 @@ jobs:
     - run: java -version
     - run: sudo apt-get update -y
     - run: sudo apt-get install libxml2-utils
+    - name: Pre-build dependencies
+      run: |
+        LIB_DIR="${{matrix.repo}}"
+        LIB_NAME="google-cloud-${LIB_DIR#java-}"
+        mvn install -pl ${LIB_DIR}/${LIB_NAME} -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
     - run: .kokoro/client-library-check-doclet.sh ${{matrix.repo}}

.kokoro/client-library-check-doclet.sh

@@ -120,11 +120,9 @@ git --no-pager diff
 echo "--------"
 mvn install "-DskipTests=true" "-Dmaven.javadoc.skip=true" "-Dgcloud.download.skip=true" "-Dcheckstyle.skip=true" -B -V -q --no-transfer-progress
 popd
+popd
 
 # Check javadoc generation with the doclet
-rm -rf "${REPO}"
-git clone "https://github.com/googleapis/${REPO}.git" --depth=1
-
 pushd ${REPO}
 replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}"
 
@@ -145,3 +143,8 @@ if [ "${RETURN_CODE}" == 0 ]; then
 else
   echo "Javadoc generation FAILED with doclet"
 fi
+
+popd
+git checkout -- ${REPO}
+
+exit ${RETURN_CODE}

.kokoro/client-library-check.sh

@@ -122,14 +122,6 @@ popd
 popd
 
 # Check this BOM against a few java client libraries
-# java-bigquery
-rm -rf "${REPO}"
-if [ -z "${REPO_TAG}" ]; then
-  git clone "https://github.com/googleapis/${REPO}.git" --depth=1
-else
-  git clone "https://github.com/googleapis/${REPO}.git" --depth=1 --branch "${REPO_TAG}"
-fi
-
 pushd ${REPO}
 
 # If using an older version of java-storage, continue replacing java-shared-config version otherwise replace
@@ -174,5 +166,8 @@ flatten-plugin)
     ;;
 esac
 
+popd
+git checkout -- ${REPO}
+
 echo "exiting with ${RETURN_CODE}"
 exit ${RETURN_CODE}

.kokoro/java-storage-expected-flattened-dependencies.txt

@@ -0,0 +1,86 @@
+com.fasterxml.jackson.core:jackson-annotations:jar:2.18.3:compile
+com.fasterxml.jackson.core:jackson-core:jar:2.18.3:compile
+com.fasterxml.jackson.core:jackson-databind:jar:2.18.3:compile
+com.fasterxml.jackson.dataformat:jackson-dataformat-xml:jar:2.18.3:compile
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.18.3:compile
+com.fasterxml.woodstox:woodstox-core:jar:7.0.0:compile
+com.google.android:annotations:jar:4.1.1.4:runtime
+com.google.api-client:google-api-client:jar:2.7.2:compile
+com.google.api.grpc:gapic-google-cloud-storage-v2:jar:2.70.0-SNAPSHOT:compile
+com.google.api.grpc:grpc-google-cloud-storage-v2:jar:2.70.0-SNAPSHOT:compile
+com.google.api.grpc:proto-google-cloud-monitoring-v3:jar:3.52.0:compile
+com.google.api.grpc:proto-google-cloud-storage-v2:jar:2.70.0-SNAPSHOT:compile
+com.google.api.grpc:proto-google-common-protos:jar:2.73.0-SNAPSHOT:compile
+com.google.api.grpc:proto-google-iam-v1:jar:1.68.0-SNAPSHOT:compile
+com.google.api:api-common:jar:2.65.0-SNAPSHOT:compile
+com.google.api:gax-grpc:jar:2.82.0-SNAPSHOT:compile
+com.google.api:gax-httpjson:jar:2.82.0-SNAPSHOT:compile
+com.google.api:gax:jar:2.82.0-SNAPSHOT:compile
+com.google.apis:google-api-services-storage:jar:v1-rev20260204-2.0.0:compile
+com.google.auth:google-auth-library-credentials:jar:1.49.0-SNAPSHOT:compile
+com.google.auth:google-auth-library-oauth2-http:jar:1.49.0-SNAPSHOT:compile
+com.google.auto.value:auto-value-annotations:jar:1.11.0:compile
+com.google.cloud.opentelemetry:detector-resources-support:jar:0.33.0:runtime
+com.google.cloud.opentelemetry:exporter-metrics:jar:0.33.0:compile
+com.google.cloud.opentelemetry:shared-resourcemapping:jar:0.33.0:runtime
+com.google.cloud:google-cloud-core-grpc:jar:2.72.0-SNAPSHOT:compile
+com.google.cloud:google-cloud-core-http:jar:2.72.0-SNAPSHOT:compile
+com.google.cloud:google-cloud-core:jar:2.72.0-SNAPSHOT:compile
+com.google.cloud:google-cloud-monitoring:jar:3.52.0:compile
+com.google.code.findbugs:jsr305:jar:3.0.2:compile
+com.google.code.gson:gson:jar:2.13.2:compile
+com.google.errorprone:error_prone_annotations:jar:2.48.0:compile
+com.google.guava:failureaccess:jar:1.0.3:compile
+com.google.guava:guava:jar:33.5.0-jre:compile
+com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
+com.google.http-client:google-http-client-apache-v2:jar:2.1.0:compile
+com.google.http-client:google-http-client-appengine:jar:2.1.0:compile
+com.google.http-client:google-http-client-gson:jar:2.1.0:compile
+com.google.http-client:google-http-client-jackson2:jar:2.1.0:compile
+com.google.http-client:google-http-client:jar:2.1.0:compile
+com.google.j2objc:j2objc-annotations:jar:3.1:compile
+com.google.oauth-client:google-oauth-client:jar:1.39.0:compile
+com.google.protobuf:protobuf-java-util:jar:4.33.2:compile
+com.google.protobuf:protobuf-java:jar:4.33.2:compile
+com.google.re2j:re2j:jar:1.8:runtime
+commons-codec:commons-codec:jar:1.18.0:compile
+io.grpc:grpc-alts:jar:1.81.0:compile
+io.grpc:grpc-api:jar:1.81.0:compile
+io.grpc:grpc-auth:jar:1.81.0:compile
+io.grpc:grpc-context:jar:1.81.0:compile
+io.grpc:grpc-core:jar:1.81.0:compile
+io.grpc:grpc-googleapis:jar:1.81.0:runtime
+io.grpc:grpc-grpclb:jar:1.81.0:compile
+io.grpc:grpc-inprocess:jar:1.81.0:compile
+io.grpc:grpc-netty-shaded:jar:1.81.0:runtime
+io.grpc:grpc-opentelemetry:jar:1.81.0:compile
+io.grpc:grpc-protobuf-lite:jar:1.81.0:runtime
+io.grpc:grpc-protobuf:jar:1.81.0:compile
+io.grpc:grpc-rls:jar:1.81.0:runtime
+io.grpc:grpc-services:jar:1.81.0:runtime
+io.grpc:grpc-stub:jar:1.81.0:compile
+io.grpc:grpc-util:jar:1.81.0:runtime
+io.grpc:grpc-xds:jar:1.81.0:runtime
+io.opencensus:opencensus-api:jar:0.31.1:compile
+io.opencensus:opencensus-contrib-http-util:jar:0.31.1:compile
+io.opentelemetry.contrib:opentelemetry-gcp-resources:jar:1.37.0-alpha:compile
+io.opentelemetry.semconv:opentelemetry-semconv:jar:1.29.0-alpha:compile
+io.opentelemetry:opentelemetry-api:jar:1.62.0:compile
+io.opentelemetry:opentelemetry-common:jar:1.62.0:compile
+io.opentelemetry:opentelemetry-context:jar:1.62.0:compile
+io.opentelemetry:opentelemetry-sdk-common:jar:1.62.0:compile
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:jar:1.62.0:compile
+io.opentelemetry:opentelemetry-sdk-logs:jar:1.62.0:compile
+io.opentelemetry:opentelemetry-sdk-metrics:jar:1.62.0:compile
+io.opentelemetry:opentelemetry-sdk-trace:jar:1.62.0:compile
+io.opentelemetry:opentelemetry-sdk:jar:1.62.0:compile
+io.perfmark:perfmark-api:jar:0.27.0:runtime
+org.apache.httpcomponents:httpclient:jar:4.5.14:compile
+org.apache.httpcomponents:httpcore:jar:4.4.16:compile
+org.checkerframework:checker-qual:jar:3.49.0:compile
+org.codehaus.mojo:animal-sniffer-annotations:jar:1.27:compile
+org.codehaus.woodstox:stax2-api:jar:4.2.2:compile
+org.conscrypt:conscrypt-openjdk-uber:jar:2.5.2:compile
+org.jspecify:jspecify:jar:1.0.0:compile
+org.slf4j:slf4j-api:jar:2.0.16:compile
+org.threeten:threetenbp:jar:1.7.0:compile

.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt

@@ -0,0 +1,72 @@
+#!/bin/bash
+# Copyright 2023 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.
+
+set -eo pipefail
+set -x
+
+function modify_shared_config() {
+  xmllint --shell pom.xml <<EOF
+  setns x=http://maven.apache.org/POM/4.0.0
+  cd .//x:artifactId[text()="google-cloud-shared-config"]
+  cd ../x:version
+  set ${SHARED_CONFIG_VERSION}
+  save pom.xml
+EOF
+}
+
+## Get the directory of the build script and install all modules in the monorepo
+scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
+## cd to the parent directory, i.e. the root of the git repo
+cd "${scriptDir}/../.."
+
+# Build and install the entire monorepo to local cache (including the under-test java-shared-config)
+mvn -B -ntp install -Dcheckstyle.skip -Dfmt.skip -DskipTests
+
+# Get the version of java-shared-config under test
+VERSION_POM=java-shared-config/java-shared-config/pom.xml
+SHARED_CONFIG_VERSION=$(sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -)
+
+# Use GCP Maven Mirror (as in original script)
+mkdir -p "${HOME}/.m2"
+cp java-shared-config/settings.xml "${HOME}/.m2"
+
+# Update the shared-config version in the local java-showcase parent
+pushd java-showcase
+modify_shared_config
+popd
+
+# Parse showcase version from the local directory
+pushd java-showcase/gapic-showcase
+SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)
+popd
+
+# Start showcase server
+mkdir -p /usr/src/showcase
+curl --location https://github.com/googleapis/gapic-showcase/releases/download/v"${SHOWCASE_VERSION}"/gapic-showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz --output /usr/src/showcase/showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz
+pushd /usr/src/showcase/
+tar -xf showcase-*
+./gapic-showcase run &
+popd
+
+# Run showcase tests with `native` profile in java-showcase
+pushd java-showcase
+mvn test -Pnative,showcase -Denforcer.skip=true -ntp -B
+RETURN_CODE=$?
+popd
+
+# Revert local showcase modifications
+git checkout -- java-showcase/pom.xml
+
+exit $RETURN_CODE

.kokoro/presubmit/downstream-build.sh

@@ -20,12 +20,12 @@ steps:
   # GraalVM A build
   - name: gcr.io/cloud-builders/docker
     args: ["build", "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."]
-    dir: .cloudbuild
+    dir: java-shared-config/.cloudbuild
     id: graalvm-a-build
     waitFor: ["-"]
   - name: gcr.io/gcp-runtimes/structure_test
     args:
-      ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"]
+      ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", "java-shared-config/.cloudbuild/graalvm-a.yaml", "-v"]
     waitFor: ["graalvm-a-build"]
   - name: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}
     entrypoint: bash

java-shared-config/.cloudbuild/cloudbuild-test-a.yaml

@@ -20,12 +20,12 @@ steps:
   # GraalVM B build
   - name: gcr.io/cloud-builders/docker
     args: ["build", "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "."]
-    dir: .cloudbuild
+    dir: java-shared-config/.cloudbuild
     id: graalvm-b-build
     waitFor: ["-"]
   - name: gcr.io/gcp-runtimes/structure_test
     args:
-      ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v"]
+      ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", "java-shared-config/.cloudbuild/graalvm-b.yaml", "-v"]
     waitFor: ["graalvm-b-build"]
   - name: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}
     entrypoint: bash