Merge Master

manticore-projects · manticore-projects · commit 873dfd499276 · 2021-11-29T14:49:42.000+07:00
diff --git a/build.gradle b/build.gradle
@@ -19,12 +19,12 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8
 repositories {
 	gradlePluginPortal()
     mavenLocal()
+    mavenCentral()
     maven {
         url = uri('https://repo.maven.apache.org/maven2/')
     }
-
     maven {
-        url "https://plugins.gradle.org/m2/"
+      url "https://plugins.gradle.org/m2/"
     }
 }
 
@@ -37,7 +37,7 @@ dependencies {
     testImplementation 'com.h2database:h2:1.4.200'
 
 
-    
+
     // for JaCoCo Reports
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
@@ -49,6 +49,7 @@ dependencies {
 
     // enforce latest version of JavaCC
     javacc 'net.java.dev.javacc:javacc:7.0.10'
+
 }
 
 compileJavacc {
@@ -71,6 +72,16 @@ jacoco {
 test {
     useJUnitPlatform()
 
+    // set heap size for the test JVM(s)
+    minHeapSize = "128m"
+    maxHeapSize = "1G"
+
+    jvmArgs << [
+            '-Djunit.jupiter.execution.parallel.enabled=true',
+            '-Djunit.jupiter.execution.parallel.config.strategy=dynamic',
+            '-Djunit.jupiter.execution.parallel.mode.default=concurrent'
+    ]
+
     finalizedBy jacocoTestReport // report is always generated after tests run
     finalizedBy jacocoTestCoverageVerification
 }
@@ -108,7 +119,7 @@ jacocoTestCoverageVerification {
             limit {
                 counter = 'LINE'
                 value = 'MISSEDCOUNT'
-                maximum = 5458
+                maximum = 5500
                 }
             excludes = [
                     'net.sf.jsqlparser.util.validation.*',
@@ -249,7 +260,7 @@ task updateKeywords(type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     main = "net.sf.jsqlparser.parser.ParserKeywordsUtils"
 }
-  
+
 
 publishing {
     publications {
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,12 @@
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
+
+org.gradle.caching=true
+
+# Modularise your project and enable parallel build
+org.gradle.parallel=true
+
+# Enable configure on demand.
+org.gradle.configureondemand=true
+
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -45,7 +45,10 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.CONCURRENT)
 public class SelectTest {
 
     private final CCJSqlParserManager parserManager = new CCJSqlParserManager();
