Merge branch 'feature_groovy305Upgrade'

croz-ltd · Jul 27, 2020 · 59bea5e · 59bea5e
2 parents 298202b + 3aeebd3
commit 59bea5e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 34 deletions.
diff --git a/build.gradle b/build.gradle
@@ -102,15 +102,7 @@ configure(subprojects) { Project subproject ->
   }
 
   test {
-    // TODO dmurat: remove this check when https://github.com/spockframework/spock/issues/1177 gets fixed.
-    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
-      // NOTE: "-noverify" option must not be included for JDK 1.8. Otherwise, Spock's "thrown()" method results in IllegalAccessError.
-      jvmArgs = ["-XX:TieredStopAtLevel=1"]
-    }
-    else {
-      jvmArgs = ["-noverify", "-XX:TieredStopAtLevel=1"]
-    }
-
+    jvmArgs = ["-noverify", "-XX:TieredStopAtLevel=1"]
     useJUnitPlatform()
   }
 

diff --git a/cargotracker/cargotracker-booking-commandside-app/build.gradle b/cargotracker/cargotracker-booking-commandside-app/build.gradle
@@ -49,14 +49,7 @@ tasks.register("testIntegration", Test) { Test testIntegrationTask ->
   testClassesDirs = sourceSets.testIntegration.output.classesDirs
   classpath = sourceSets.testIntegration.runtimeClasspath
 
-  // TODO dmurat: remove this check when https://github.com/spockframework/spock/issues/1177 gets fixed.
-  if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
-    // NOTE: "-noverify" option must not be included for JDK 1.8. Otherwise, Spock's "thrown()" method results in IllegalAccessError.
-    jvmArgs = ["-XX:TieredStopAtLevel=1"]
-  }
-  else {
-    jvmArgs = ["-noverify", "-XX:TieredStopAtLevel=1"]
-  }
+  jvmArgs = ["-noverify", "-XX:TieredStopAtLevel=1"]
 }
 
 idea {

diff --git a/cargotracker/cargotracker-booking-queryside-app/build.gradle b/cargotracker/cargotracker-booking-queryside-app/build.gradle
@@ -49,14 +49,7 @@ tasks.register("testIntegration", Test) { Test testIntegrationTask ->
   testClassesDirs = sourceSets.testIntegration.output.classesDirs
   classpath = sourceSets.testIntegration.runtimeClasspath
 
-  // TODO dmurat: remove this check when https://github.com/spockframework/spock/issues/1177 gets fixed.
-  if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
-    // NOTE: "-noverify" option must not be included for JDK 1.8. Otherwise, Spock's "thrown()" method results in IllegalAccessError.
-    jvmArgs = ["-XX:TieredStopAtLevel=1"]
-  }
-  else {
-    jvmArgs = ["-noverify", "-XX:TieredStopAtLevel=1"]
-  }
+  jvmArgs = ["-noverify", "-XX:TieredStopAtLevel=1"]
 }
 
 idea {

diff --git a/cargotracker/cargotracker-booking-queryside-rdbms-projection-app/build.gradle b/cargotracker/cargotracker-booking-queryside-rdbms-projection-app/build.gradle
@@ -49,14 +49,7 @@ tasks.register("testIntegration", Test) { Test testIntegrationTask ->
   testClassesDirs = sourceSets.testIntegration.output.classesDirs
   classpath = sourceSets.testIntegration.runtimeClasspath
 
-  // TODO dmurat: remove this check when https://github.com/spockframework/spock/issues/1177 gets fixed.
-  if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
-    // NOTE: "-noverify" option must not be included for JDK 1.8. Otherwise, Spock's "thrown()" method results in IllegalAccessError.
-    jvmArgs = ["-XX:TieredStopAtLevel=1"]
-  }
-  else {
-    jvmArgs = ["-noverify", "-XX:TieredStopAtLevel=1"]
-  }
+  jvmArgs = ["-noverify", "-XX:TieredStopAtLevel=1"]
 }
 
 idea {

diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@ axonFrameworkVersion = 4.3.4
 axonTracingExtensionVersion = 4.3
 codeNarcVersion = 1.6
 dataSourceProxyVersion = 1.7
-groovyVersion = 3.0.4
+groovyVersion = 3.0.5
 
 # javaparser-core is a dependency of groovy-groovydoc, and its version should be updated each time when groovyVersion is updated.
 javaparserCoreVersion = 3.15.22