Merge commit '24908c30b27d74ce8074e7bb7d9ce825804f51d6' into develop

# Conflicts:
#	build.gradle

Author: dcendents

build.gradle

@@ -16,7 +16,7 @@ repositories {
 }
 
 ext {
-	gradleVersions = '4.1,4.2'
+	gradleVersions = '4.1,4.2,4.2.1'
 	androidGradleBuildVersion = '3.0.0-beta3'
 	androidCompileSdkVersion = 'android-26'
 	androidBuildToolsVersion = '26.0.1'
@@ -52,6 +52,7 @@ ext {
 }
 
 versions.maven = "3.0.4"
+versions.groovy = "2.4.12"
 
 dependencies {
 	jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime"
@@ -101,28 +102,28 @@ dependencies {
 
 	testRuntime files(createClasspathManifest)
 
-	testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
+	testCompile('org.spockframework:spock-core:1.0-groovy-2.4@jar') {
         exclude module: 'groovy-all'
     }
 
 	testCompile	'junit:junit:4.12',
 				'org.hamcrest:hamcrest-all:1.3',
-				'org.codehaus.groovy:groovy-all:2.4.11'
+				"org.codehaus.groovy:groovy-all:${versions.groovy}"
 
 	// from gradle/subprojects/core/core.gradle, gradle/subprojects/internal-testing/internal-testing.gradle and gradle/gradle/dependencies.gradle
 	testCompile	'commons-io:commons-io:2.2',
 				'commons-lang:commons-lang:2.6@jar',
 				'org.objenesis:objenesis:1.2@jar',
-				'cglib:cglib-nodep:2.2.2',
+				'cglib:cglib:3.2.5',
 				'org.jmock:jmock:2.5.1',
 				dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
 				'org.jmock:jmock-legacy:2.5.1',
 				'com.google.guava:guava-jdk5:17.0@jar',
 				'org.jsoup:jsoup:1.6.3',
-				'com.google.code.findbugs:jsr305:1.3.9@jar',
-				'org.ow2.asm:asm-all:5.1'
+				'com.google.code.findbugs:jsr305:2.0.1',
+				'org.ow2.asm:asm-debug-all:6.0_ALPHA'
 	testCompile dependencies.module('org.apache.ivy:ivy:2.2.0'){
-		dependency "com.jcraft:jsch:0.1.53"
+		dependency "com.jcraft:jsch:0.1.54"
 	}
 	testCompile dependencies.module('org.apache.ant:ant:1.9.6') {
 		dependency 'org.apache.ant:ant-launcher:1.9.6@jar'
@@ -229,7 +230,7 @@ jacocoTestReport.dependsOn test
 check.dependsOn jacocoTestReport
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.2'
+    gradleVersion = '4.2.1'
     distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip