remove complex function and add explicit require

Author: donoghuc

build.gradle

@@ -375,7 +375,17 @@ tasks.register("artifactDeb") {
     dependsOn copyJdk
 
     doLast {
-        rakeExternal(projectDir, buildDir, 'artifact:deb')
+        exec {
+            workingDir projectDir
+            executable "${projectDir}/vendor/bundle/jruby/3.1.0/bin/rake"
+            args 'artifact:deb'
+            environment 'ARCH', System.getenv("ARCH") ?: "x86_64"
+            environment 'GEM_HOME', "${projectDir}/vendor/bundle/jruby/3.1.0"
+            environment 'GEM_PATH', "${projectDir}/vendor/bundle/jruby/3.1.0"
+            standardOutput = System.out
+            errorOutput = System.err
+        }
+
         tasks.named('deleteLocalJdk').get().actions.each { it.execute(tasks.named('deleteLocalJdk').get()) }
     }
 }
@@ -386,7 +396,17 @@ tasks.register("artifactRpm") {
     dependsOn copyJdk
 
     doLast {
-        rakeExternal(projectDir, buildDir, 'artifact:rpm')
+        exec {
+            workingDir projectDir
+            executable "${projectDir}/vendor/bundle/jruby/3.1.0/bin/rake"
+            args 'artifact:rpm'
+            environment 'ARCH', System.getenv("ARCH") ?: "x86_64"
+            environment 'GEM_HOME', "${projectDir}/vendor/bundle/jruby/3.1.0"
+            environment 'GEM_PATH', "${projectDir}/vendor/bundle/jruby/3.1.0"
+            standardOutput = System.out
+            errorOutput = System.err
+        }
+
         tasks.named('deleteLocalJdk').get().actions.each { it.execute(tasks.named('deleteLocalJdk').get()) }
     }
 }

rakelib/artifacts.rake

@@ -679,6 +679,7 @@ namespace "artifact" do
     require "fpm/errors" # TODO(sissel): fix this in fpm
     require "fpm/package/dir"
     require "fpm/package/gem" # TODO(sissel): fix this in fpm; rpm needs it.
+    require "fpm/package/cpan"
 
     basedir = File.join(File.dirname(__FILE__), "..")
     dir = FPM::Package::Dir.new

rubyUtils.gradle

@@ -173,30 +173,6 @@ void rake(File projectDir, File buildDir, String task, String... args) {
     }
 }
 
-// Spawn rake as external process (for CI compatibility)
-def rakeExternal(File projectDir, File buildDir, String task) {
-    def rakeExecutable = new File(projectDir, "vendor/bundle/jruby/3.1.0/bin/rake")
-    if (!rakeExecutable.exists()) {
-        throw new GradleException("Rake executable not found at ${rakeExecutable}")
-    }
-    
-    def processBuilder = new ProcessBuilder()
-    def gemDir = "${projectDir}/vendor/bundle/jruby/3.1.0".toString()
-    processBuilder.directory(projectDir)
-    processBuilder.command(rakeExecutable.absolutePath, task)
-    processBuilder.environment().put("ARCH", System.getenv("ARCH") ?: "x86_64")
-    processBuilder.environment().put("GEM_HOME", gemDir)
-    processBuilder.environment().put("GEM_PATH", gemDir)
-    processBuilder.inheritIO()
-    
-    def process = processBuilder.start()
-    def exitCode = process.waitFor()
-    
-    if (exitCode != 0) {
-        throw new GradleException("Rake task '${task}' failed with exit code ${exitCode}")
-    }
-}
-
 void setupJruby(File projectDir, File buildDir) {
     executeJruby projectDir, buildDir, { ScriptingContainer jruby ->
         jruby.currentDirectory = projectDir