diff --git a/.idea/libraries/Gradle.xml b/.idea/libraries/Gradle.xml
index 21afe73cffe2..dddd73fab4d9 100644
--- a/.idea/libraries/Gradle.xml
+++ b/.idea/libraries/Gradle.xml
@@ -1,35 +1,34 @@
 <component name="libraryTable">
   <library name="Gradle">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-process-services-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-native-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-logging-3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-process-services-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-logging-3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-version-info-3.3.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/tooling-api/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/core/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/model-core/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/model-groovy/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/messaging/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/wrapper/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/base-services/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/base-services-groovy/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/process-services/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/native/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/resources/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/cli/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/logging/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/tooling-api/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/core/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/model-core/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/model-groovy/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/messaging/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/wrapper/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/base-services/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/base-services-groovy/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/process-services/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/resources/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/cli/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/logging/src/main/java" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index b14259f63b99..670aa94db8e2 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -136,14 +136,13 @@ class CommunityLibraryLicenses {
     new LibraryLicense(name: "Gluegen", libraryName: "gluegen-rt", license: "Creative Commons Attribution License",
                        url: "https://jogamp.org/gluegen/www/", licenseUrl: "http://creativecommons.org/licenses/by/3.0"),
     new LibraryLicense(name: "Google Feedback", libraryName: "GoogleFeedback.jar", version: "", license: "TBD"),
