From d9238f2490d79fcd654d410fe6625332e77af1e6 Mon Sep 17 00:00:00 2001
From: Andreas Beeker <kiwiwings@apache.org>
Date: Fri, 20 Aug 2021 17:07:36 +0000
Subject: [PATCH] try to fix concurrent issues in excelant

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1892478 13f79535-47bb-0310-9956-ffa450edef68
---
 build.gradle                 | 3 ---
 poi-integration/build.gradle | 2 ++
 poi-ooxml/build.gradle       | 2 ++
 poi-scratchpad/build.gradle  | 4 +++-
 poi/build.gradle             | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4c1a61d4fb..fdb03d0f20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -235,7 +235,6 @@ subprojects {
             '-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl',
             "-Dversion.id=${project.version}",
             '-ea',
-            '-Djunit.jupiter.execution.parallel.enabled=true',
             '-Djunit.jupiter.execution.parallel.config.strategy=fixed',
             '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3'
             // -Xjit:verbose={compileStart|compileEnd},vlog=build/jit.log${no.jit.sherlock}   ... if ${isIBMVM}
@@ -252,8 +251,6 @@ subprojects {
         // this is necessary for JDK 9+ to keep formatting dates the same way as in previous JDK-versions
         systemProperties['java.locale.providers'] = 'JRE,CLDR'
 
-        systemProperties['junit.jupiter.execution.parallel.enabled'] = 'false'
-
         doFirst {
             if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
                 jvmArgs += [
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 43afa39b51..e5bd949ca1 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -126,6 +126,8 @@ test {
 
     dependsOn { testJar }
 
+    systemProperties['junit.jupiter.execution.parallel.enabled'] = 'true'
+
     doFirst {
         jvmArgs += [
             "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 37638d95bf..5d57783622 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -217,6 +217,8 @@ test {
 
     dependsOn { testJar }
 
+    systemProperties['junit.jupiter.execution.parallel.enabled'] = 'true'
+
     doFirst {
         jvmArgs += [
             "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index c88cfeae14..2e2f8219e9 100644
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -150,7 +150,9 @@ artifacts {
 test {
     dependsOn { testJar }
 
-   doFirst {
+    systemProperties['junit.jupiter.execution.parallel.enabled'] = 'true'
+
+    doFirst {
         if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
             jvmArgs += [
                 '--add-modules', MODULE_NAME,
diff --git a/poi/build.gradle b/poi/build.gradle
index df8997bf8c..6c337e049e 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -154,6 +154,8 @@ artifacts {
 test {
     dependsOn { testJar }
 
+    systemProperties['junit.jupiter.execution.parallel.enabled'] = 'true'
+
     doFirst {
         if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
             jvmArgs << [
-- 
2.39.5