build: Modernize Gradle build infrastructure

Author: gsidhwani-nr

.github/workflows/release.yml

@@ -7,6 +7,9 @@ env:
   THIRD_PARTY_GIT_AUTHOR_EMAIL: opensource+bot@newrelic.com
   THIRD_PARTY_GIT_AUTHOR_NAME: nr-opensource-bot
 
+permissions:
+  contents: write
+
 jobs:
   build-and-release:
     runs-on: ubuntu-latest
@@ -21,7 +24,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
 
@@ -35,7 +38,6 @@ jobs:
 
       - name: Build with Gradle and verifyInstrumentation
         run: |
-          . ./newrelic-dependencies.sh
           ./gradlew clean  install verifyInstrumentation
 
       - name: Identify Release Type
@@ -111,7 +113,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
           script: |
@@ -181,7 +183,7 @@ jobs:
            git commit -m "Update Changelog for Release [skip ci]"
 
           # Push the changes to the remote repository
-          # git push --quiet --set-upstream origin HEAD
+          # # git push --quiet --set-upstream origin HEAD
 
       - name: Get Compare URL
         run: |
@@ -191,7 +193,7 @@ jobs:
 
       - name: Update Release
         id: update_release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
           script: |

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 
   dependencies {
     classpath 'gradle-templates:gradle-templates:1.5'
-    classpath 'com.newrelic.agent.java:gradle-verify-instrumentation-plugin:3.2'
+    classpath 'com.newrelic.agent.java:gradle-verify-instrumentation-plugin:4.0'
   }
 }
 
@@ -22,7 +22,7 @@ plugins {
 
 project.ext {
   group = 'com.newrelic.instrumentation.labs'
-  javaAgentVersion = '6.4.0'
+  javaAgentVersion = project.findProperty('java.agent.version')
 
   // Aligned with minimum Java major version supported by latest Java Agent
   javaVersion = JavaVersion.VERSION_1_8
@@ -58,23 +58,7 @@ task cleanUp(type: Delete) {
   }
 }
 
-task checkForDependencies(type: Exec) {
-    environment "JAVAAGENTVERSION", javaAgentVersion
-    def rootProject = projectDir.path
-    def cmdLine = rootProject+'/newrelic-dependencies.sh'
-    workingDir rootProject
-    commandLine  cmdLine
-
-}
-
-task buildIfNeeded {
-   dependsOn checkForDependencies
-   dependsOn jar
-   tasks.findByName('jar').mustRunAfter 'checkForDependencies'
-}
-
 task createModule {
-  dependsOn checkForDependencies
   description = 'Generate project files for a new instrumentation module'
   group = 'New Relic Labs'
   doLast {
@@ -173,7 +157,7 @@ subprojects {
     testImplementation 'com.newrelic.agent.java:newrelic-agent:' + project.javaAgentVersion
   }
 
-  task install(dependsOn: buildIfNeeded, type: Copy) {
+  tasks.register('install', Copy) {
     description = 'Copies compiled jar to the NEW_RELIC_EXTENSIONS_DIR.'
     group  = 'New Relic Labs'
 
@@ -183,10 +167,6 @@ subprojects {
     into extDir
   }
 
-  compileJava.doFirst {
-    tasks.findByName('checkForDependencies')
-  }
-
   install.doFirst  {
     def extDir = System.getenv("NEW_RELIC_EXTENSIONS_DIR")
      if (extDir == null) {

gradle.properties

@@ -0,0 +1 @@
+java.agent.version=8.6.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

newrelic-dependencies.sh

@@ -13,8 +13,8 @@ dependencies {
    implementation 'org.springframework.integration:spring-integration-ws:4.0.0.RELEASE'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:8.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:8.4.0'
+   implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
+   implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
     implementation 'com.newrelic.agent.java:agent-bridge:8.4.0'
    implementation fileTree(include: ['*.jar'], dir: '../test-lib')
 }

spring-integration-core-4.0.0/build.gradle

@@ -13,8 +13,8 @@ dependencies {
    implementation 'org.springframework.integration:spring-integration-ws:5.1.0.RELEASE'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:8.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:8.4.0'
+   implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
+   implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
    implementation 'com.newrelic.agent.java:agent-bridge:8.4.0'
    implementation fileTree(include: ['*.jar'], dir: '../test-lib')
 }

spring-integration-core-5.1.0/build.gradle

@@ -13,8 +13,8 @@ dependencies {
    implementation 'org.springframework.integration:spring-integration-ws:5.1.4.RELEASE'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:8.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:8.4.0'
+   implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
+   implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
    implementation 'com.newrelic.agent.java:agent-bridge:8.4.0'
    implementation fileTree(include: ['*.jar'], dir: '../test-lib')
 }

spring-integration-core-5.1.4/build.gradle

@@ -12,8 +12,8 @@ dependencies {
    implementation 'org.springframework.integration:spring-integration-ws:5.3.0.RELEASE'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:8.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:8.4.0'
+   implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
+   implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
    implementation 'com.newrelic.agent.java:agent-bridge:8.4.0'
    implementation fileTree(include: ['*.jar'], dir: '../test-lib')
 }

spring-integration-core-5.3.0/build.gradle

@@ -13,8 +13,8 @@ dependencies {
     implementation 'org.springframework:spring-messaging:6.2.0'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:8.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:8.4.0'
+   implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
+   implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
    implementation 'com.newrelic.agent.java:agent-bridge:8.4.0'
    implementation fileTree(include: ['*.jar'], dir: '../test-lib')
 }