Merge pull request #1302 from grails/cleanup-dep-rebased

Cleanup dependencies

Author: jameskleeh

build.gradle

@@ -20,7 +20,7 @@ project.ext {
     projectMinorVersion = "1"
     projectPatchVersion = "0"
 //     releaseType = "RELEASE"
-//    releaseType = "M2"
+//    releaseType = "M1"
 //    releaseType = "RC1"
     releaseType = "BUILD-SNAPSHOT"
 
@@ -57,7 +57,6 @@ ext {
 
 allprojects {
     repositories {
-        mavenLocal()
         maven { url "https://repo.grails.org/grails/core" }
         if(isBuildSnapshot) {
             maven { url "https://repo.grails.org/grails/libs-snapshots-local" }
@@ -132,28 +131,21 @@ subprojects {
             documentation "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
             documentation 'info.picocli:picocli:3.8.0'
 
-            compile group: 'org.codehaus.groovy', name: 'groovy', version: groovyVersion
-            testCompile group: 'org.codehaus.groovy', name: 'groovy-test-junit5', version: groovyVersion
+            compile "org.codehaus.groovy:groovy:$groovyVersion"
+            testCompile "org.codehaus.groovy:groovy-test-junit5:$groovyVersion"
             testCompile "org.junit.jupiter:junit-jupiter-api:5.6.0"
             testCompile "org.junit.platform:junit-platform-runner:1.6.0"
             testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.6.0"
 
-            testCompile(spockDependency) {
-                exclude group: 'junit', module: 'junit-dep'
-                exclude group: 'org.codehaus.groovy', module: 'groovy-all'
-                exclude group: 'org.hamcrest', module: 'hamcrest-core'
-                transitive = false
-            }
+            testCompile(spockDependency) { transitive = false }
         }
 
         if (project.name == "grails-datastore-gorm-tck") {
-            compile(spockDependency, {
-                exclude group: 'junit', module: 'junit-dep'
-                exclude group: 'org.codehaus.groovy', module: 'groovy-all'
-                exclude group: 'org.hamcrest', module: 'hamcrest-core'
-                transitive = false
-            })
+            compile "org.codehaus.groovy:groovy-test-junit5:$groovyVersion"
+            compile "org.junit.jupiter:junit-jupiter-api:5.6.0"
             compile "org.junit.platform:junit-platform-runner:1.6.0"
+            runtimeOnly "org.junit.jupiter:junit-jupiter-engine:5.6.0"
+            compile(spockDependency) { transitive = false }
         }
     }
 

gradle.properties

@@ -17,5 +17,6 @@ grailsVersion=3.3.8
 grailsAsyncVersion=3.3.2
 slf4jVersion=1.7.29
 junitVersion=4.12
+junit-jupiter.version=5.6.0
 javassistVersion=3.21.0-GA
 groovyVersion=3.0.3

grails-datastore-gorm-tck/build.gradle

@@ -3,7 +3,6 @@ dependencies {
     compile 'commons-lang:commons-lang:2.6'
     compile project(":grails-datastore-gorm-async")
     compile project(":grails-datastore-gorm-support")
-//    compile "junit:junit:$junitVersion"
     compile("javax.servlet:javax.servlet-api:$servletApiVersion")
 
     runtime "org.codehaus.groovy:groovy-dateutil:$groovyVersion"

grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/SimpleMapTestSuite.groovy

@@ -8,6 +8,7 @@ import org.junit.runner.RunWith
 /**
  * @author graemerocher
  */
+//TODO: Replace with JUnit5 declarative test suites once https://github.com/junit-team/junit5/issues/744 is resolved
 @RunWith(JUnitPlatform)
 @SelectClasses([NotInListSpec])
 class SimpleMapTestSuite {