diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index e31fa37fd63a..e37ccfb6446c 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -199,8 +199,8 @@ libraryLicense(name: "fxg-utils", libraryName: "fxg-utils", version: "4.9.1", li
libraryLicense(name: "Gant", version: "1.9.8", libraryName: "gant-1.9.11_groovy-2.3.0.jar", license: "Apache 2.0", url: "https://github.com/codehaus/gant", licenseUrl: "https://github.com/codehaus/gant/blob/master/LICENCE.txt")
libraryLicense(name: "Gherkin", libraryName: "Gherkin", version: "2.12.2", license: "MIT", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/cucumber/gherkin")
libraryLicense(name: "Google Feedback", libraryName: "GoogleFeedback.jar", version: "", license: "TBD")
-libraryLicense(name: "gradle-tooling-api-2.12.jar", version: "2.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
-libraryLicense(name: "Gradle", version: "2.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "gradle-tooling-api-2.13.jar", version: "2.13", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "Gradle", version: "2.13", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
libraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
libraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/", licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt")
libraryLicense(name: "Groovy", version: "2.4.6", license: "Apache 2.0", url: "http://groovy-lang.org/")
diff --git a/plugins/gradle/gradle.iml b/plugins/gradle/gradle.iml
index 766dcf76987b..befdf8f0e913 100644
--- a/plugins/gradle/gradle.iml
+++ b/plugins/gradle/gradle.iml
@@ -29,31 +29,31 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/gradle/jps-plugin/gradle-jps-plugin.iml b/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
index c78060418b3e..cc1ceddb77d4 100644
--- a/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
+++ b/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
@@ -15,29 +15,29 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/gradle/lib/gradle-2.12-src.zip b/plugins/gradle/lib/gradle-2.13-src.zip
similarity index 84%
rename from plugins/gradle/lib/gradle-2.12-src.zip
rename to plugins/gradle/lib/gradle-2.13-src.zip
index 4a846ab3a537..f80d84301b02 100644
Binary files a/plugins/gradle/lib/gradle-2.12-src.zip and b/plugins/gradle/lib/gradle-2.13-src.zip differ
diff --git a/plugins/gradle/lib/gradle-base-services-2.12.jar b/plugins/gradle/lib/gradle-base-services-2.13.jar
similarity index 71%
rename from plugins/gradle/lib/gradle-base-services-2.12.jar
rename to plugins/gradle/lib/gradle-base-services-2.13.jar
index 5f69bb361795..4630ecae9962 100644
Binary files a/plugins/gradle/lib/gradle-base-services-2.12.jar and b/plugins/gradle/lib/gradle-base-services-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-base-services-groovy-2.12.jar b/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar
similarity index 85%
rename from plugins/gradle/lib/gradle-base-services-groovy-2.12.jar
rename to plugins/gradle/lib/gradle-base-services-groovy-2.13.jar
index 3847d2c2adb3..6309eb3c6238 100644
Binary files a/plugins/gradle/lib/gradle-base-services-groovy-2.12.jar and b/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-cli-2.12.jar b/plugins/gradle/lib/gradle-cli-2.13.jar
similarity index 86%
rename from plugins/gradle/lib/gradle-cli-2.12.jar
rename to plugins/gradle/lib/gradle-cli-2.13.jar
index 064c2741d42e..792270433a99 100644
Binary files a/plugins/gradle/lib/gradle-cli-2.12.jar and b/plugins/gradle/lib/gradle-cli-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-core-2.12.jar b/plugins/gradle/lib/gradle-core-2.13.jar
similarity index 70%
rename from plugins/gradle/lib/gradle-core-2.12.jar
rename to plugins/gradle/lib/gradle-core-2.13.jar
index 2290def13780..757a6ffa9fba 100644
Binary files a/plugins/gradle/lib/gradle-core-2.12.jar and b/plugins/gradle/lib/gradle-core-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-messaging-2.12.jar b/plugins/gradle/lib/gradle-messaging-2.12.jar
deleted file mode 100644
index 448171e9ab2f..000000000000
Binary files a/plugins/gradle/lib/gradle-messaging-2.12.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-messaging-2.13.jar b/plugins/gradle/lib/gradle-messaging-2.13.jar
new file mode 100644
index 000000000000..cd06de63d49b
Binary files /dev/null and b/plugins/gradle/lib/gradle-messaging-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-model-core-2.12.jar b/plugins/gradle/lib/gradle-model-core-2.13.jar
similarity index 86%
rename from plugins/gradle/lib/gradle-model-core-2.12.jar
rename to plugins/gradle/lib/gradle-model-core-2.13.jar
index 14bbf1c2415b..d9c21f9cada8 100644
Binary files a/plugins/gradle/lib/gradle-model-core-2.12.jar and b/plugins/gradle/lib/gradle-model-core-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-model-groovy-2.12.jar b/plugins/gradle/lib/gradle-model-groovy-2.13.jar
similarity index 66%
rename from plugins/gradle/lib/gradle-model-groovy-2.12.jar
rename to plugins/gradle/lib/gradle-model-groovy-2.13.jar
index 4be7219dc216..e07927857087 100644
Binary files a/plugins/gradle/lib/gradle-model-groovy-2.12.jar and b/plugins/gradle/lib/gradle-model-groovy-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-native-2.12.jar b/plugins/gradle/lib/gradle-native-2.13.jar
similarity index 60%
rename from plugins/gradle/lib/gradle-native-2.12.jar
rename to plugins/gradle/lib/gradle-native-2.13.jar
index 80a1fa97e12f..b13f5c5e9427 100644
Binary files a/plugins/gradle/lib/gradle-native-2.12.jar and b/plugins/gradle/lib/gradle-native-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-resources-2.12.jar b/plugins/gradle/lib/gradle-resources-2.12.jar
deleted file mode 100644
index 10886bd10578..000000000000
Binary files a/plugins/gradle/lib/gradle-resources-2.12.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-resources-2.13.jar b/plugins/gradle/lib/gradle-resources-2.13.jar
new file mode 100644
index 000000000000..e79f69c23936
Binary files /dev/null and b/plugins/gradle/lib/gradle-resources-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-tooling-api-2.12.jar b/plugins/gradle/lib/gradle-tooling-api-2.12.jar
deleted file mode 100644
index a25735987be7..000000000000
Binary files a/plugins/gradle/lib/gradle-tooling-api-2.12.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-tooling-api-2.13.jar b/plugins/gradle/lib/gradle-tooling-api-2.13.jar
new file mode 100644
index 000000000000..47ae9aa4e17d
Binary files /dev/null and b/plugins/gradle/lib/gradle-tooling-api-2.13.jar differ
diff --git a/plugins/gradle/lib/gradle-wrapper-2.12.jar b/plugins/gradle/lib/gradle-wrapper-2.13.jar
similarity index 84%
rename from plugins/gradle/lib/gradle-wrapper-2.12.jar
rename to plugins/gradle/lib/gradle-wrapper-2.13.jar
index dc8960e1f475..fdae99e29c0a 100644
Binary files a/plugins/gradle/lib/gradle-wrapper-2.12.jar and b/plugins/gradle/lib/gradle-wrapper-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
index c0ec80df4bc8..97feb592226d 100644
--- a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
+++ b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
@@ -15,23 +15,23 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.13.jar
similarity index 89%
rename from plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.13.jar
index 3ad6db1b0b5e..4f8838624a95 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.13.jar
similarity index 75%
rename from plugins/gradle/tooling-extension-api/lib/gradle-ide-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-ide-2.13.jar
index 3fc917cf9227..2ff995048984 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.13.jar
similarity index 77%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.13.jar
index 952ba92eeeab..55cd5f0d1f17 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.13.jar
similarity index 76%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.13.jar
index fe1e292563a7..8abe3499486c 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.13.jar
similarity index 69%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.13.jar
index 4a12dffa8098..529c56b15a8b 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.13.jar
similarity index 82%
rename from plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.13.jar
index b42768fe3f6d..36a6ee681885 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.13.jar
similarity index 85%
rename from plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.13.jar
index 9ab119a9a568..b775514c7529 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.13.jar
similarity index 69%
rename from plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.13.jar
index 9ea5a7c1741f..80048c52f84d 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.13.jar
similarity index 64%
rename from plugins/gradle/tooling-extension-api/lib/gradle-scala-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-scala-2.13.jar
index 211748d73cb4..2d6c6b212abf 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.13.jar
similarity index 77%
rename from plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.13.jar
index 3ac4eb178e74..263446382894 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.13.jar
similarity index 67%
rename from plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.12.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.13.jar
index a49e401c3e50..98f0c5985e34 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.12.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
index 232a3ce5d488..6746f99fa425 100644
--- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
+++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
@@ -13,29 +13,29 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -53,24 +53,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.12.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.13.jar
similarity index 90%
rename from plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.12.jar
rename to plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.13.jar
index c94e44ba4c62..8b329f88fa18 100644
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.12.jar and b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.13.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.12.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.13.jar
similarity index 84%
rename from plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.12.jar
rename to plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.13.jar
index a36b34cb2599..21ede409d436 100644
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.12.jar and b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.13.jar differ