diff --git a/build.gradle b/build.gradle
index a9259487f2a8..7c4d4a127a16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ buildscript {
 }
 
 plugins {
-	id 'com.gradle.build-scan' version '1.3'
+	id 'com.gradle.build-scan' version '1.9'
 	id 'me.champeau.buildscan-recipes' version '0.1.7'
 }
 
@@ -59,7 +59,7 @@ allprojects {
 
 ext {
 	hibernateTargetVersion = '5.2.12-SNAPSHOT'
-	expectedGradleVersion = '3.2.1'
+	expectedGradleVersion = '4.2'
 	baselineJavaVersion = '1.8'
 
     osgiExportVersion = hibernateTargetVersion.replaceAll( '-SNAPSHOT', '.SNAPSHOT' )
@@ -97,6 +97,10 @@ subprojects { subProject ->
 
     defaultTasks 'build'
 
+	if ( subProject.name.startsWith( 'hibernate-gradle-plugin' ) ) {
+		apply plugin: 'groovy'
+	}
+
     group = 'org.hibernate'
     version = rootProject.hibernateTargetVersion
 
@@ -280,12 +284,19 @@ subprojects { subProject ->
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// artifact
+
 	jar {
 		manifest = osgiManifest {
 			// GRADLE-1411: Even if we override Imports and Exports
 			// auto-generation with instructions, classesDir and classpath
 			// need to be here (temporarily).
-			classesDir = sourceSets.main.output.classesDir
+
+			if ( subProject.name.startsWith( 'hibernate-gradle-plugin' ) ) {
+				classesDir = sourceSets.main.groovy.outputDir
+			}
+			else {
+				classesDir = sourceSets.main.output.classesDir
+			}
 			classpath = configurations.runtime
 
 			instruction 'Import-Package',
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 51288f9c2f05..d457a1a990f3 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 97650c1eef3c..6109d5b6ac77 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Dec 16 15:26:37 GMT 2016
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 4453ccea33d9..cccdd3d517fc 100755
--- a/gradlew
+++ b/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java
index 327ab33bf38d..b4bfa297c0f8 100644
--- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java
+++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java
@@ -32,7 +32,7 @@ public class MavenEnhancePluginTest {
 
     @Test
     public void testEnhancePlugin() throws Exception {
-        File baseDir = new File("target/classes/test");
+        File baseDir = new File("target/classes/java/test");
         URL[] baseURLs = { baseDir.toURI().toURL() };
 
         MavenEnhancePlugin plugin = new MavenEnhancePlugin();
diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
index 531c072a9426..efecfc843bf9 100644
--- a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
+++ b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
@@ -6,9 +6,7 @@
  */
 apply plugin: 'java-gradle-plugin'
 
-apply plugin: 'groovy'
 apply plugin: 'maven'
-apply plugin: 'java'
 
 dependencies {
 	compile( project( ':hibernate-core' ) )