Skip to content

Commit de9222b

Browse files
committed
build: Modernize Gradle build infrastructure
1 parent e947cb0 commit de9222b

16 files changed

Lines changed: 50 additions & 120 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Build and Release (Manual Run) v1.3
33
on:
44
workflow_dispatch: # This event allows manual triggering
55

6+
permissions:
7+
contents: write
8+
69
jobs:
710
build-and-release:
811
runs-on: ubuntu-latest
@@ -14,10 +17,10 @@ jobs:
1417
fetch-depth: 0
1518

1619

17-
- name: Set up JDK 8
20+
- name: Set up JDK 21
1821
uses: actions/setup-java@v3
1922
with:
20-
java-version: 8
23+
java-version: 21
2124
distribution: 'temurin'
2225

2326

@@ -31,8 +34,7 @@ jobs:
3134
3235
- name: Build with Gradle and verifyInstrumentation
3336
run: |
34-
. ./newrelic-dependencies.sh
35-
./gradlew clean build install verifyInstrumentation
37+
./gradlew clean install
3638
3739
- name: Identify Release Type
3840
id: define_release_type
@@ -107,9 +109,9 @@ jobs:
107109

108110
- name: Create Release
109111
id: create_release
110-
uses: actions/github-script@v6
112+
uses: actions/github-script@v7
111113
with:
112-
github-token: ${{ secrets.GITHUB_TOKEN }}
114+
github-token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
113115
script: |
114116
try {
115117
var changelog = ``;
@@ -135,7 +137,7 @@ jobs:
135137
- name: Upload Release Artifacts
136138
uses: actions/upload-release-asset@v1
137139
env:
138-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
140+
GITHUB_TOKEN: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
139141
with:
140142
asset_path: /tmp/to/${{ env.RELEASE_NAME}}${{ steps.set_tag.outputs.tag }}.zip
141143
asset_name: ${{ env.RELEASE_NAME}}${{ steps.set_tag.outputs.tag }}.zip
@@ -146,7 +148,7 @@ jobs:
146148
id: github_changelog
147149
uses: Helmisek/conventional-changelog-generator@v1.0.6-release
148150
with:
149-
repo-token: ${{ secrets.GITHUB_TOKEN }}
151+
repo-token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
150152
commit-types: "fix:Bug Fixes,feat:Features,doc:Documentation,build:Build Upgrades,BREAKING CHANGE:Enhancements"
151153
template-path: ".github/workflows/CHANGELOG.tpl.md"
152154

@@ -177,7 +179,7 @@ jobs:
177179
git commit -m "Update Changelog for Release [skip ci]"
178180
179181
# Push the changes to the remote repository
180-
git push --quiet --set-upstream origin HEAD
182+
# git push --quiet --set-upstream origin HEAD
181183
182184
- name: Get Compare URL
183185
run: |
@@ -187,9 +189,9 @@ jobs:
187189
188190
- name: Update Release
189191
id: update_release
190-
uses: actions/github-script@v6
192+
uses: actions/github-script@v7
191193
with:
192-
github-token: ${{ secrets.GITHUB_TOKEN }}
194+
github-token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
193195
script: |
194196
try {
195197

‎build.gradle‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212

1313
dependencies {
1414
classpath 'gradle-templates:gradle-templates:1.5'
15-
classpath 'com.newrelic.agent.java:gradle-verify-instrumentation-plugin:3.2'
15+
classpath 'com.newrelic.agent.java:gradle-verify-instrumentation-plugin:4.0'
1616
}
1717
}
1818

@@ -22,7 +22,7 @@ plugins {
2222

2323
project.ext {
2424
group = 'com.newrelic.instrumentation.labs'
25-
javaAgentVersion = '6.4.0'
25+
javaAgentVersion = project.findProperty('java.agent.version')
2626

2727
// Aligned with minimum Java major version supported by latest Java Agent
2828
javaVersion = JavaVersion.VERSION_1_8
@@ -58,23 +58,7 @@ task cleanUp(type: Delete) {
5858
}
5959
}
6060

61-
task checkForDependencies(type: Exec) {
62-
environment "JAVAAGENTVERSION", javaAgentVersion
63-
def rootProject = projectDir.path
64-
def cmdLine = rootProject+'/newrelic-dependencies.sh'
65-
workingDir rootProject
66-
commandLine cmdLine
67-
68-
}
69-
70-
task buildIfNeeded {
71-
dependsOn checkForDependencies
72-
dependsOn jar
73-
tasks.findByName('jar').mustRunAfter 'checkForDependencies'
74-
}
75-
7661
task createModule {
77-
dependsOn checkForDependencies
7862
description = 'Generate project files for a new instrumentation module'
7963
group = 'New Relic Labs'
8064
doLast {
@@ -174,7 +158,7 @@ subprojects {
174158
testImplementation 'com.newrelic.agent.java:newrelic-agent:' + project.javaAgentVersion
175159
}
176160

177-
task install(dependsOn: buildIfNeeded, type: Copy) {
161+
tasks.register('install', Copy) {
178162
description = 'Copies compiled jar to the NEW_RELIC_EXTENSIONS_DIR.'
179163
group = 'New Relic Labs'
180164

@@ -184,10 +168,6 @@ subprojects {
184168
into extDir
185169
}
186170

187-
compileJava.doFirst {
188-
tasks.findByName('checkForDependencies')
189-
}
190-
191171
install.doFirst {
192172
def extDir = System.getenv("NEW_RELIC_EXTENSIONS_DIR")
193173
if (extDir == null) {

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
java.agent.version=8.6.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎newrelic-dependencies.sh‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rootProject.name = 'java-instrumentation-template'
1+
rootProject.name = 'webmethods-instrumentation'
22
include 'webmethods-isclient-10.x'
33
include 'webmethods-isclient-9.x'
44
include 'webmethods-b2b-server-10.x'

‎softwareag-adapter/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ dependencies {
99
// implementation 'javax.servlet:servlet-api:2.5'
1010

1111
// New Relic Labs Java Agent dependencies
12-
implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
13-
implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
12+
implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
13+
implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
1414
implementation fileTree(include: ['*.jar'], dir: 'lib')
15-
implementation fileTree(include: ['*.jar'], dir: '../libs')
15+
implementation 'com.newrelic.agent.java:agent-bridge:' + project.findProperty('java.agent.version')
1616
implementation fileTree(include: ['*.jar'], dir: '../test-lib')
1717
}
1818

‎webmethods-adapter/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ dependencies {
88

99

1010
// New Relic Labs Java Agent dependencies
11-
implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
12-
implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
11+
implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
12+
implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
1313
implementation fileTree(include: ['*.jar'], dir: 'lib')
14-
implementation fileTree(include: ['*.jar'], dir: '../libs')
14+
implementation 'com.newrelic.agent.java:agent-bridge:' + project.findProperty('java.agent.version')
1515
implementation fileTree(include: ['*.jar'], dir: '../test-lib')
1616
}
1717

‎webmethods-b2b-server-10.x/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ dependencies {
99
// implementation 'javax.servlet:servlet-api:2.5'
1010

1111
// New Relic Labs Java Agent dependencies
12-
implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
13-
implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
12+
implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
13+
implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
1414
implementation fileTree(include: ['*.jar'], dir: 'lib')
15-
implementation fileTree(include: ['*.jar'], dir: '../libs')
15+
implementation 'com.newrelic.agent.java:agent-bridge:' + project.findProperty('java.agent.version')
1616
implementation fileTree(include: ['*.jar'], dir: '../test-lib')
1717
}
1818

‎webmethods-b2b-server-9.x/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ dependencies {
99
// implementation 'javax.servlet:servlet-api:2.5'
1010

1111
// New Relic Labs Java Agent dependencies
12-
implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
13-
implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
12+
implementation 'com.newrelic.agent.java:newrelic-agent:' + project.findProperty('java.agent.version')
13+
implementation 'com.newrelic.agent.java:newrelic-api:' + project.findProperty('java.agent.version')
1414
implementation fileTree(include: ['*.jar'], dir: 'lib')
15-
implementation fileTree(include: ['*.jar'], dir: '../libs')
15+
implementation 'com.newrelic.agent.java:agent-bridge:' + project.findProperty('java.agent.version')
1616
implementation fileTree(include: ['*.jar'], dir: '../test-lib')
1717
}
1818

0 commit comments

Comments
 (0)