[groovy] 02/03: Fix test compile dependency

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit fc99f70c6f146590faf1f952df480398faa5ead1
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu May 23 11:29:08 2019 -0500

    Fix test compile dependency
---
 subprojects/groovy-servlet/build.gradle | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/subprojects/groovy-servlet/build.gradle b/subprojects/groovy-servlet/build.gradle
index 60faeb1..f5b16a0 100644
--- a/subprojects/groovy-servlet/build.gradle
+++ b/subprojects/groovy-servlet/build.gradle
@@ -24,18 +24,15 @@ dependencies {
         provided dep
         exclude(group: 'javax.servlet', module: 'servlet-api')
     }
-    compile rootProject
     testCompile "jmock:jmock:$jmockVersion"
+
+    compile rootProject
     // needed for MarkupBuilder
     compile project(':groovy-xml')
     // needed by TemplateServlet
     compile project(':groovy-templates')
+
     testCompile rootProject.sourceSets.test.runtimeClasspath
+    testCompile project(':groovy-json')
     testCompile project(':groovy-test')
-    // for compilation, dependency is not necessary because the classes are loaded using Class.forName
-    testRuntime project(':groovy-json')
-}
-
-eclipse.classpath.file.whenMerged {
-    entries.removeAll { entry -> entry.path == '/groovy-json' }
 }