-    new LibraryLicense(name: "gradle-tooling-api-3.1.jar", version: "3.1", license: "Apache 2.0", url: "http://gradle.org/",
+    new LibraryLicense(name: "gradle-tooling-api-3.3.jar", version: "3.3", license: "Apache 2.0", url: "http://gradle.org/",
                        licenseUrl: "http://gradle.org/license"),
-    new LibraryLicense(name: "Gradle", version: "3.1", license: "Apache 2.0", url: "http://gradle.org/",
+    new LibraryLicense(name: "Gradle", version: "3.3", license: "Apache 2.0", url: "http://gradle.org/",
                        licenseUrl: "http://gradle.org/license"),
-    new LibraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
+    new LibraryLicense(name: "GradleGuava", version: "17.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
                        licenseUrl: "http://apache.org/licenses/LICENSE-2.0"),
-    new 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"),
+    new LibraryLicense(name: "GradleNative", version: "3.3", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license"),
     new LibraryLicense(name: "Groovy", version: "2.4.6", license: "Apache 2.0", url: "http://groovy-lang.org/"),
     new LibraryLicense(name: "Gson", version: "2.2.4", libraryName: "gson", license: "Apache 2.0", url: "http://code.google.com/p/google-gson/"),
     new LibraryLicense(name: "Guava", version: "19.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index 8d8ca3ad18af..48504f69241b 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -194,15 +194,6 @@ class CommunityRepositoryModules {
       withModule("gradle-tooling-extension-impl")
       withProjectLibrary("Kryo")
       withProjectLibrary("Gradle")
-      //todo[nik] add these jars to some library instead?
-      withResource("lib/native-platform-freebsd-amd64-0.11.jar", "lib")
-      withResource("lib/native-platform-freebsd-i386-0.11.jar", "lib")
-      withResource("lib/native-platform-linux-amd64-0.11.jar", "lib")
-      withResource("lib/native-platform-linux-i386-0.11.jar", "lib")
-      withResource("lib/native-platform-osx-amd64-0.11.jar", "lib")
-      withResource("lib/native-platform-osx-i386-0.11.jar", "lib")
-      withResource("lib/native-platform-windows-amd64-0.11.jar", "lib")
-      withResource("lib/native-platform-windows-i386-0.11.jar", "lib")
     },
     plugin("junit") {
       mainJarName = "idea-junit.jar"
diff --git a/plugins/gradle/gradle.iml b/plugins/gradle/gradle.iml
index 4f542073c64c..b729553e134f 100644
--- a/plugins/gradle/gradle.iml
+++ b/plugins/gradle/gradle.iml
@@ -56,9 +56,25 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="GradleJnaPosix">
+      <library name="GradleNative">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/native-platform-0.11.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-native-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-freebsd-amd64-libcpp-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-freebsd-amd64-libstdcpp-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-freebsd-i386-libcpp-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-freebsd-i386-libstdcpp-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-linux-amd64-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-linux-amd64-ncurses5-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-linux-amd64-ncurses6-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-linux-i386-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-linux-i386-ncurses5-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-linux-i386-ncurses6-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-osx-amd64-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-osx-i386-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-windows-amd64-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/native-platform-windows-i386-0.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jansi-1.14.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/plugins/gradle/lib/gradle-3.1-src.zip b/plugins/gradle/lib/gradle-3.3-src.zip
similarity index 75%
rename from plugins/gradle/lib/gradle-3.1-src.zip
rename to plugins/gradle/lib/gradle-3.3-src.zip
index fa7f902f6df3..edef13a1c314 100644
Binary files a/plugins/gradle/lib/gradle-3.1-src.zip and b/plugins/gradle/lib/gradle-3.3-src.zip differ
diff --git a/plugins/gradle/lib/gradle-base-services-3.1.jar b/plugins/gradle/lib/gradle-base-services-3.1.jar
deleted file mode 100644
index b5a6df65222f..000000000000
Binary files a/plugins/gradle/lib/gradle-base-services-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-base-services-3.3.jar b/plugins/gradle/lib/gradle-base-services-3.3.jar
new file mode 100644
index 000000000000..db3ba185e33f
Binary files /dev/null and b/plugins/gradle/lib/gradle-base-services-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-base-services-groovy-3.1.jar b/plugins/gradle/lib/gradle-base-services-groovy-3.3.jar
similarity index 56%
rename from plugins/gradle/lib/gradle-base-services-groovy-3.1.jar
rename to plugins/gradle/lib/gradle-base-services-groovy-3.3.jar
index 5066382bd96b..9793754f1582 100644
Binary files a/plugins/gradle/lib/gradle-base-services-groovy-3.1.jar and b/plugins/gradle/lib/gradle-base-services-groovy-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-cli-3.1.jar b/plugins/gradle/lib/gradle-cli-3.3.jar
similarity index 86%
rename from plugins/gradle/lib/gradle-cli-3.1.jar
rename to plugins/gradle/lib/gradle-cli-3.3.jar
index 6960fd1e62c3..8f66a9e52aac 100644
Binary files a/plugins/gradle/lib/gradle-cli-3.1.jar and b/plugins/gradle/lib/gradle-cli-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-core-3.1.jar b/plugins/gradle/lib/gradle-core-3.1.jar
deleted file mode 100644
index 5b2a76043db3..000000000000
Binary files a/plugins/gradle/lib/gradle-core-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-core-3.3.jar b/plugins/gradle/lib/gradle-core-3.3.jar
new file mode 100644
index 000000000000..e415e2e3f961
Binary files /dev/null and b/plugins/gradle/lib/gradle-core-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-logging-3.1.jar b/plugins/gradle/lib/gradle-logging-3.1.jar
deleted file mode 100644
index 981c0e622864..000000000000
Binary files a/plugins/gradle/lib/gradle-logging-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-logging-3.3.jar b/plugins/gradle/lib/gradle-logging-3.3.jar
new file mode 100644
index 000000000000..56d26dd0d565
Binary files /dev/null and b/plugins/gradle/lib/gradle-logging-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-messaging-3.1.jar b/plugins/gradle/lib/gradle-messaging-3.3.jar
similarity index 64%
rename from plugins/gradle/lib/gradle-messaging-3.1.jar
rename to plugins/gradle/lib/gradle-messaging-3.3.jar
index 2dd5d7725095..16c381553d41 100644
Binary files a/plugins/gradle/lib/gradle-messaging-3.1.jar and b/plugins/gradle/lib/gradle-messaging-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-model-core-3.1.jar b/plugins/gradle/lib/gradle-model-core-3.3.jar
similarity index 60%
rename from plugins/gradle/lib/gradle-model-core-3.1.jar
rename to plugins/gradle/lib/gradle-model-core-3.3.jar
index 86db02e43eaa..745019c21efe 100644
Binary files a/plugins/gradle/lib/gradle-model-core-3.1.jar and b/plugins/gradle/lib/gradle-model-core-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-model-groovy-3.1.jar b/plugins/gradle/lib/gradle-model-groovy-3.1.jar
deleted file mode 100644
index 86ffe46a4fe7..000000000000
Binary files a/plugins/gradle/lib/gradle-model-groovy-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-model-groovy-3.3.jar b/plugins/gradle/lib/gradle-model-groovy-3.3.jar
new file mode 100644
index 000000000000..a0adf3ea79d4
Binary files /dev/null and b/plugins/gradle/lib/gradle-model-groovy-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-native-3.1.jar b/plugins/gradle/lib/gradle-native-3.3.jar
similarity index 51%
rename from plugins/gradle/lib/gradle-native-3.1.jar
rename to plugins/gradle/lib/gradle-native-3.3.jar
index ff3f2e34aa86..f403a3d1541a 100644
Binary files a/plugins/gradle/lib/gradle-native-3.1.jar and b/plugins/gradle/lib/gradle-native-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-process-services-3.1.jar b/plugins/gradle/lib/gradle-process-services-3.3.jar
similarity index 63%
rename from plugins/gradle/lib/gradle-process-services-3.1.jar
rename to plugins/gradle/lib/gradle-process-services-3.3.jar
index 86a1f77adedb..b988f6b00d91 100644
Binary files a/plugins/gradle/lib/gradle-process-services-3.1.jar and b/plugins/gradle/lib/gradle-process-services-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-resources-3.1.jar b/plugins/gradle/lib/gradle-resources-3.3.jar
similarity index 69%
rename from plugins/gradle/lib/gradle-resources-3.1.jar
rename to plugins/gradle/lib/gradle-resources-3.3.jar
index 719e93e6fd20..1faa8b95c836 100644
Binary files a/plugins/gradle/lib/gradle-resources-3.1.jar and b/plugins/gradle/lib/gradle-resources-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-tooling-api-3.1.jar b/plugins/gradle/lib/gradle-tooling-api-3.1.jar
deleted file mode 100644
index fb3104237320..000000000000
Binary files a/plugins/gradle/lib/gradle-tooling-api-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-tooling-api-3.3.jar b/plugins/gradle/lib/gradle-tooling-api-3.3.jar
new file mode 100644
index 000000000000..fd2c86d84879
Binary files /dev/null and b/plugins/gradle/lib/gradle-tooling-api-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-version-info-3.3.jar b/plugins/gradle/lib/gradle-version-info-3.3.jar
new file mode 100644
index 000000000000..522967f9e309
Binary files /dev/null and b/plugins/gradle/lib/gradle-version-info-3.3.jar differ
diff --git a/plugins/gradle/lib/gradle-wrapper-3.1.jar b/plugins/gradle/lib/gradle-wrapper-3.1.jar
deleted file mode 100644
index 242d69244397..000000000000
Binary files a/plugins/gradle/lib/gradle-wrapper-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-wrapper-3.3.jar b/plugins/gradle/lib/gradle-wrapper-3.3.jar
new file mode 100644
index 000000000000..dde14e114e4d
Binary files /dev/null and b/plugins/gradle/lib/gradle-wrapper-3.3.jar differ
diff --git a/plugins/gradle/lib/jansi-1.14.jar b/plugins/gradle/lib/jansi-1.14.jar
new file mode 100644
index 000000000000..7447dfd4116d
Binary files /dev/null and b/plugins/gradle/lib/jansi-1.14.jar differ
diff --git a/plugins/gradle/lib/jna-3.2.7.jar b/plugins/gradle/lib/jna-3.2.7.jar
deleted file mode 100644
index 55ca1eb4e308..000000000000
Binary files a/plugins/gradle/lib/jna-3.2.7.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-0.11.jar b/plugins/gradle/lib/native-platform-0.11.jar
deleted file mode 100644
index d015d1e45294..000000000000
Binary files a/plugins/gradle/lib/native-platform-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-0.12.jar b/plugins/gradle/lib/native-platform-0.12.jar
new file mode 100644
index 000000000000..53f7a52d4e03
Binary files /dev/null and b/plugins/gradle/lib/native-platform-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-freebsd-amd64-0.11.jar b/plugins/gradle/lib/native-platform-freebsd-amd64-0.11.jar
deleted file mode 100644
index a41b8ef48ada..000000000000
Binary files a/plugins/gradle/lib/native-platform-freebsd-amd64-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-freebsd-amd64-libcpp-0.12.jar b/plugins/gradle/lib/native-platform-freebsd-amd64-libcpp-0.12.jar
new file mode 100644
index 000000000000..82636c172cb8
Binary files /dev/null and b/plugins/gradle/lib/native-platform-freebsd-amd64-libcpp-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-freebsd-amd64-libstdcpp-0.12.jar b/plugins/gradle/lib/native-platform-freebsd-amd64-libstdcpp-0.12.jar
new file mode 100644
index 000000000000..d81481df00ef
Binary files /dev/null and b/plugins/gradle/lib/native-platform-freebsd-amd64-libstdcpp-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-freebsd-i386-0.11.jar b/plugins/gradle/lib/native-platform-freebsd-i386-0.11.jar
deleted file mode 100644
index de8ff6f67da3..000000000000
Binary files a/plugins/gradle/lib/native-platform-freebsd-i386-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-freebsd-i386-libcpp-0.12.jar b/plugins/gradle/lib/native-platform-freebsd-i386-libcpp-0.12.jar
new file mode 100644
index 000000000000..6745f9ff15d9
Binary files /dev/null and b/plugins/gradle/lib/native-platform-freebsd-i386-libcpp-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-freebsd-i386-libstdcpp-0.12.jar b/plugins/gradle/lib/native-platform-freebsd-i386-libstdcpp-0.12.jar
new file mode 100644
index 000000000000..034672a5a21a
Binary files /dev/null and b/plugins/gradle/lib/native-platform-freebsd-i386-libstdcpp-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-linux-amd64-0.11.jar b/plugins/gradle/lib/native-platform-linux-amd64-0.11.jar
deleted file mode 100644
index 6d46001903a2..000000000000
Binary files a/plugins/gradle/lib/native-platform-linux-amd64-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-linux-amd64-0.12.jar b/plugins/gradle/lib/native-platform-linux-amd64-0.12.jar
new file mode 100644
index 000000000000..b95745c4f711
Binary files /dev/null and b/plugins/gradle/lib/native-platform-linux-amd64-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-linux-amd64-ncurses5-0.12.jar b/plugins/gradle/lib/native-platform-linux-amd64-ncurses5-0.12.jar
new file mode 100644
index 000000000000..4f39d5a6c3bb
Binary files /dev/null and b/plugins/gradle/lib/native-platform-linux-amd64-ncurses5-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-linux-amd64-ncurses6-0.12.jar b/plugins/gradle/lib/native-platform-linux-amd64-ncurses6-0.12.jar
new file mode 100644
index 000000000000..d0ed58a67588
Binary files /dev/null and b/plugins/gradle/lib/native-platform-linux-amd64-ncurses6-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-linux-i386-0.11.jar b/plugins/gradle/lib/native-platform-linux-i386-0.11.jar
deleted file mode 100644
index c812cfdf7d1b..000000000000
Binary files a/plugins/gradle/lib/native-platform-linux-i386-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-linux-i386-0.12.jar b/plugins/gradle/lib/native-platform-linux-i386-0.12.jar
new file mode 100644
index 000000000000..e7d7df162331
Binary files /dev/null and b/plugins/gradle/lib/native-platform-linux-i386-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-linux-i386-ncurses5-0.12.jar b/plugins/gradle/lib/native-platform-linux-i386-ncurses5-0.12.jar
new file mode 100644
index 000000000000..970b14a79a14
Binary files /dev/null and b/plugins/gradle/lib/native-platform-linux-i386-ncurses5-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-linux-i386-ncurses6-0.12.jar b/plugins/gradle/lib/native-platform-linux-i386-ncurses6-0.12.jar
new file mode 100644
index 000000000000..c1f32f66b424
Binary files /dev/null and b/plugins/gradle/lib/native-platform-linux-i386-ncurses6-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-osx-amd64-0.11.jar b/plugins/gradle/lib/native-platform-osx-amd64-0.11.jar
deleted file mode 100644
index 9ce96c7b54a3..000000000000
Binary files a/plugins/gradle/lib/native-platform-osx-amd64-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-osx-amd64-0.12.jar b/plugins/gradle/lib/native-platform-osx-amd64-0.12.jar
new file mode 100644
index 000000000000..f175277ded6f
Binary files /dev/null and b/plugins/gradle/lib/native-platform-osx-amd64-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-osx-i386-0.11.jar b/plugins/gradle/lib/native-platform-osx-i386-0.11.jar
deleted file mode 100644
index 34619ab8820f..000000000000
Binary files a/plugins/gradle/lib/native-platform-osx-i386-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-osx-i386-0.12.jar b/plugins/gradle/lib/native-platform-osx-i386-0.12.jar
new file mode 100644
index 000000000000..c8c08499efd4
Binary files /dev/null and b/plugins/gradle/lib/native-platform-osx-i386-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-windows-amd64-0.11.jar b/plugins/gradle/lib/native-platform-windows-amd64-0.11.jar
deleted file mode 100644
index b338d8c3385e..000000000000
Binary files a/plugins/gradle/lib/native-platform-windows-amd64-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-windows-amd64-0.12.jar b/plugins/gradle/lib/native-platform-windows-amd64-0.12.jar
new file mode 100644
index 000000000000..3488f9e4bb17
Binary files /dev/null and b/plugins/gradle/lib/native-platform-windows-amd64-0.12.jar differ
diff --git a/plugins/gradle/lib/native-platform-windows-i386-0.11.jar b/plugins/gradle/lib/native-platform-windows-i386-0.11.jar
deleted file mode 100644
index d014cb5e19e7..000000000000
Binary files a/plugins/gradle/lib/native-platform-windows-i386-0.11.jar and /dev/null differ
diff --git a/plugins/gradle/lib/native-platform-windows-i386-0.12.jar b/plugins/gradle/lib/native-platform-windows-i386-0.12.jar
new file mode 100644
index 000000000000..bafd53688570
Binary files /dev/null and b/plugins/gradle/lib/native-platform-windows-i386-0.12.jar differ
diff --git a/plugins/gradle/resources/fileTemplates/internal/Gradle Build Script with wrapper.gradle.ft b/plugins/gradle/resources/fileTemplates/internal/Gradle Build Script with wrapper.gradle.ft
index a3f5075c0a4a..4955f72935e6 100644
--- a/plugins/gradle/resources/fileTemplates/internal/Gradle Build Script with wrapper.gradle.ft	
+++ b/plugins/gradle/resources/fileTemplates/internal/Gradle Build Script with wrapper.gradle.ft	
@@ -9,7 +9,7 @@ task wrapper(type: Wrapper) {
 #if (${GRADLE_VERSION} && ${GRADLE_VERSION} != "")
   gradleVersion = '${GRADLE_VERSION}'
 #else
-  gradleVersion = '2.14.1'
+  gradleVersion = '3.3'
 #end
   distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-3.1.jar
deleted file mode 100644
index 653e91721bc0..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-3.3.jar
new file mode 100644
index 000000000000..2092fe4ec0bc
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-dependency-management-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-dependency-management-3.1.jar
deleted file mode 100644
index a5ef12e98443..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-dependency-management-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-dependency-management-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-dependency-management-3.3.jar
new file mode 100644
index 000000000000..a3b2f545710d
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-dependency-management-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-ide-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-ide-3.1.jar
deleted file mode 100644
index 73a24103578c..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-ide-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-ide-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-ide-3.3.jar
new file mode 100644
index 000000000000..74ecd5a27064
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-ide-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-3.1.jar
deleted file mode 100644
index eabe47f75b3f..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-3.3.jar
new file mode 100644
index 000000000000..552ad13777cf
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-3.1.jar
deleted file mode 100644
index 856cb4d56fc8..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-3.3.jar
new file mode 100644
index 000000000000..0ec1d19cb716
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-3.1.jar
deleted file mode 100644
index 650fe3b39962..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-3.3.jar
new file mode 100644
index 000000000000..adafc68ae5b6
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-3.3.jar
similarity index 54%
rename from plugins/gradle/tooling-extension-api/lib/gradle-platform-base-3.1.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-platform-base-3.3.jar
index 0f7517168477..322444ac4a74 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-3.1.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-3.1.jar
deleted file mode 100644
index 17bed7d39c9f..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-3.3.jar
new file mode 100644
index 000000000000..ff1512e397c1
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-3.1.jar
deleted file mode 100644
index 99cc2f508cbc..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-3.3.jar
new file mode 100644
index 000000000000..8bd659a96522
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-3.1.jar
deleted file mode 100644
index 31dd74bb73e7..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-scala-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-3.3.jar
new file mode 100644
index 000000000000..14fe651bcefa
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-scala-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-3.1.jar
deleted file mode 100644
index 33488a636c9d..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-3.3.jar
new file mode 100644
index 000000000000..d00e1138c80f
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-3.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-3.1.jar
deleted file mode 100644
index 1bec6aa01215..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-3.3.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-3.3.jar
new file mode 100644
index 000000000000..66dbf9837916
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-3.3.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 a65065046599..61bbb1abf527 100644
--- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
+++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
@@ -25,25 +25,28 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="GradleToolingExtension">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-3.1.jar!/" />
-		  <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-dependency-management-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-reporting-3.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-ear-3.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-native-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-3.3.jar!/" />
+	  <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-dependency-management-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-workers-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-reporting-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-ear-3.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/ear/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/ear/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/workers/src/main/java" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-3.1.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-3.1.jar
deleted file mode 100644
index ce92a17cb9c3..000000000000
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-3.1.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-3.3.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-3.3.jar
new file mode 100644
index 000000000000..eb36b0107266
Binary files /dev/null and b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-3.1.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-3.3.jar
similarity index 66%
rename from plugins/gradle/tooling-extension-impl/lib/gradle-reporting-3.1.jar
rename to plugins/gradle/tooling-extension-impl/lib/gradle-reporting-3.3.jar
index 54417ebd625e..cb5fdde01c04 100644
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-3.1.jar and b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-3.3.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-workers-3.3.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-workers-3.3.jar
new file mode 100644
index 000000000000..02e85e7f9d73
Binary files /dev/null and b/plugins/gradle/tooling-extension-impl/lib/gradle-workers-3.3.jar differ