Skip to content

Commit 5aa9396

Browse files
committed
HADOOP-17107. hadoop-azure parallel tests not working on recent JDKs (#2118)
Contributed by Steve Loughran. Change-Id: I972264aed36f384b7ae23e214326ef7870261cf5
1 parent e018521 commit 5aa9396

File tree

1 file changed

+12
-69
lines changed

1 file changed

+12
-69
lines changed

hadoop-tools/hadoop-azure/pom.xml

Lines changed: 12 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -303,31 +303,13 @@
303303
<build>
304304
<plugins>
305305
<plugin>
306-
<artifactId>maven-antrun-plugin</artifactId>
306+
<groupId>org.apache.hadoop</groupId>
307+
<artifactId>hadoop-maven-plugins</artifactId>
307308
<executions>
308309
<execution>
309-
<id>create-parallel-tests-dirs</id>
310-
<phase>test-compile</phase>
311-
<configuration>
312-
<target>
313-
<script language="javascript"><![CDATA[
314-
var baseDirs = [
315-
project.getProperty("test.build.data"),
316-
project.getProperty("test.build.dir"),
317-
project.getProperty("hadoop.tmp.dir")
318-
];
319-
for (var i in baseDirs) {
320-
for (var j = 1; j <= ${testsThreadCount}; ++j) {
321-
var mkdir = project.createTask("mkdir");
322-
mkdir.setDir(new java.io.File(baseDirs[i], j));
323-
mkdir.perform();
324-
}
325-
}
326-
]]></script>
327-
</target>
328-
</configuration>
310+
<id>parallel-tests-createdir</id>
329311
<goals>
330-
<goal>run</goal>
312+
<goal>parallel-tests-createdir</goal>
331313
</goals>
332314
</execution>
333315
</executions>
@@ -342,7 +324,6 @@
342324
<goal>test</goal>
343325
</goals>
344326
<configuration>
345-
<forkCount>1</forkCount>
346327
<forkCount>${testsThreadCount}</forkCount>
347328
<reuseForks>false</reuseForks>
348329
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
@@ -408,7 +389,6 @@
408389
<goal>verify</goal>
409390
</goals>
410391
<configuration>
411-
<forkCount>1</forkCount>
412392
<forkCount>${testsThreadCount}</forkCount>
413393
<reuseForks>false</reuseForks>
414394
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
@@ -486,31 +466,13 @@
486466
<build>
487467
<plugins>
488468
<plugin>
489-
<artifactId>maven-antrun-plugin</artifactId>
469+
<groupId>org.apache.hadoop</groupId>
470+
<artifactId>hadoop-maven-plugins</artifactId>
490471
<executions>
491472
<execution>
492-
<id>create-parallel-tests-dirs</id>
493-
<phase>test-compile</phase>
494-
<configuration>
495-
<target>
496-
<script language="javascript"><![CDATA[
497-
var baseDirs = [
498-
project.getProperty("test.build.data"),
499-
project.getProperty("test.build.dir"),
500-
project.getProperty("hadoop.tmp.dir")
501-
];
502-
for (var i in baseDirs) {
503-
for (var j = 1; j <= ${testsThreadCount}; ++j) {
504-
var mkdir = project.createTask("mkdir");
505-
mkdir.setDir(new java.io.File(baseDirs[i], j));
506-
mkdir.perform();
507-
}
508-
}
509-
]]></script>
510-
</target>
511-
</configuration>
473+
<id>parallel-tests-createdir</id>
512474
<goals>
513-
<goal>run</goal>
475+
<goal>parallel-tests-createdir</goal>
514476
</goals>
515477
</execution>
516478
</executions>
@@ -652,31 +614,13 @@
652614
<build>
653615
<plugins>
654616
<plugin>
655-
<artifactId>maven-antrun-plugin</artifactId>
617+
<groupId>org.apache.hadoop</groupId>
618+
<artifactId>hadoop-maven-plugins</artifactId>
656619
<executions>
657620
<execution>
658-
<id>create-parallel-tests-dirs</id>
659-
<phase>test-compile</phase>
660-
<configuration>
661-
<target>
662-
<script language="javascript"><![CDATA[
663-
var baseDirs = [
664-
project.getProperty("test.build.data"),
665-
project.getProperty("test.build.dir"),
666-
project.getProperty("hadoop.tmp.dir")
667-
];
668-
for (var i in baseDirs) {
669-
for (var j = 1; j <= ${testsThreadCount}; ++j) {
670-
var mkdir = project.createTask("mkdir");
671-
mkdir.setDir(new java.io.File(baseDirs[i], j));
672-
mkdir.perform();
673-
}
674-
}
675-
]]></script>
676-
</target>
677-
</configuration>
621+
<id>parallel-tests-createdir</id>
678622
<goals>
679-
<goal>run</goal>
623+
<goal>parallel-tests-createdir</goal>
680624
</goals>
681625
</execution>
682626
</executions>
@@ -691,7 +635,6 @@
691635
<goal>test</goal>
692636
</goals>
693637
<configuration>
694-
<forkCount>1</forkCount>
695638
<forkCount>${testsThreadCount}</forkCount>
696639
<reuseForks>false</reuseForks>
697640
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>

0 commit comments

Comments
 (0)