better use of rachet

Author: derrickaw

.github/workflows/beam_PreCommit_Spotless.yml

@@ -87,6 +87,11 @@ jobs:
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
       - name: Setup environment
         uses: ./.github/actions/setup-environment-action
+      - name: Fetch base branch for Spotless ratchet
+        if: github.event.pull_request.base.ref != ''
+        run: |
+          git fetch --no-tags --prune --depth=1 origin ${{ github.event.pull_request.base.ref }}:refs/remotes/origin/${{ github.event.pull_request.base.ref }}
+        shell: bash
       - name: run Spotless PreCommit script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

@@ -507,6 +507,41 @@ class BeamModulePlugin implements Plugin<Project> {
 
     project.ext.mavenGroupId = 'org.apache.beam'
 
+    project.ext.getRatchetBranch = {
+      ->
+      if (project.hasProperty('disableSpotlessRatchet') && project.disableSpotlessRatchet == 'true') {
+        return null
+      }
+      try {
+        def checkRef = { ref ->
+          try {
+            def res = project.exec {
+              executable 'git'
+              args 'rev-parse', '--verify', ref
+              ignoreExitValue = true
+              standardOutput = new ByteArrayOutputStream()
+              errorOutput = new ByteArrayOutputStream()
+            }
+            return res.getExitValue() == 0
+          } catch (Exception e) {
+            return false
+          }
+        }
+
+        if (checkRef('upstream/master')) {
+          return 'upstream/master'
+        } else if (checkRef('origin/master')) {
+          return 'origin/master'
+        } else if (checkRef('master')) {
+          return 'master'
+        } else {
+          return null
+        }
+      } catch (Exception e) {
+        return null
+      }
+    }
+
     // Default to dash-separated directories for artifact base name,
     // which will also be the default artifactId for maven publications
     project.apply plugin: 'base'
@@ -1476,9 +1511,13 @@ class BeamModulePlugin implements Plugin<Project> {
           project.disableSpotlessCheck == 'true'
       project.spotless {
         enforceCheck !disableSpotlessCheck
+        def ratchetBranch = project.ext.getRatchetBranch()
+        if (ratchetBranch != null) {
+          ratchetFrom ratchetBranch
+        }
         java {
           licenseHeader javaLicenseHeader
-          googleJavaFormat('1.7')
+          googleJavaFormat('1.17.0')
           target project.fileTree(project.projectDir) {
             include 'src/*/java/**/*.java'
             exclude '**/DefaultPackageTest.java'
@@ -2403,10 +2442,17 @@ class BeamModulePlugin implements Plugin<Project> {
           project.disableSpotlessCheck == 'true'
       project.spotless {
         enforceCheck !disableSpotlessCheck
+        def ratchetBranch = project.ext.getRatchetBranch()
+        if (ratchetBranch != null) {
+          ratchetFrom ratchetBranch
+        }
         def grEclipseConfig = project.project(":").file("buildSrc/greclipse.properties")
         groovy {
           greclipse().configFile(grEclipseConfig)
-          target project.fileTree(project.projectDir) { include '**/*.groovy' }
+          target project.fileTree(project.projectDir) {
+            include '**/*.groovy'
+            exclude '**/build/**'
+          }
         }
         groovyGradle { greclipse().configFile(grEclipseConfig) }
       }