revert prior changes

Author: derrickaw

.github/workflows/beam_PreCommit_Spotless.yml

@@ -77,8 +77,6 @@ jobs:
       github.event.comment.body == 'Run Spotless PreCommit'
     steps:
       - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
       - name: Setup repository
         uses: ./.github/actions/setup-action
         with:
@@ -87,14 +85,11 @@ jobs:
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
       - name: Setup environment
         uses: ./.github/actions/setup-environment-action
-        with:
-          java-version: '17'
       - name: run Spotless PreCommit script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
           gradle-command: spotlessCheck checkStyleMain checkStyleTest :buildSrc:spotlessCheck
-          arguments: -PdisableSpotlessApply ${{ github.event_name == 'schedule' && '-PdisableSpotlessRatchet=true' || '' }}
-          max-workers: 4
+          arguments: -PdisableSpotlessApply
       - name: Upload test report
         uses: actions/upload-artifact@v7
         with:

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

@@ -508,40 +508,7 @@ 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'
@@ -1501,10 +1468,7 @@ 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.17.0')
@@ -2427,10 +2391,7 @@ 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)

gradle.properties

@@ -19,7 +19,7 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.daemon=false
 org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx6g -Xss10240k -XX:+UseG1GC
+org.gradle.jvmargs=-Xss10240k
 org.gradle.vfs.watch=true
 offlineRepositoryRoot=offline-repository
 signing.gnupg.executable=gpg

runners/flink/build.gradle

@@ -28,10 +28,7 @@ repositories {
  * We configure spotless here once in order to only check these java sources once.
  */
 spotless {
-  def ratchetBranch = project.rootProject.hasProperty('getRatchetBranch') ? project.rootProject.ext.getRatchetBranch() : null
-  if (ratchetBranch != null) {
-    ratchetFrom ratchetBranch
-  }
+
   java {
     licenseHeader org.apache.beam.gradle.BeamModulePlugin.javaLicenseHeader
     googleJavaFormat('1.17.0')

runners/spark/build.gradle

@@ -28,10 +28,7 @@ repositories {
  * We configure spotless here once in order to only check these java sources once.
  */
 spotless {
-  def ratchetBranch = project.rootProject.hasProperty('getRatchetBranch') ? project.rootProject.ext.getRatchetBranch() : null
-  if (ratchetBranch != null) {
-    ratchetFrom ratchetBranch
-  }
+
   java {
     licenseHeader org.apache.beam.gradle.BeamModulePlugin.javaLicenseHeader
     googleJavaFormat('1.17.0')