[3/3] groovy git commit: [build] Remove javax.script pre-JDK6 dependency (closes #234)

[jw...@apache.org]

[build] Remove javax.script pre-JDK6 dependency (closes #234)

Minimum jdk is now 6 so no longer need compatibility dependency.


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/398ee5dc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/398ee5dc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/398ee5dc

Branch: refs/heads/GROOVY_2_4_X
Commit: 398ee5dc4ff7ca094ca891c2c8350d60b9e1098e
Parents: 7bf0088
Author: John Wagenleitner <jw...@apache.org>
Authored: Tue Jan 5 20:52:06 2016 -0800
Committer: John Wagenleitner <jw...@apache.org>
Committed: Wed Jan 6 15:29:20 2016 -0800

----------------------------------------------------------------------
 subprojects/groovy-jsr223/build.gradle | 15 ---------------
 1 file changed, 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/398ee5dc/subprojects/groovy-jsr223/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/build.gradle b/subprojects/groovy-jsr223/build.gradle
index 3ce88b3..ba9730f 100644
--- a/subprojects/groovy-jsr223/build.gradle
+++ b/subprojects/groovy-jsr223/build.gradle
@@ -16,22 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-ext.scriptingCapable = {
-    // TODO remove this eventually - will break compiling on JDK 5
-    try {
-        Class.forName('javax.script.ScriptEngine')
-    } catch (e) {
-        return false
-    }
-    true
-}
-
 dependencies {
-    if (!scriptingCapable()) {
-        compile('org.livetribe:livetribe-jsr223:2.0.6') { dep ->
-            provided dep
-        }
-    }
     compile rootProject
     testCompile project(':groovy-test')
 }