Skip to content

Commit 67f1cf7

Browse files
fix: tempdir usage without getRoot
1 parent 1d17958 commit 67f1cf7

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public abstract class AbstractMavenTest {
2020

2121
protected AbstractMavenTest() {
2222
System.setProperty(
23-
"maven.multiModuleProjectDirectory",
24-
WORKING_DIRECTORY.getRoot().toAbsolutePath().toString());
23+
"maven.multiModuleProjectDirectory", WORKING_DIRECTORY.toAbsolutePath().toString());
2524
}
2625

2726
protected void executeMaven(
@@ -58,8 +57,7 @@ protected void customizeContainer(PlexusContainer container) {
5857
arguments[2] = goal;
5958
System.arraycopy(additionalArgs, 0, arguments, 3, additionalArgs.length);
6059

61-
mavenCli.doMain(
62-
arguments, WORKING_DIRECTORY.getRoot().toAbsolutePath().toString(), stdOut, stderr);
60+
mavenCli.doMain(arguments, WORKING_DIRECTORY.toAbsolutePath().toString(), stdOut, stderr);
6361

6462
Exception error = spy.handlerError.get();
6563
if (error != null) {

dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ private static File createToolchainsFile()
304304
Map<String, String> replacements =
305305
Collections.singletonMap("my_jdk_home_path", toolchainJdkHome.getAbsolutePath());
306306

307-
File toolchainsFile = WORKING_DIRECTORY.getRoot().resolve("toolchains.xml").toFile();
307+
File toolchainsFile = WORKING_DIRECTORY.resolve("toolchains.xml").toFile();
308308
try (FileWriter toolchainsFileWriter = new FileWriter(toolchainsFile)) {
309309
Template coveragesTemplate = FREEMARKER.getTemplate("sampleToolchains.ftl");
310310
coveragesTemplate.process(replacements, toolchainsFileWriter);

0 commit comments

Comments
 (0)