groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwagenleit...@apache.org
Subject [1/3] groovy git commit: [build] Remove javax.script pre-JDK6 dependency (closes #234)
Date Wed, 06 Jan 2016 23:25:27 GMT
Repository: groovy
Updated Branches:
  refs/heads/master b183bee66 -> f40309942


[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/b03f2b9f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b03f2b9f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b03f2b9f

Branch: refs/heads/master
Commit: b03f2b9f9ffab0879ff6a216fd6e696f4e29e6b2
Parents: b183bee
Author: John Wagenleitner <jwagenleitner@apache.org>
Authored: Tue Jan 5 20:52:06 2016 -0800
Committer: John Wagenleitner <jwagenleitner@apache.org>
Committed: Wed Jan 6 14:18:26 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/groovy/blob/b03f2b9f/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')
 }


Mime
View raw message