Resolve merge conflicts and rename fast profile to quickBuild

Author: lqiu96

.github/workflows/ci.yaml

@@ -216,7 +216,7 @@ jobs:
     - run: java -version
     - name: Install Maven modules to local Maven repository
       run: |
-        mvn install -B -ntp -T 1C -Pfast -DskipTests
+mvn install -B -ntp  -T 1C -PquickBuild -DskipTests
     - run: java -version
     - run: mvn -B -ntp enforcer:enforce@enforce -T 1C
   gapic-libraries-bom:
@@ -230,7 +230,7 @@ jobs:
         cache: maven
     - name: Install Maven modules to local Maven repository
       run: |
-        mvn install -B -ntp -T 1C -Pfast -DskipTests
+mvn install -B -ntp  -T 1C -PquickBuild -DskipTests
     - name: Validate gapic-libraries-bom
       uses: googleapis/java-cloud-bom/tests/validate-bom@v26.54.0
       with:

.github/workflows/sdk-platform-java-ci.yaml

@@ -34,13 +34,13 @@ jobs:
       - run: java -version
       - name: Unit Tests
         run: |
-          mvn test --batch-mode --no-transfer-progress -Pfast \
+mvn test --batch-mode --no-transfer-progress -PquickBuild \
               -DenableTestCoverage
         working-directory: sdk-platform-java
       # The `envVarTest` profile runs tests that require an environment variable
       - name: Env Var Tests
         run: |
-          mvn test --batch-mode --no-transfer-progress -Pfast \
+mvn test --batch-mode --no-transfer-progress -PquickBuild \
               -DenableTestCoverage -PenvVarTest
         # Set the Env Var for this step only
         env:
@@ -51,7 +51,7 @@ jobs:
       - run: bazelisk version
       - name: Install Maven modules
         run: |
-          mvn install -B -ntp -Pfast -DskipTests
+mvn install -B -ntp -PquickBuild -DskipTests
         working-directory: sdk-platform-java
       - name: Integration Tests
         run: |
@@ -90,13 +90,13 @@ jobs:
       - run: java -version
       - name: Unit Tests
         run: |
-          mvn test --batch-mode --no-transfer-progress -Pfast \
+mvn test --batch-mode --no-transfer-progress -PquickBuild \
               -DenableTestCoverage
         working-directory: sdk-platform-java
       # The `envVarTest` profile runs tests that require an environment variable
       - name: Env Var Tests
         run: |
-          mvn test --batch-mode --no-transfer-progress -Pfast \
+mvn test --batch-mode --no-transfer-progress -PquickBuild \
               -DenableTestCoverage -PenvVarTest
         # Set the Env Var for this step only
         env:
@@ -107,7 +107,11 @@ jobs:
       - run: bazelisk version
       - name: Install Maven modules
         run: |
+<<<<<<< Updated upstream
           mvn install -B -ntp -Pfast -DskipTests
+=======
+          mvn install -B -ntp -PquickBuild -DskipTests
+>>>>>>> Stashed changes
         working-directory: sdk-platform-java
       - name: Integration Tests
         run: |
@@ -128,13 +132,13 @@ jobs:
       - run: java -version
       - name: Unit Tests
         run: |
-          mvn test --batch-mode --no-transfer-progress -Pfast \
+mvn test --batch-mode --no-transfer-progress -PquickBuild \
               -DenableTestCoverage
         working-directory: sdk-platform-java
       # The `envVarTest` profile runs tests that require an environment variable
       - name: Env Var Tests
         run: |
-          mvn test --batch-mode --no-transfer-progress -Pfast \
+mvn test --batch-mode --no-transfer-progress -PquickBuild \
               -DenableTestCoverage -PenvVarTest
         # Set the Env Var for this step only
         env:
@@ -145,7 +149,7 @@ jobs:
       - run: bazelisk version
       - name: Install Maven modules
         run: |
-          mvn install -B -ntp -Pfast -DskipTests
+mvn install -B -ntp -PquickBuild -DskipTests
         working-directory: sdk-platform-java
       - name: Integration Tests
         # note need to set shouldInstallTestSecurityManager=false due to https://github.com/bazelbuild/bazel/issues/24354
@@ -177,7 +181,7 @@ jobs:
           export PATH=${JAVA_HOME}/bin:$PATH
           # Maven surefire plugin lets us to specify the JVM when running tests via
           # the "jvm" system property.
