Upgrade to Gradle 9.4

Also replace the eager cross-project task reference to
:libs:agent-sm:agent with Gradle-idiomatic patterns:

- Add a consumable agentDist configuration in the agent
  project that publishes the prepareAgent output directory
  as an artifact with a Category attribute.
- Add a matching resolvable agent configuration in the
  distribution subprojects to consume it via normal
  dependency resolution.
- Replace direct task references (project.prepareAgent,
  project.jar) with lazy alternatives: tasks.named() for
  task providers, lazy GStrings for deferred path
  resolution, and closure-based dependsOn.

This removes the need for an evaluationDependsOn call which forced
the agent project to be configured before the distribution
project, violating Gradle best practices around project
isolation and configuration-time coupling.

Signed-off-by: Andrew Ross <andrross@amazon.com>

Author: andrross

build.gradle

@@ -426,8 +426,8 @@ gradle.projectsEvaluated {
 
         // Add Java Agent for security sandboxing
         if (!(project.path in [':build-tools', ":libs:agent-sm:bootstrap", ":libs:agent-sm:agent"])) {
-          dependsOn(project(':libs:agent-sm:agent').prepareAgent)
-          jvmArgs += ["-javaagent:" + project(':libs:agent-sm:agent').jar.archiveFile.get()]
+          dependsOn(project(':libs:agent-sm:agent').tasks.named('prepareAgent'))
+          jvmArgs += ["-javaagent:" + project(':libs:agent-sm:agent').tasks.named('jar').get().archiveFile.get()]
         }
         if (BuildParams.isInFipsJvm()) {
           def fipsSecurityFile = project.rootProject.file('distribution/src/config/fips_java.security')

distribution/archives/build.gradle

@@ -256,6 +256,6 @@ tasks.configureEach { t ->
 
 tasks.each {
   if (it.name.startsWith("build")) {
-    it.dependsOn project(':libs:agent-sm:agent').assemble
+    it.dependsOn project(':libs:agent-sm:agent').tasks.named('assemble')
   }
 }

distribution/build.gradle

@@ -44,6 +44,8 @@ import java.nio.file.Path
 plugins {
   id 'base'
 }
+
+
 /*****************************************************************************
  *                  Third party dependencies report                          *
  *****************************************************************************/
@@ -320,6 +322,13 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
         }
       }
     }
+    create('agent') {
+      canBeConsumed = false
+      canBeResolved = true
+      attributes {
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, 'agent-dist'))
+      }
+    }
   }
 
   dependencies {
@@ -333,6 +342,8 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
     libsFipsInstallerCli project(path: ':distribution:tools:fips-demo-installer-cli')
 
     bcFips libs.bundles.bouncycastle
+
+    agent project(path: ':libs:agent-sm:agent', configuration: 'agentDist')
   }
 
   project.ext {
@@ -362,7 +373,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
 
     agentFiles = {
       copySpec {
-        from(project(':libs:agent-sm:agent').prepareAgent) {
+        from(configurations.agent) {
           include '**/*.jar'
           exclude '**/*-javadoc.jar'
           exclude '**/*-sources.jar'

gradle/wrapper/gradle-wrapper.jar

@@ -1,8 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=f86344275d1b194688dd330abf9f6f2344cd02872ffee035f2d1ea2fd60cf7f3
+distributionSha256Sum=b21468753cb43c167738ee04f10c706c46459cf8f8ae6ea132dc9ce589a261f2

gradle/wrapper/gradle-wrapper.properties

@@ -7,6 +7,13 @@ base {
 
 configurations {
   bootstrap.extendsFrom(implementation)
+  create('agentDist') {
+    canBeConsumed = true
+    canBeResolved = false
+    attributes {
+      attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, 'agent-dist'))
+    }
+  }
 }
 
 dependencies {
@@ -53,6 +60,12 @@ task prepareAgent(type: Copy) {
   dependsOn jar
 }
 
+artifacts {
+  agentDist(file("$buildDir/distributions")) {
+    builtBy prepareAgent
+  }
+}
+
 thirdPartyAudit {
   ignoreMissingClasses(
     'com.sun.jna.FunctionMapper',

libs/agent-sm/agent/build.gradle

@@ -130,7 +130,8 @@ project(':test:fixtures:krb5kdc-fixture').tasks.preProcessFixture {
 // Create HDFS File System Testing Fixtures for HA/Secure combinations
 for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture', 'secureHaHdfsFixture']) {
   def tsk = tasks.register(fixtureName, org.opensearch.gradle.test.AntFixture) {
-    dependsOn configurations.hdfsFixture, project(':test:fixtures:krb5kdc-fixture').tasks.postProcessFixture, project(':libs:agent-sm:agent').prepareAgent
+    dependsOn configurations.hdfsFixture, project(':test:fixtures:krb5kdc-fixture').tasks.postProcessFixture
+    dependsOn { project(':libs:agent-sm:agent').tasks.named('prepareAgent') }
     executable = "${BuildParams.runtimeJavaHome}/bin/java"
     env 'CLASSPATH', "${-> configurations.hdfsFixture.asPath}"
     maxWaitInSeconds = 60
@@ -140,10 +141,10 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
       // it's ready, so we can just wait for the file to exist
       return fixture.portsFile.exists()
     }
-    final List<String> miniHDFSArgs = []
+    final List miniHDFSArgs = []
 
     // See please https://issues.apache.org/jira/browse/HADOOP-19486
-    miniHDFSArgs.add("-javaagent:" + project(':libs:agent-sm:agent').jar.archiveFile.get())
+    miniHDFSArgs.add("-javaagent:${-> project(':libs:agent-sm:agent').tasks.named('jar').get().archiveFile.get()}")
 
     // If it's a secure fixture, then depend on Kerberos Fixture and principals + add the krb5conf to the JVM options
     if (fixtureName.equals('secureHdfsFixture') || fixtureName.equals('secureHaHdfsFixture')) {

plugins/repository-hdfs/build.gradle

@@ -105,8 +105,11 @@ test {
   systemProperty 'tests.gradle_wire_compat_versions', BuildParams.bwcVersions.wireCompatible.join(',')
   systemProperty 'tests.gradle_unreleased_versions', BuildParams.bwcVersions.unreleased.join(',')
 
-  dependsOn(project(':libs:agent-sm:agent').prepareAgent)
-  jvmArgs += ["-javaagent:" + project(':libs:agent-sm:agent').jar.archiveFile.get()]
+  def agentJarFile = project(':libs:agent-sm:agent').tasks.named('jar').map { it.archiveFile.get() }
+  dependsOn { project(':libs:agent-sm:agent').tasks.named('prepareAgent') }
+  doFirst {
+    jvmArgs "-javaagent:" + agentJarFile.get()
+  }
 }
 
 tasks.register("integTest", Test) {