@@ -155,44 +155,15 @@ class GrailsGradlePlugin extends GroovyPlugin {
155155
156156 applyBomImport(dme, project)
157157
158- boolean isGorm61 = false
159158 boolean hasGormVersion = project. hasProperty(' gormVersion' )
160159 String gormVersion
161160
162161 if (hasGormVersion) {
163162 gormVersion = project. properties[' gormVersion' ] as String
164- isGorm61 = GrailsVersionUtils . supportsAtLeastVersion(gormVersion, " 6.1.0" )
165- }
166-
167- if (isGorm61) {
168- project. afterEvaluate {
169- DependencySet dependencies = project. configurations. getByName(' testCompile' ). allDependencies
170- boolean hasPluginTesting = false
171- boolean hasGormTest = false
172- dependencies. each {
173- if (it. name == " grails-plugin-testing" ) {
174- hasPluginTesting = true
175- }
176- if (it. name == " grails-datastore-gorm-test" ) {
177- hasGormTest = true
178- }
179- }
180- if (hasPluginTesting && ! hasGormTest) {
181- project. dependencies. add " testCompile" , " org.grails:grails-datastore-gorm-test:$gormVersion "
182- }
183- }
184163 }
185164
186165 project. configurations. all( { Configuration configuration ->
187- for (oldPluginExcludes in [' async' , ' events' , ' converters' , ' gsp' , ' testing' ]) {
188- configuration. exclude(group :" org.grails" , module :" grails-plugin-$oldPluginExcludes " . toString())
189- }
190-
191166 if (hasGormVersion) {
192- if (isGorm61) {
193- configuration. exclude(module :' grails-datastore-simple' )
194- }
195-
196167 configuration. resolutionStrategy. eachDependency( { DependencyResolveDetails details ->
197168 String dependencyName = details. requested. name
198169 String group = details. requested. group
0 commit comments