-          mvn verify --batch-mode --no-transfer-progress -Pfast \
+          mvn verify --batch-mode --no-transfer-progress -PquickBuild \
               -Djvm="${JAVA8_HOME}/bin/java"
         working-directory: sdk-platform-java
       # The `envVarTest` profile runs tests that require an environment variable
@@ -190,7 +194,7 @@ jobs:
           # Maven surefire plugin lets us to specify the JVM when running tests via
           # the "jvm" system property.
           export GOOGLE_CLOUD_UNIVERSE_DOMAIN=random.com
-          mvn test --batch-mode --no-transfer-progress -Pfast \
+mvn test --batch-mode --no-transfer-progress -PquickBuild \
               -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
               -PenvVarTest
         # Set the Env Var for this step only
@@ -215,7 +219,7 @@ jobs:
       - name: Install all modules using Java 11
         shell: bash
         run: |
-          mvn -V -B -ntp clean install -Pfast -DskipTests
+          mvn -V -B -ntp clean install -PquickBuild -DskipTests
         working-directory: sdk-platform-java
       - uses: actions/setup-java@v3
         with:
@@ -265,7 +269,7 @@ jobs:
       - name: Install all modules using Java 11
         shell: bash
         run: |
-          mvn install -B -ntp -Pfast -DskipTests
+mvn install -B -ntp -PquickBuild -DskipTests
         working-directory: sdk-platform-java
       - uses: actions/setup-java@v3
         with:
@@ -339,7 +343,7 @@ jobs:
       - run: mvn -version
       - name: Install Maven modules
         run: |
-          mvn install -B -ntp -Pfast -DskipTests
+mvn install -B -ntp -PquickBuild -DskipTests
         working-directory: sdk-platform-java        
       - name: Showcase golden tests
         working-directory: sdk-platform-java/java-showcase
@@ -418,7 +422,7 @@ jobs:
           cache: maven
       - name: Install Maven modules
         run: |
-          mvn install -B -ntp -Pfast -DskipTests
+mvn install -B -ntp -PquickBuild -DskipTests
         working-directory: sdk-platform-java
       - name: Install showcase to local maven repository
         run: |
@@ -456,13 +460,13 @@ jobs:
       run: |
         mvn install \
           -B -ntp \
-          -Pfast \
+          -PquickBuild \
           -Dorg.slf4j.simpleLogger.showDateTime=true \
           -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
           -DskipTests \
           -Dmaven.wagon.http.retryHandler.count=5 \
           -T 1C
-      working-directory: sdk-platform-java
+        working-directory: sdk-platform-java
     - name: Validate gapic-generator-java-bom
       uses: googleapis/java-cloud-bom/tests/validate-bom@47ad868794c5d38ee7eb95d69371a7a79f84d890
       with:
@@ -487,7 +491,7 @@ jobs:
       working-directory: sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
     - name: Install Maven modules
       run: |
-        mvn install -B -ntp -Pfast -DskipTests
+        mvn install -B -ntp -PquickBuild -DskipTests
       working-directory: sdk-platform-java
     - name: Unmanaged dependency check
       uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check

.kokoro/build.sh

@@ -52,7 +52,7 @@ case ${JOB_TYPE} in
     retry_with_backoff 3 10 \
       mvn install \
         -B -ntp \
-        -Pfast \
+        -PquickBuild \
         -Dorg.slf4j.simpleLogger.showDateTime=true \
         -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
         -Dmaven.wagon.http.retryHandler.count=5 \
@@ -76,13 +76,9 @@ case ${JOB_TYPE} in
       install_modules "sdk-platform-java"
       mvn install \
         -B -ntp \
+        -PquickBuild \
         -Dorg.slf4j.simpleLogger.showDateTime=true \
         -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-        -Dclirr.skip=true \
-        -Denforcer.skip=true \
-        -Dcheckstyle.skip=true \
-        -Dflatten.skip=true \
-        -Danimal.sniffer.skip=true \
         -Dmaven.wagon.http.retryHandler.count=5 \
         -DskipTests=true \
         --also-make \
@@ -139,19 +135,13 @@ case ${JOB_TYPE} in
 
       echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
       echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
-      mvn verify -Penable-integration-tests \
+      mvn verify -Penable-integration-tests -PquickBuild \
         --also-make \
         ${INTEGRATION_TEST_ARGS} \
         -B -ntp -fae \
         -DtrimStackTrace=false \
