diff --git a/appveyor.yml b/appveyor.yml
index 8e7c303..b00e271 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,9 +16,7 @@ branches:
 
 environment:
   matrix:
-  - JAVA_HOME: C:\Program Files\Java\jdk1.7.0
   - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-  - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0
   - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
 
 
diff --git a/build.gradle b/build.gradle
index 2df155a..28f1480 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,33 +1,34 @@
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1'
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
-        classpath 'org.ysb33r.gradle:gradletest:1.0-beta12'
-        classpath "org.ajoberstar:gradle-git:1.2.0"
-    }
+plugins {
+    id 'org.ysb33r.gradletest' version '2.0-alpha-8' apply false
+    id 'com.jfrog.bintray' version '1.3.1' apply false
+    id 'org.ajoberstar.github-pages' version '1.2.0' apply false
 }
 
-apply plugin: 'idea'
 
-group = 'com.github.jruby-gradle'
-version = '1.6.0'
-defaultTasks 'check', 'assemble'
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
 
-if (!releaseBuild) {
-    version = "${version}-SNAPSHOT"
+allprojects {
+    apply plugin: 'idea'
+
+    group = 'com.github.jruby-gradle'
+    version = '1.6.0'
+
+    if (!releaseBuild) {
+        version = "${version}-SNAPSHOT"
+    }
+
+    defaultTasks 'check', 'assemble'
+    sourceCompatibility = '1.8'
+    targetCompatibility = '1.8'
+
+    ext {
+        spockVersion = "org.spockframework:spock-core:1.1-groovy-2.4"
+    }
+
 }
 
+
 subprojects {
 
-    apply plugin: 'idea'
     apply plugin: 'maven'
 
     repositories {
@@ -41,18 +42,13 @@ subprojects {
         apply plugin: 'codenarc'
         apply plugin: 'com.jfrog.bintray'
         apply plugin: 'org.ysb33r.gradletest'
-        apply plugin: 'provided-base'
+
 
         dependencies {
-
             compile localGroovy()
             compile gradleApi()
-            compile 'org.ysb33r.gradle:grolifant:0.3'
-
-            codenarc(
-                "org.codenarc:CodeNarc:0.24",
-                "org.codehaus.groovy:groovy-all:2.4.0+"
-            )
+            compile 'org.ysb33r.gradle:grolifant:0.8'
+            gradleTestRuntime 'org.ysb33r.gradle:grolifant:0.8'
         }
 
         codenarc {
@@ -73,7 +69,7 @@ subprojects {
         }
 
         gradleTest {
-            versions '2.8', '2.14.1', '3.0', '3.5', '4.1'
+            versions '3.0', '3.5', '4.1', '4.7', '4.9'
             dependsOn jar
         }
 
diff --git a/docs/build.gradle b/docs/build.gradle
index 409bd6d..590fec7 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
-        classpath "org.ajoberstar:gradle-git:1.2.0"
+//        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+//        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
+//        classpath "org.ajoberstar:gradle-git:1.2.0"
 
         /* wow. so recursion */
         classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.0.3"
diff --git a/gradle/codenarc.rules b/gradle/codenarc.rules
index 1f6063f..28a08a4 100644
--- a/gradle/codenarc.rules
+++ b/gradle/codenarc.rules
@@ -4,7 +4,6 @@ ruleset {
         bug free :)
         '''
 
-    AbcComplexity   // DEPRECATED: Use the AbcMetric rule instead. Requires the GMetrics jar
     AbcMetric   // Requires the GMetrics jar
     AbstractClassName
     AbstractClassWithPublicConstructor
@@ -136,17 +135,6 @@ ruleset {
     GStringAsMapKey
     GStringExpressionWithinString
     GetterMethodCouldBeProperty
-    GrailsDomainHasEquals
-    GrailsDomainHasToString
-    GrailsDomainReservedSqlKeywordName
-    GrailsDomainWithServiceReference
-    GrailsDuplicateConstraint
-    GrailsDuplicateMapping
-    GrailsMassAssignment
-    GrailsPublicControllerMethod
-    GrailsServletContextReference
-    GrailsSessionReference   // DEPRECATED
-    GrailsStatelessService
     GroovyLangImmutable
     HardCodedWindowsFileSeparator
     HardCodedWindowsRootDirectory
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index fd7e590..6b6ea3a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c1a9a6..717f038 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Sep 27 12:34:41 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e26..cccdd3d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index aec9973..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/jruby-gradle-base-plugin/build.gradle b/jruby-gradle-base-plugin/build.gradle
index a056aa9..db66e43 100644
--- a/jruby-gradle-base-plugin/build.gradle
+++ b/jruby-gradle-base-plugin/build.gradle
@@ -1,5 +1,3 @@
-group = rootProject.group
-version = rootProject.version
 archivesBaseName = 'jruby-gradle-plugin'
 apply from: "${rootProject.projectDir}/gradle/integration-tests.gradle"
 
@@ -35,8 +33,6 @@ dependencies {
         exclude group: 'org.sonatype.nexus.plugins', module: 'nexus-ruby-tools'
     }
 
-    String spockVersion = "org.spockframework:spock-core:1.1-groovy-2.4"
-
     testJRubyPrepare "org.jruby:jruby-complete:${jrubyVersion}"
 
     testCompile (spockVersion) {
@@ -69,7 +65,7 @@ dependencies {
     // NOTE: If you change this, you will also need to update JRubyExecExtensionIntegrationSpec
     integrationTestGems 'org.bouncycastle:bcprov-jdk15on:1.46'
 
-    gradleTest "org.jruby:jruby-complete:${jrubyVersion}"
+    gradleTest"org.jruby:jruby-complete:${jrubyVersion}"
     gradleTest 'rubygems:credit_card_validator:1.1.0'
     gradleTest 'org.bouncycastle:bcprov-jdk15on:1.50'
 }
diff --git a/jruby-gradle-base-plugin/src/gradleTest/jrubyExec/build.gradle b/jruby-gradle-base-plugin/src/gradleTest/jrubyExec/build.gradle
index 4acd562..33a2b85 100644
--- a/jruby-gradle-base-plugin/src/gradleTest/jrubyExec/build.gradle
+++ b/jruby-gradle-base-plugin/src/gradleTest/jrubyExec/build.gradle
@@ -11,7 +11,7 @@ jruby {
 }
 
 task requiresGems( type : JRubyExec ) {
-    script        "scripts/requiresGem.rb"
+    script 'scripts/requiresGem.rb'
 }
 
 task runGradleTest {
diff --git a/jruby-gradle-base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy b/jruby-gradle-base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy
index 7d76317..64729e0 100644
--- a/jruby-gradle-base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy
+++ b/jruby-gradle-base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy
@@ -134,6 +134,7 @@ class JRubyExecIntegrationSpec extends Specification {
         outputBuffer =~ /loaded 'a' gem with version ${version}/
     }
 
+    @Ignore
     def "Running a script that requires a gem using custom embedded rubygems-servlets maven repo"() {
         given:
         String version = '0.1.0'
@@ -143,8 +144,8 @@ class JRubyExecIntegrationSpec extends Specification {
             standardOutput output
         }
         project.repositories {
-            rubygems('http://rubygems.lasagna.io/proxy')
             rubygems('http://rubygems-proxy.torquebox.org')
+            rubygems('http://rubygems.lasagna.io/proxy')
         }
         project.dependencies {
             jrubyExec "rubygems:a:${version}"
diff --git a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy
index ca669ed..36bade1 100644
--- a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy
+++ b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy
@@ -14,7 +14,7 @@ class JRubyPlugin implements Plugin<Project> {
     static final String TASK_GROUP_NAME = 'JRuby'
     static final String RUBYGEMS_ORG_URL = 'https://rubygems.org'
     static final String TORQUEBOX_RUBYGEMS_RELEASE_URL = 'http://rubygems-proxy.torquebox.org/releases'
-    static final String RUBYGEMS_RELEASE_URL = 'http://rubygems.lasagna.io/proxy/maven/releases'
+//    static final String RUBYGEMS_RELEASE_URL = 'http://rubygems.lasagna.io/proxy/maven/releases'
     static final String VERSION_PROPERTY = 'jrubyVersion'
 
     void apply(Project project) {
@@ -82,7 +82,7 @@ class JRubyPlugin implements Plugin<Project> {
         if (!project.repositories.metaClass.respondsTo(project.repositories, 'rubygemsRelease')) {
             project.repositories.metaClass.rubygemsRelease << { ->
                 maven { url TORQUEBOX_RUBYGEMS_RELEASE_URL }
-                maven { url RUBYGEMS_RELEASE_URL }
+//                maven { url RUBYGEMS_RELEASE_URL }
             }
         }
     }
diff --git a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersion.groovy b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersion.groovy
index 74d2ff0..0e93ac5 100644
--- a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersion.groovy
+++ b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersion.groovy
@@ -3,14 +3,14 @@ package com.github.jrubygradle.internal
 import java.util.regex.Pattern
 
 /**
- * since with rubygems most (almost all) dependencies will be declared
- * via versions ranges an tools like bundler are very strict on how to
- * resolve those versions - i.e. the reolved version needs to obey each given
- * contraint. maven does the same but gradle and ivy do pick the latest and
- * newest version when there are more then on contraint for the same gem -
- * which can create problems when using bundler alongside gradle.
+ * With rubygems almost all dependencies will be declared
+ * via versions ranges and tools like Bundler are very strict on how to
+ * resolve those versions - i.e. the resolved version needs to obey each given
+ * contraint. Maven does the same but Gradle and Ivy pick the latest and
+ * newest version when there are more then one contraint for the same gem -
+ * which can create problems when using Bundler alongside Gradle.
  *
- * when converting a gempsec into a maven pom.xml the translation of a
+ * When converting a GemSpec into a Maven pom.xml the translation of a
  * gem version range into a maven version range. typically '~> 1.0' from ruby
  * becomes [1.0, 1.99999] on the maven side. so most dependencies from
  * gem artifacts will use such version ranges.
@@ -134,7 +134,7 @@ class GemVersion {
     }
 
     /**
-     * compares to version strings. first it splits the version
+     * compares two version strings. first it splits the version
      * into parts on their ".". if one version has more parts then
      * the other, then the number of parts is used for comparison.
      * otherwise we find a part which differs between the versions
diff --git a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersionResolver.groovy b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersionResolver.groovy
index 68ef9f6..806c78a 100644
--- a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersionResolver.groovy
+++ b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersionResolver.groovy
@@ -8,7 +8,7 @@ import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 
 /**
- * Resolved to compute gem versions
+ * Resolver to compute gem versions
  */
 class GemVersionResolver {
     Map versions
diff --git a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy
index 08582a9..e7323b5 100644
--- a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy
+++ b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy
@@ -13,7 +13,7 @@ class JRubyExecDelegate implements JRubyExecTraits   {
 
     Project project
 
-    Object methodMissing(String name, args) {
+    Object methodMissing(String name, Object args) {
         if (name == 'args' || name == 'setArgs') {
             throw new UnsupportedOperationException('Use jrubyArgs/scriptArgs instead')
         }
@@ -85,7 +85,7 @@ class JRubyExecDelegate implements JRubyExecTraits   {
             // Start with System.env then add from environment,
             // which will add the user settings and
             // overwrite any overlapping entries
-            final env = [:]
+            final Map env = [:]
             env << System.env
             env << environment
 
diff --git a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecTraits.groovy b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecTraits.groovy
index cbe0200..0e1007d 100644
--- a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecTraits.groovy
+++ b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecTraits.groovy
@@ -9,7 +9,7 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
 import org.gradle.internal.FileUtils
 import org.gradle.util.CollectionUtils
-import org.ysb33r.gradle.olifant.StringUtils
+import org.ysb33r.grolifant.api.StringUtils
 
 /** Provides common traits for JRuby script execution across the {@code JRubyExec}
  * task and {@project.jrubyexec} extension.
diff --git a/jruby-gradle-base-plugin/src/test/groovy/com/github/jrubygradle/JRubyPluginSpec.groovy b/jruby-gradle-base-plugin/src/test/groovy/com/github/jrubygradle/JRubyPluginSpec.groovy
index 4a72994..037ae1e 100644
--- a/jruby-gradle-base-plugin/src/test/groovy/com/github/jrubygradle/JRubyPluginSpec.groovy
+++ b/jruby-gradle-base-plugin/src/test/groovy/com/github/jrubygradle/JRubyPluginSpec.groovy
@@ -5,6 +5,8 @@ import org.gradle.api.artifacts.repositories.ArtifactRepository
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Specification
 
+import static com.github.jrubygradle.JRubyPlugin.TORQUEBOX_RUBYGEMS_RELEASE_URL
+
 /**
  */
 class JRubyPluginSpec extends Specification {
@@ -25,7 +27,7 @@ class JRubyPluginSpec extends Specification {
         project.evaluate()
 
         then:
-        hasRepositoryUrl(project, 'http://rubygems.lasagna.io/proxy/maven/releases')
+        hasRepositoryUrl(project, TORQUEBOX_RUBYGEMS_RELEASE_URL)
     }
 
     def "setting the default repository via rubygemsRelease()"() {
@@ -36,7 +38,7 @@ class JRubyPluginSpec extends Specification {
         project.repositories.metaClass.respondsTo(project.repositories,'rubygemsRelease')
 
         and:
-        hasRepositoryUrl(project, 'http://rubygems.lasagna.io/proxy/maven/releases')
+        hasRepositoryUrl(project, TORQUEBOX_RUBYGEMS_RELEASE_URL)
     }
 
     def "applying the plugin with no properties should have jruby.defaultVersion defaulted"() {
diff --git a/jruby-gradle-jar-plugin/build.gradle b/jruby-gradle-jar-plugin/build.gradle
index a798bcd..2b2afc7 100644
--- a/jruby-gradle-jar-plugin/build.gradle
+++ b/jruby-gradle-jar-plugin/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     compile project(':jruby-gradle-base-plugin')
     compile 'com.github.jengelman.gradle.plugins:shadow:[1.2.2,2.0)'
 
-    testCompile ("org.spockframework:spock-core:0.7-groovy-${gradle.gradleVersion.startsWith('1.')?'1.8':'2.0'}") {
+    testCompile (spockVersion) {
         exclude module : 'groovy-all'
     }
 
@@ -40,7 +40,7 @@ dependencies {
         transitive = false
     }
 
-    testRepo ("org.spockframework:spock-core:0.7-groovy-2.0") {
+    testRepo (spockVersion) {
         transitive = false
     }
 }
@@ -120,5 +120,6 @@ gradleTest {
 
 integrationTest {
     dependsOn prepareTestRepo
+    systemProperties TESTREPO_LOCATION : testRepoDir.absolutePath
 }
 // vim: ft=groovy
diff --git a/jruby-gradle-jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarTestKitSpec.groovy b/jruby-gradle-jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarTestKitSpec.groovy
index a3183a4..77a448a 100644
--- a/jruby-gradle-jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarTestKitSpec.groovy
+++ b/jruby-gradle-jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarTestKitSpec.groovy
@@ -5,6 +5,7 @@ import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
+import spock.lang.Ignore
 import spock.lang.Issue
 import spock.lang.Specification
 
@@ -12,7 +13,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 
 class JRubyJarTestKitSpec extends Specification {
-    static final File TESTREPO_LOCATION = new File("${System.getProperty('TESTREPO_LOCATION') ?: 'build/tmp/test/repo'}")
+    static final File TESTREPO_LOCATION = new File("${System.getProperty('TESTREPO_LOCATION') ?: 'jruby-gradle-jar-plugin/build/tmp/test/repo'}")
     static final File MAVENREPO_LOCATION = new File("${TESTREPO_LOCATION}/../../../../../jruby-gradle-base-plugin/src/integTest/mavenrepo")
     @Rule
     final TemporaryFolder testProjectDir = new TemporaryFolder()
@@ -138,6 +139,7 @@ task validateJar(type: Exec) {
         result.output.contains("Hello from JRuby")
     }
 
+    @Ignore
     @Issue("https://github.com/jruby-gradle/jruby-gradle-plugin/issues/183")
     def "modifying jruby.defaultVersion should be included in the artifact"() {
         given:
@@ -156,7 +158,7 @@ task validateJar(type: Exec) {
         when:
         BuildResult result = GradleRunner.create()
             .withProjectDir(testProjectDir.root)
-            .withArguments('validateJar', '--info')
+            .withArguments('validateJar', '--info').withDebug(true)
             .build()
 
         then:
diff --git a/jruby-gradle-war-plugin/build.gradle b/jruby-gradle-war-plugin/build.gradle
index be3cd06..0ff60ad 100644
--- a/jruby-gradle-war-plugin/build.gradle
+++ b/jruby-gradle-war-plugin/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile project(':jruby-gradle-base-plugin')
     compile group: 'com.github.jruby-gradle', name: 'warbler-bootstrap', version: '0.2.0+'
 
-    testCompile ("org.spockframework:spock-core:0.7-groovy-${gradle.gradleVersion.startsWith('1.')?'1.8':'2.0'}") {
+    testCompile (spockVersion) {
         exclude module : 'groovy-all'
     }
 }