diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 9d08eb89f5fa..16de2c7f08ae 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -200,8 +200,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: "http://gant.codehaus.org/", licenseUrl: "http://gant.codehaus.org/Licence")
 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.5.jar", version: "2.5", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
-libraryLicense(name: "Gradle", version: "1.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "gradle-tooling-api-2.9.jar", version: "2.9", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "Gradle", version: "2.9", 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.3.9", license: "Apache 2.0", url: "http://groovy.codehaus.org/")
diff --git a/plugins/gradle/gradle.iml b/plugins/gradle/gradle.iml
index 765aeb7515a0..0322c3993670 100644
--- a/plugins/gradle/gradle.iml
+++ b/plugins/gradle/gradle.iml
@@ -31,31 +31,31 @@
     <orderEntry type="module-library" exported="">
       <library name="Gradle">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/gradle-tooling-api-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-core-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-messaging-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-model-core-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-model-groovy-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-wrapper-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-groovy-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-native-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-resources-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-cli-2.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-tooling-api-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-core-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-messaging-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-model-core-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-model-groovy-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-wrapper-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-groovy-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-native-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-resources-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-cli-2.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/model-core/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/model-groovy/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/native/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/resources/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/cli/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/core/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/model-core/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/model-groovy/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/messaging/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/wrapper/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services-groovy/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/native/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/resources/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/cli/src/main/java" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/gradle/lib/gradle-2.5-src.zip b/plugins/gradle/lib/gradle-2.9-src.zip
similarity index 79%
rename from plugins/gradle/lib/gradle-2.5-src.zip
rename to plugins/gradle/lib/gradle-2.9-src.zip
index d95151f8eacd..94a0a2d9c021 100644
Binary files a/plugins/gradle/lib/gradle-2.5-src.zip and b/plugins/gradle/lib/gradle-2.9-src.zip differ
diff --git a/plugins/gradle/lib/gradle-base-services-2.5.jar b/plugins/gradle/lib/gradle-base-services-2.9.jar
similarity index 66%
rename from plugins/gradle/lib/gradle-base-services-2.5.jar
rename to plugins/gradle/lib/gradle-base-services-2.9.jar
index 6f1449ff1d48..716feb2793e1 100644
Binary files a/plugins/gradle/lib/gradle-base-services-2.5.jar and b/plugins/gradle/lib/gradle-base-services-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-base-services-groovy-2.5.jar b/plugins/gradle/lib/gradle-base-services-groovy-2.5.jar
deleted file mode 100644
index 1286f8027ad4..000000000000
Binary files a/plugins/gradle/lib/gradle-base-services-groovy-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-base-services-groovy-2.9.jar b/plugins/gradle/lib/gradle-base-services-groovy-2.9.jar
new file mode 100644
index 000000000000..7aa1070e1873
Binary files /dev/null and b/plugins/gradle/lib/gradle-base-services-groovy-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-cli-2.5.jar b/plugins/gradle/lib/gradle-cli-2.9.jar
similarity index 86%
rename from plugins/gradle/lib/gradle-cli-2.5.jar
rename to plugins/gradle/lib/gradle-cli-2.9.jar
index 4bee0d1b8936..7441f20291a9 100644
Binary files a/plugins/gradle/lib/gradle-cli-2.5.jar and b/plugins/gradle/lib/gradle-cli-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-core-2.5.jar b/plugins/gradle/lib/gradle-core-2.9.jar
similarity index 63%
rename from plugins/gradle/lib/gradle-core-2.5.jar
rename to plugins/gradle/lib/gradle-core-2.9.jar
index d5aed5157db9..0f5c03e87aac 100644
Binary files a/plugins/gradle/lib/gradle-core-2.5.jar and b/plugins/gradle/lib/gradle-core-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-messaging-2.5.jar b/plugins/gradle/lib/gradle-messaging-2.9.jar
similarity index 67%
rename from plugins/gradle/lib/gradle-messaging-2.5.jar
rename to plugins/gradle/lib/gradle-messaging-2.9.jar
index 79a5a3c31368..51b114acdf19 100644
Binary files a/plugins/gradle/lib/gradle-messaging-2.5.jar and b/plugins/gradle/lib/gradle-messaging-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-model-core-2.5.jar b/plugins/gradle/lib/gradle-model-core-2.5.jar
deleted file mode 100644
index ce2a710a8ed5..000000000000
Binary files a/plugins/gradle/lib/gradle-model-core-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-model-core-2.9.jar b/plugins/gradle/lib/gradle-model-core-2.9.jar
new file mode 100644
index 000000000000..040a045ebec5
Binary files /dev/null and b/plugins/gradle/lib/gradle-model-core-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-model-groovy-2.5.jar b/plugins/gradle/lib/gradle-model-groovy-2.5.jar
deleted file mode 100644
index f1594e2b2a48..000000000000
Binary files a/plugins/gradle/lib/gradle-model-groovy-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-model-groovy-2.9.jar b/plugins/gradle/lib/gradle-model-groovy-2.9.jar
new file mode 100644
index 000000000000..3aef5d31058b
Binary files /dev/null and b/plugins/gradle/lib/gradle-model-groovy-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-native-2.5.jar b/plugins/gradle/lib/gradle-native-2.5.jar
deleted file mode 100644
index 1b464439b488..000000000000
Binary files a/plugins/gradle/lib/gradle-native-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-native-2.9.jar b/plugins/gradle/lib/gradle-native-2.9.jar
new file mode 100644
index 000000000000..3c55aa2a807a
Binary files /dev/null and b/plugins/gradle/lib/gradle-native-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-resources-2.5.jar b/plugins/gradle/lib/gradle-resources-2.5.jar
deleted file mode 100644
index 6e2d9248598a..000000000000
Binary files a/plugins/gradle/lib/gradle-resources-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-resources-2.9.jar b/plugins/gradle/lib/gradle-resources-2.9.jar
new file mode 100644
index 000000000000..2765bd57e82c
Binary files /dev/null and b/plugins/gradle/lib/gradle-resources-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-tooling-api-2.5.jar b/plugins/gradle/lib/gradle-tooling-api-2.9.jar
similarity index 53%
rename from plugins/gradle/lib/gradle-tooling-api-2.5.jar
rename to plugins/gradle/lib/gradle-tooling-api-2.9.jar
index aaf18ca2b257..e7437491e0f5 100644
Binary files a/plugins/gradle/lib/gradle-tooling-api-2.5.jar and b/plugins/gradle/lib/gradle-tooling-api-2.9.jar differ
diff --git a/plugins/gradle/lib/gradle-wrapper-2.5.jar b/plugins/gradle/lib/gradle-wrapper-2.9.jar
similarity index 51%
rename from plugins/gradle/lib/gradle-wrapper-2.5.jar
rename to plugins/gradle/lib/gradle-wrapper-2.9.jar
index e81cde86ad77..a71848286023 100644
Binary files a/plugins/gradle/lib/gradle-wrapper-2.5.jar and b/plugins/gradle/lib/gradle-wrapper-2.9.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 b2556aa72023..d895123cae94 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 @@
     <orderEntry type="module-library" exported="">
       <library name="Gradle">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/native/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/core/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/messaging/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/wrapper/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services-groovy/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/native/src/main/java" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.5.jar
