From edc2d5c86cada5af64de8485fb1786c23c60fc81 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 2 Oct 2017 17:31:44 +0300
Subject: [PATCH 12/17] Disable patching of external modules

---
 build.gradle | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 71946257775..6fcefe67b8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -248,18 +248,11 @@ configurations {
     }
 }
 
-def patchedExternalModulesDir = new File(buildDir, "external/files")
-def patchedExternalModules = files({ -> fileTree(patchedExternalModulesDir).files.sort() })
-patchedExternalModules.builtBy 'patchExternalModules'
-
 dependencies {
-    externalModules "org.gradle:gradle-kotlin-dsl:${versions.gradle_kotlin_dsl}"
-    externalModules "org.gradle:gradle-kotlin-dsl-tooling-builders:${versions.gradle_kotlin_dsl}"
     coreRuntime project(':launcher')
     coreRuntime project(':runtimeApiInfo')
     runtime project(':wrapper')
     runtime project(":installationBeacon")
-    runtime patchedExternalModules
     gradlePlugins pluginProjects
     gradlePlugins implementationPluginProjects
     gradlePlugins project(':workers')
@@ -269,18 +262,10 @@ dependencies {
     coreRuntimeExtensions project(':dependencyManagement') //See: DynamicModulesClassPathProvider.GRADLE_EXTENSION_MODULES
     coreRuntimeExtensions project(':pluginUse')
     coreRuntimeExtensions project(':workers')
-    coreRuntimeExtensions patchedExternalModules
 }
 
 import org.gradle.modules.PatchExternalModules
 
-task patchExternalModules(type: PatchExternalModules) {
-    allModules = configurations.externalModulesRuntime
-    coreModules = configurations.coreRuntime
-    modulesToPatch = configurations.externalModules
-    destination = patchedExternalModulesDir
-}
-
 task verifyIsProductionBuildEnvironment {
     doLast {
         assert javaVersion.java7: "Must use a Java 7 compatible JVM to perform this build. Current JVM is ${jvm}"
-- 
2.14.3