Merge branch '1.2.x'

Author: wilkinsona

build.gradle

@@ -74,8 +74,9 @@ subprojects {
 			dependency 'org.hamcrest:hamcrest-core:1.3'
 			dependency 'org.hamcrest:hamcrest-library:1.3'
 			dependency 'org.hibernate:hibernate-validator:5.4.1.Final'
-			dependency 'org.mockito:mockito-core:1.10.19'
+			dependency 'org.jruby:jruby-complete:9.1.13.0'
 			dependency 'org.junit.jupiter:junit-jupiter-api:5.0.0-M4'
+			dependency 'org.mockito:mockito-core:1.10.19'
 			dependency 'org.springframework.hateoas:spring-hateoas:0.23.0.RELEASE'
 			dependency 'org.jacoco:org.jacoco.agent:0.7.9'
 		}