Skip to content

Commit cdcfea3

Browse files
smolabric3
authored andcommitted
Set JAVA_HOME for smoke test builds
1 parent 9b26cd3 commit cdcfea3

File tree

10 files changed

+10
-0
lines changed

10 files changed

+10
-0
lines changed

dd-java-agent/instrumentation/mule-4/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ tasks.register('extractLatestMuleServices', Sync) {
224224
// build the mule application via maven
225225
tasks.register('mvnPackage', Exec) {
226226
workingDir "$appDir"
227+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
227228
commandLine "$rootDir/mvnw", "-Ddatadog.builddir=$buildDir", "-Ddatadog.name=mule-test-application", "-Ddatadog.version=$version", 'package'
228229
outputs.dir("$buildDir/target")
229230
inputs.dir("$appDir/src")

dd-smoke-tests/quarkus/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
1717
// define the task that builds the quarkus project
1818
tasks.register('quarkusBuild', Exec) {
1919
workingDir "$appDir"
20+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
2021
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
2122
commandLine "${rootDir}/${gradlewCommand}", "build", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
2223

dd-smoke-tests/spring-boot-2.7-webflux/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
1515
// define the task that builds the quarkus project
1616
tasks.register('webfluxBuild', Exec) {
1717
workingDir "$appDir"
18+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
1819
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
1920
commandLine "$rootDir/${gradlewCommand}", "bootJar", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
2021

dd-smoke-tests/springboot-openliberty-20/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw'
1515
// compile the Open liberty spring boot server
1616
tasks.register('mvnStage', Exec) {
1717
workingDir "$appDir"
18+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
1819
commandLine "$rootDir/${mvnwCommand}", 'package', "-Dtarget.dir=${buildDir}/application/target"
1920
inputs.dir "$appDir/src"
2021
inputs.file "$appDir/pom.xml"

dd-smoke-tests/springboot-openliberty-23/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw'
1515
// compile the Open liberty spring boot server
1616
tasks.register('mvnStage', Exec) {
1717
workingDir "$appDir"
18+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
1819
commandLine "$rootDir/${mvnwCommand}", 'package', "-Dtarget.dir=${buildDir}/application/target"
1920
inputs.dir "$appDir/src"
2021
inputs.file "$appDir/pom.xml"

dd-smoke-tests/vertx-3.4/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
1818
// define the task that builds the quarkus project
1919
tasks.register('vertxBuild', Exec) {
2020
workingDir "$appDir"
21+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
2122
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
2223
commandLine "$appDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
2324

dd-smoke-tests/vertx-3.9-resteasy/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
1515
// define the task that builds the quarkus project
1616
tasks.register('vertxBuild', Exec) {
1717
workingDir "$appDir"
18+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
1819
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
1920
commandLine "$appDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
2021

dd-smoke-tests/vertx-3.9/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
1616
// define the task that builds the quarkus project
1717
tasks.register('vertxBuild', Exec) {
1818
workingDir "$appDir"
19+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
1920
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
2021
commandLine "$appDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
2122

dd-smoke-tests/vertx-4.2/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
1717
// define the task that builds the quarkus project
1818
tasks.register('vertxBuild', Exec) {
1919
workingDir "$appDir"
20+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
2021
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
2122
commandLine "$appDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
2223

dd-smoke-tests/wildfly/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
4747
// define the task that builds the quarkus project
4848
tasks.register('earBuild', Exec) {
4949
workingDir "$appDir"
50+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
5051
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
5152
commandLine "$rootDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
5253

0 commit comments

Comments
 (0)