build: Modernize Gradle build infrastructure

gsidhwani-nr · gsidhwani-nr · commit 705e43f0b9c5 · 2026-07-13T14:06:34.000+05:30
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,6 +10,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
@@ -24,7 +27,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
 
@@ -38,7 +41,6 @@ jobs:
 
       - name: Build with Gradle and verifyInstrumentation
         run: |
-          . ./newrelic-dependencies.sh
           ./gradlew clean  install verifyInstrumentation
 
       - name: Identify Release Type
@@ -114,7 +116,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: |
@@ -184,7 +186,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: |
@@ -194,7 +196,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: |
diff --git a/Vertx-EventBus-3.5/build.gradle b/Vertx-EventBus-3.5/build.gradle
@@ -7,9 +7,9 @@ dependencies {
     implementation group: 'io.vertx', name: 'vertx-mongo-client', version: '3.5.3'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.1'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.4.1'
-   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   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:' + project.findProperty('java.agent.version')
 }
 
 jar {
diff --git a/Vertx-EventBus-3.6/build.gradle b/Vertx-EventBus-3.6/build.gradle
@@ -5,11 +5,11 @@ apply plugin: 'java'
 
 dependencies {
    implementation 'io.vertx:vertx-core:3.6.0'
-   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   implementation 'com.newrelic.agent.java:agent-bridge:' + project.findProperty('java.agent.version')
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.1'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.4.1'
+   implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
+   implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
    
    
    testImplementation 'junit:junit:4.12'
@@ -30,7 +30,7 @@ jar {
 
 verifyInstrumentation {
   	passesOnly ('io.vertx:vertx-core:[3.6.0,3.7.1)') {
-  	  compile('com.newrelic.agent.java:newrelic-agent:6.4.0')
+  	  implementation('com.newrelic.agent.java:newrelic-agent:6.4.0')
   	}
    	excludeRegex '.*SNAPSHOT.*'
   	excludeRegex '.*milestone.*'
diff --git a/Vertx-EventBus-3.7.1/build.gradle b/Vertx-EventBus-3.7.1/build.gradle
@@ -8,10 +8,10 @@ dependencies {
 		
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.1'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.4.1'
+   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 fileTree(include: ['*.jar'], dir: '../libs')
+   implementation 'com.newrelic.agent.java:agent-bridge:' + project.findProperty('java.agent.version')
    
    testImplementation 'junit:junit:4.12'
    testImplementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -31,7 +31,7 @@ jar {
 
 verifyInstrumentation {
   	passesOnly ('io.vertx:vertx-core:[3.7.1,3.8.0)' ) {
-  	  compile('com.newrelic.agent.java:newrelic-agent:6.4.0')
+  	  implementation('com.newrelic.agent.java:newrelic-agent:6.4.0')
   	}
   	excludeRegex '.*SNAPSHOT'
   	excludeRegex '.*milestone.*'
diff --git a/Vertx-EventBus-3.8/build.gradle b/Vertx-EventBus-3.8/build.gradle
@@ -7,10 +7,10 @@ dependencies {
    implementation 'io.vertx:vertx-core:3.8.0'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.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 fileTree(include: ['*.jar'], dir: '../libs')
+   implementation 'com.newrelic.agent.java:agent-bridge:' + project.findProperty('java.agent.version')
    
    testImplementation 'junit:junit:4.12'
    testImplementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -29,7 +29,7 @@ jar {
 
 verifyInstrumentation {
   	passesOnly ('io.vertx:vertx-core:[3.8.0,4.0.0)' ) {
-  	  compile('com.newrelic.agent.java:newrelic-agent:6.4.0')
+  	  implementation('com.newrelic.agent.java:newrelic-agent:6.4.0')
   	}
   	excludeRegex '.*SNAPSHOT'
   	excludeRegex '.*milestone.*'
diff --git a/Vertx-EventBus-4.0/build.gradle b/Vertx-EventBus-4.0/build.gradle
@@ -7,10 +7,10 @@ dependencies {
    implementation 'io.vertx:vertx-core:4.0.0'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.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 fileTree(include: ['*.jar'], dir: '../libs')
+   implementation 'com.newrelic.agent.java:agent-bridge:' + project.findProperty('java.agent.version')
    
    testImplementation 'junit:junit:4.12'
    testImplementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -29,7 +29,7 @@ jar {
 
 verifyInstrumentation {
   	passesOnly ('io.vertx:vertx-core:[4.0.0,4.2.2)' ) {
-  	  compile('com.newrelic.agent.java:newrelic-agent:6.4.0')
+  	  implementation('com.newrelic.agent.java:newrelic-agent:6.4.0')
   	}
   	excludeRegex '.*SNAPSHOT'
   	excludeRegex '.*milestone.*'
diff --git a/Vertx-EventBus-4.2.2/build.gradle b/Vertx-EventBus-4.2.2/build.gradle
@@ -7,9 +7,9 @@ dependencies {
    implementation 'io.vertx:vertx-core:4.2.2'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
-   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   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:' + project.findProperty('java.agent.version')
    
    testImplementation 'junit:junit:4.12'
    testImplementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -29,7 +29,7 @@ jar {
 
 verifyInstrumentation {
   	passes ('io.vertx:vertx-core:[4.2.2,4.3.2)' ) {
-  	  compile('com.newrelic.agent.java:newrelic-agent:6.4.0')
+  	  implementation('com.newrelic.agent.java:newrelic-agent:6.4.0')
   	}
   	excludeRegex '.*SNAPSHOT'
   	excludeRegex '.*milestone.*'
diff --git a/Vertx-EventBus-4.3.2/build.gradle b/Vertx-EventBus-4.3.2/build.gradle
@@ -7,9 +7,9 @@ dependencies {
    implementation 'io.vertx:vertx-core:4.3.2'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
-   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   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:' + project.findProperty('java.agent.version')
    
    testImplementation 'junit:junit:4.12'
    testImplementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -29,7 +29,7 @@ jar {
 
 verifyInstrumentation {
   	passesOnly ('io.vertx:vertx-core:[4.3.2,4.5.0)' ) {
-  	  compile('com.newrelic.agent.java:newrelic-agent:6.4.0')
+  	  implementation('com.newrelic.agent.java:newrelic-agent:6.4.0')
   	}
   	excludeRegex '.*SNAPSHOT'
   	excludeRegex '.*milestone.*'
diff --git a/Vertx-EventBus-4.5.1/build.gradle b/Vertx-EventBus-4.5.1/build.gradle
@@ -7,9 +7,9 @@ dependencies {
    implementation 'io.vertx:vertx-core:4.5.1'
 
    // New Relic Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
-   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   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:' + project.findProperty('java.agent.version')
    
    testImplementation 'junit:junit:4.12'
    testImplementation 'org.nanohttpd:nanohttpd:2.3.1'
diff --git a/Vertx-EventBus-4.5/build.gradle b/Vertx-EventBus-4.5/build.gradle
@@ -7,9 +7,9 @@ dependencies {
    implementation 'io.vertx:vertx-core:4.5.0'
 
    // New Relic Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
-   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   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:' + project.findProperty('java.agent.version')
    
    testImplementation 'junit:junit:4.12'
    testImplementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -29,7 +29,7 @@ jar {
 
 verifyInstrumentation {
   	passesOnly ('io.vertx:vertx-core:[4.5.0]' ) {
-  	  compile('com.newrelic.agent.java:newrelic-agent:6.5.0')
+  	  implementation('com.newrelic.agent.java:newrelic-agent:6.5.0')
   	}
   	excludeRegex '.*SNAPSHOT'
   	excludeRegex '.*milestone.*'
diff --git a/Vertx-EventBus-5.0.0/build.gradle b/Vertx-EventBus-5.0.0/build.gradle
@@ -7,9 +7,9 @@ dependencies {
    implementation 'io.vertx:vertx-core:5.0.0'
 
    // New Relic Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
-   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   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:' + project.findProperty('java.agent.version')
    
    testImplementation 'junit:junit:4.12'
    testImplementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -28,7 +28,7 @@ jar {
 }
 
 verifyInstrumentation {
-	passesOnly 'io.vertx:vertx-core:[5.0.0,)'
+	passesOnly 'io.vertx:vertx-core:[5.0.0,5.1.0)'
   	excludeRegex '.*SNAPSHOT'
   	excludeRegex '.*milestone.*'
   	excludeRegex '.*Beta.*'
diff --git a/Vertx-Verticle-Finder/build.gradle b/Vertx-Verticle-Finder/build.gradle
@@ -7,9 +7,9 @@ dependencies {
 	implementation 'io.vertx:vertx-core:3.5.3'
 
    // New Relic Labs Java Agent dependencies
-   implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
-   implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
-   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   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:' + project.findProperty('java.agent.version')
 }
 
 jar {
diff --git a/build.gradle b/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.1'
+  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 {
@@ -172,7 +156,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'
 
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+java.agent.version=8.6.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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
diff --git a/newrelic-dependencies.sh b/newrelic-dependencies.sh
