Merge branch 'googleapis:main' into eef

Author: kinsaurralde

.github/release-please.yml

@@ -2,6 +2,7 @@ primaryBranch: main
 releaseType: java-yoshi
 manifest: true
 handleGHRelease: true
+onDemand: true
 branches:
     - branch: 1.0.x
       releaseType: java-backport

.github/workflows/ci.yaml

@@ -187,13 +187,9 @@ jobs:
       run: |
         mvn test \
           -B -ntp \
+          -Pquick-build \
           -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 \
           --also-make \
           -T 1C

.github/workflows/generated_files_sync.yaml

@@ -17,7 +17,7 @@ on:
   pull_request:
 name: generation diff
 env:
-  library_generation_image_tag: 2.68.1-SNAPSHOT  # {x-version-update:gapic-generator-java:current}
+  library_generation_image_tag: 2.69.0  # {x-version-update:gapic-generator-java:current}
 jobs:
   root-pom:
     # root pom.xml does not have diff from generated one

.github/workflows/hermetic_library_generation.yaml

@@ -44,4 +44,4 @@ jobs:
         head_ref: ${{ github.head_ref }}
         token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
         force_regenerate_all: ${{ github.event.pull_request.head.ref == 'generate-libraries-main' }}
-        image_tag: 2.68.1-SNAPSHOT  # {x-version-update:gapic-generator-java:current}
+        image_tag: 2.69.0  # {x-version-update:gapic-generator-java:current}

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

@@ -41,8 +41,8 @@ jobs:
       # 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
+          mvn test --batch-mode --no-transfer-progress -Pquick-build \
+              -DenableTestCoverage -PenvVarTest
         # Set the Env Var for this step only
         env:
           GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
@@ -191,8 +191,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 -Dcheckstyle.skip \
-              -Dfmt.skip \
+          mvn verify --batch-mode --no-transfer-progress -Pquick-build \
               -Djvm="${JAVA8_HOME}/bin/java"
         working-directory: sdk-platform-java
       # The `envVarTest` profile runs tests that require an environment variable
@@ -205,8 +204,8 @@ 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 -Dcheckstyle.skip \
-              -Dfmt.skip -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
+          mvn test --batch-mode --no-transfer-progress -Pquick-build \
+              -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
               -PenvVarTest
         # Set the Env Var for this step only
         env:

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

@@ -30,7 +30,7 @@ jobs:
           BUILD_SUBDIR: sdk-platform-java
           JOB_TYPE: install
       - name: Install
-        run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -Dfmt.skip
+        run: mvn install --errors --batch-mode --no-transfer-progress -Pquick-build
         working-directory: sdk-platform-java
       - name: Create issue if previous step fails
         if: ${{ failure() }}

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

@@ -37,7 +37,7 @@ jobs:
     - run: java -version
     - name: Install maven modules
       run: |
-        mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
+        mvn install -B -ntp -DskipTests -Pquick-build
     - name: Check the BOM content satisfies the upper-bound-check test case
-      run: mvn -B -V -ntp verify -Dcheckstyle.skip
+      run: mvn -B -V -ntp verify -Pquick-build
       working-directory: sdk-plaform-java/java-shared-dependencies/upper-bound-check

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

@@ -72,7 +72,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn -B verify -Dcheckstyle.skip \
+          mvn -B verify -Pquick-build \
               -DenableFullTestCoverage \
               -Penable-integration-tests \
               org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
@@ -84,7 +84,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn -B clean verify -Dcheckstyle.skip \
+          mvn -B clean verify -Pquick-build \
               -DskipUnitTests \
               -Penable-integration-tests \
               -DenableShowcaseTestCoverage \

.github/workflows/unmanaged_dependency_check.yaml

@@ -12,7 +12,7 @@ jobs:
         java-version: 11
     - name: Install modules
       shell: bash
-      run: mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
+      run: mvn install -B -ntp -T 1C -DskipTests -Pquick-build
     - name: Unmanaged dependency check
       uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
       with:

.kokoro/build.sh

@@ -52,13 +52,9 @@ case ${JOB_TYPE} in
     retry_with_backoff 3 10 \
       mvn install \
         -B -ntp \
+        -Pquick-build \
         -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 \
         --also-make \
         ${SUREFIRE_JVM_OPT} "${EXTRA_PROFILE_OPTS[@]}"
@@ -80,13 +76,9 @@ case ${JOB_TYPE} in
       install_modules "sdk-platform-java"
       mvn install \
         -B -ntp \
+        -Pquick-build \
         -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 \
@@ -143,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 -Pquick-build \
         --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}
@@ -202,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 -Pquick-build \
         --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