Use org.grails.datastore.mapping.validation.ValidationException instead of grails.validation.ValidationException

Author: rainboyan

grace-datastore-gorm-tck/build.gradle

@@ -1,8 +1,4 @@
 dependencies {
     api project(":grace-datastore-gorm-async")
-    api project(":grace-datastore-gorm-support")
     runtimeOnly "org.apache.groovy:groovy-dateutil"
 }
-
-//compileGroovy.groovyOptions.fork = false
-//compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/CrudOperationsSpec.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.validation.ValidationException
+import org.grails.datastore.mapping.validation.ValidationException
 import spock.lang.IgnoreRest
 
 /**

grace-datastore-gorm-test/build.gradle

@@ -1,12 +1,11 @@
 dependencies {
-    api project(":grace-datastore-gorm"),
-            project(":grace-datastore-core")
+    api project(":grace-datastore-core")
+    api project(":grace-datastore-gorm")
 
     implementation "com.github.ben-manes.caffeine:caffeine"
     testImplementation project(":grace-datastore-gorm-tck")
     testImplementation "org.apache.groovy:groovy-json"
     testRuntimeOnly "org.springframework:spring-aop"
-    testRuntimeOnly "log4j:log4j:1.2.17"
 }
 
 //compileTestGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']

grace-datastore-gorm-test/src/test/groovy/grails/gorm/services/ServiceImplSpec.groovy

@@ -2,7 +2,7 @@ package grails.gorm.services
 
 import grails.gorm.annotation.Entity
 import grails.gorm.validation.PersistentEntityValidator
-import grails.validation.ValidationException
+import org.grails.datastore.mapping.validation.ValidationException
 import org.grails.datastore.gorm.validation.constraints.eval.DefaultConstraintEvaluator
 import org.grails.datastore.gorm.validation.constraints.registry.DefaultConstraintRegistry
 import org.grails.datastore.gorm.validation.constraints.registry.DefaultValidatorRegistry

grace-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/SaveWithFailOnErrorDefaultSpec.groovy

@@ -3,7 +3,7 @@ package org.grails.datastore.gorm
 import grails.gorm.annotation.Entity
 import grails.gorm.tests.GormDatastoreSpec
 import grails.gorm.validation.ConstrainedProperty
-import grails.validation.ValidationException
+import org.grails.datastore.mapping.validation.ValidationException
 import org.grails.datastore.gorm.validation.constraints.eval.DefaultConstraintEvaluator
 import org.springframework.validation.Errors
 import org.springframework.validation.Validator

grace-datastore-gorm/src/test/groovy/grails/gorm/services/MethodValidationTransformSpec.groovy

@@ -71,7 +71,7 @@ class Foo {
         instance.findAgain("")
 
         then:
-        def e2 = thrown( grails.validation.ValidationException )
+        def e2 = thrown(ValidationException)
         e2.message
         e2.errors.hasErrors()
         e2.errors.hasFieldErrors('title')