deleted file mode 100644
index 47404df51de3..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.9.jar
new file mode 100644
index 000000000000..b440e4fd857a
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.5.jar
deleted file mode 100644
index 2de927ca624d..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.9.jar
new file mode 100644
index 000000000000..49c8071ff1a8
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.9.jar
similarity index 66%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.5.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.9.jar
index 6b04c75033bf..1754cca8dd99 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.5.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.9.jar
similarity index 59%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.5.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.9.jar
index 20adfb2832f9..ed797201ca8c 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.5.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.9.jar
similarity index 50%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.5.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.9.jar
index f3a042918ac6..a4207e10d70a 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.5.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.5.jar
deleted file mode 100644
index 547fbaa34be3..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.9.jar
new file mode 100644
index 000000000000..7a9dbbdaf4c7
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.5.jar
deleted file mode 100644
index ceec62584ac0..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.9.jar
new file mode 100644
index 000000000000..9d8acf7c4812
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.5.jar
deleted file mode 100644
index cbdf1b237259..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.9.jar
new file mode 100644
index 000000000000..e9b4de2f403d
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.5.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.5.jar
deleted file mode 100644
index 98c007f80ddd..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.9.jar
new file mode 100644
index 000000000000..38c6d6e377b2
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.9.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 10d19638bf77..48ad9ab658b3 100644
--- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
+++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
@@ -18,29 +18,29 @@
     <orderEntry type="module-library">
       <library name="Gradle">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-core-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-groovy-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-model-core-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-model-groovy-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/build-init/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/plugins/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/ide/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/ide/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/scala/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/reporting/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/core/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/messaging/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/wrapper/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services-groovy/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/build-init/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/plugins/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/ide/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/ide/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/scala/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/reporting/src/main/groovy" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -58,22 +58,22 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="GradleToolingExtension">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-reporting-2.5.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-ear-2.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-reporting-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-ear-2.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.5-src.zip!/gradle-2.5/subprojects/ear/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/ear/src/main/groovy" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.5.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.5.jar
deleted file mode 100644
index dcab048bb8a5..000000000000
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.5.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.9.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.9.jar
new file mode 100644
index 000000000000..a156d1b40a66
Binary files /dev/null and b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.9.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.5.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.9.jar
similarity index 90%
rename from plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.5.jar
rename to plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.9.jar
index ee71fec9211a..697043caffd4 100644
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.5.jar and b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.9.jar differ