-        -Dclirr.skip=true \
-        -Denforcer.skip=true \
         -Dorg.slf4j.simpleLogger.showDateTime=true \
         -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-        -Dcheckstyle.skip=true \
-        -Dflatten.skip=true \
-        -Danimal.sniffer.skip=true \
-        -Djacoco.skip=true \
         -DskipUnitTests=true \
         -Dmaven.wagon.http.retryHandler.count=5 \
         ${SUREFIRE_JVM_OPT}
@@ -198,18 +188,13 @@ case ${JOB_TYPE} in
       echo "Running in subdir: ${BUILD_SUBDIR}"
       pushd "${BUILD_SUBDIR}"
       echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
-      mvn test -Pnative \
+      mvn test -Pnative -PquickBuild \
         --also-make \
         ${INTEGRATION_TEST_ARGS} \
         -B -ntp -fae \
         -DtrimStackTrace=false \
-        -Dclirr.skip=true \
-        -Denforcer.skip=true \
         -Dorg.slf4j.simpleLogger.showDateTime=true \
-        -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-        -Dcheckstyle.skip=true \
-        -Dflatten.skip=true \
-        -Danimal.sniffer.skip=true
+        -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS
 
       RETURN_CODE=$?
       popd

.kokoro/common.sh

@@ -297,7 +297,7 @@ function run_integration_tests() {
   parse_all_submodules "$1"
   printf "Running integration tests for submodules:\n%s\n" "$all_submodules"
 
-  mvn verify -Penable-integration-tests -Pfast --projects "$all_submodules" \
+  mvn verify -Penable-integration-tests -PquickBuild --projects "$all_submodules" \
     ${INTEGRATION_TEST_ARGS} \
     -B -ntp -fae \
     --also-make \
@@ -317,7 +317,7 @@ function run_graalvm_tests() {
   parse_all_submodules "$1"
   printf "Running GraalVM ITs for submodules:\n%s\n" "$all_submodules"
 
-  mvn test -Pnative -Pfast --projects "$all_submodules" \
+  mvn test -Pnative -PquickBuild --projects "$all_submodules" \
     ${INTEGRATION_TEST_ARGS} \
     -B -ntp -fae \
     -DtrimStackTrace=false \
@@ -387,7 +387,11 @@ function install_modules() {
   if [ -z "$1" ]; then
     mvn install \
       -B -ntp \
+<<<<<<< Updated upstream
       -Pfast \
+=======
+      -PquickBuild \
+>>>>>>> Stashed changes
       -DtrimStackTrace=false \
       -Dorg.slf4j.simpleLogger.showDateTime=true \
       -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
@@ -435,7 +439,11 @@ function install_modules() {
     #      Correctly builds dependencies without building dependents.
     mvn install --projects "$all_submodules,$always_install_deps" --also-make \
       -B -ntp \
+<<<<<<< Updated upstream
       -Pfast \
+=======
+      -PquickBuild \
+>>>>>>> Stashed changes
       -DtrimStackTrace=false \
       -Dorg.slf4j.simpleLogger.showDateTime=true \
       -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \

.kokoro/dependencies.sh

@@ -60,9 +60,9 @@ fi
 # this should run maven enforcer
 retry_with_backoff 3 10 \
   mvn install -B -V -ntp \
-  -Pfast -DskipTests=true -Dmaven.javadoc.skip=true -Denforcer.skip=false
+    -PquickBuild -DskipTests=true -Dmaven.javadoc.skip=true -Denforcer.skip=false
 
-mvn -B dependency:analyze -Pfast -DfailOnWarning=true -Dmdep.analyze.skip=false
+mvn -B dependency:analyze -PquickBuild -DfailOnWarning=true -Dmdep.analyze.skip=false
 
 if [[ -n "${BUILD_SUBDIR}" ]]
 then

google-cloud-pom-parent/pom.xml

@@ -59,7 +59,7 @@
 
   <profiles>
     <profile>
-      <id>fast</id>
+      <id>quickBuild</id>
       <properties>
         <checkstyle.skip>true</checkstyle.skip>
         <enforcer.skip>true</enforcer.skip>

sdk-platform-java/gapic-generator-java-pom-parent/pom.xml

@@ -78,7 +78,7 @@
 
   <profiles>
     <profile>
-      <id>fast</id>
+      <id>quickBuild</id>
       <properties>
         <checkstyle.skip>true</checkstyle.skip>
         <enforcer.skip>true</enforcer.skip>