Merge branch '2.5.x'

See gh-28485
This commit is contained in:
Andy Wilkinson 2021-10-29 17:18:52 +01:00
commit 51dc02e37b
1 changed files with 0 additions and 1 deletions

View File

@ -156,7 +156,6 @@ class JavaConventions {
project.getTasks().withType(Test.class, (test) -> { project.getTasks().withType(Test.class, (test) -> {
test.useJUnitPlatform(); test.useJUnitPlatform();
test.setMaxHeapSize("1024M"); test.setMaxHeapSize("1024M");
test.setMaxParallelForks(project.getGradle().getStartParameter().getMaxWorkerCount());
project.getTasks().withType(Checkstyle.class, (checkstyle) -> test.mustRunAfter(checkstyle)); project.getTasks().withType(Checkstyle.class, (checkstyle) -> test.mustRunAfter(checkstyle));
project.getTasks().withType(CheckFormat.class, (checkFormat) -> test.mustRunAfter(checkFormat)); project.getTasks().withType(CheckFormat.class, (checkFormat) -> test.mustRunAfter(checkFormat));
}); });