diff --git a/.idea/artifacts/standalone_jps.xml b/.idea/artifacts/standalone_jps.xml
deleted file mode 100644
index 94d485a22695..000000000000
--- a/.idea/artifacts/standalone_jps.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="standalone-jps">
-    <output-path>$PROJECT_DIR$/build/lib/jps</output-path>
-    <root id="root">
-      <element id="archive" name="util.jar">
-        <element id="module-output" name="intellij.platform.util" />
-        <element id="module-output" name="intellij.platform.util.rt" />
-        <element id="module-output" name="intellij.platform.util.classLoader" />
-      </element>
-      <element id="archive" name="jps-model.jar">
-        <element id="module-output" name="intellij.platform.jps.model" />
-        <element id="module-output" name="intellij.platform.jps.model.impl" />
-        <element id="module-output" name="intellij.platform.jps.model.serialization" />
-      </element>
-      <element id="archive" name="jps-builders.jar">
-        <element id="module-output" name="intellij.java.guiForms.compiler" />
-        <element id="module-output" name="intellij.java.guiForms.rt" />
-        <element id="module-output" name="intellij.java.compiler.instrumentationUtil" />
-        <element id="module-output" name="intellij.java.rt" />
-        <element id="module-output" name="intellij.platform.jps.build" />
-        <element id="module-output" name="intellij.tools.jps.build.standalone" />
-        <element id="module-output" name="intellij.java.compiler.instrumentationUtil.java8" />
-      </element>
-      <element id="archive" name="groovy-jps-plugin.jar">
-        <element id="module-output" name="intellij.groovy.jps" />
-      </element>
-      <element id="archive" name="groovy_rt.jar">
-        <element id="module-output" name="intellij.groovy.rt" />
-      </element>
-      <element id="archive" name="ui-designer-jps-plugin.jar">
-        <element id="module-output" name="intellij.java.guiForms.jps" />
-      </element>
-      <element id="archive" name="antlayout.jar">
-        <element id="module-output" name="intellij.tools.jps.antTasks" />
-      </element>
-      <element id="archive" name="groovy-rt-constants.jar">
-        <element id="module-output" name="intellij.groovy.constants.rt" />
-      </element>
-      <element id="archive" name="jps-builders-6.jar">
-        <element id="module-output" name="intellij.platform.jps.build.javac.rt" />
-      </element>
-      <element id="archive" name="aether-dependency-resolver.jar">
-        <element id="module-output" name="intellij.java.aetherDependencyResolver" />
-      </element>
-      <element id="archive" name="testFramework.core.jar">
-        <element id="module-output" name="intellij.platform.testFramework.core" />
-      </element>
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/jps_build_script_dependencies_bootstrap.xml b/.idea/libraries/jps_build_script_dependencies_bootstrap.xml
new file mode 100644
index 000000000000..14b15ac7cd10
--- /dev/null
+++ b/.idea/libraries/jps_build_script_dependencies_bootstrap.xml
@@ -0,0 +1,80 @@
+<component name="libraryTable">
+  <library name="jps-build-script-dependencies-bootstrap" type="repository">
+    <properties maven-id="com.jetbrains.intellij.tools:jps-build-script-dependencies:192.6416" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/tools/jps-build-script-dependencies/192.6416/jps-build-script-dependencies-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/tools/jps-build-standalone/192.6416/jps-build-standalone-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.4.17/groovy-all-2.4.17.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/jps-build/192.6416/jps-build-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/jps-build-javac-rt/192.6416/jps-build-javac-rt-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/java/java-compiler-instrumentation-util-java8/192.6416/java-compiler-instrumentation-util-java8-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/java/java-aether-dependency-resolver/192.6416/java-aether-dependency-resolver-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.9/httpmime-4.5.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.9/httpclient-4.5.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.11/httpcore-4.4.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.25/slf4j-log4j12-1.7.25.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-api/1.1.0/aether-api-1.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-impl/1.1.0/aether-impl-1.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-spi/1.1.0/aether-spi-1.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-util/1.1.0/aether-util-1.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-connector-basic/1.1.0/aether-connector-basic-1.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-transport-file/1.1.0/aether-transport-file-1.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-transport-http/1.1.0/aether-transport-http-1.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/asm-all/7.0.1/asm-all-7.0.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jdom/2.0.6/jdom-2.0.6.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/be/cyberelf/nanoxml/nanoxml/2.2.3/nanoxml-2.2.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/java/java-rt/192.6416/java-rt-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/25.1-jre/guava-25.1-jre.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.1.38.Final/netty-codec-http2-4.1.38.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.38.Final/netty-common-4.1.38.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.38.Final/netty-buffer-4.1.38.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.38.Final/netty-transport-4.1.38.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.38.Final/netty-resolver-4.1.38.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.38.Final/netty-codec-4.1.38.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.38.Final/netty-handler-4.1.38.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.1.38.Final/netty-codec-http-4.1.38.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/jps-model/192.6416/jps-model-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spullara/cli-parser/cli-parser/1.1.5/cli-parser-1.1.5.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/jps-model-serialization/192.6416/jps-model-serialization-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.5.1/protobuf-java-3.5.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/groovy/groovy-jps/192.6416/groovy-jps-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/groovy/groovy-constants-rt/192.6416/groovy-constants-rt-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/jps-model-impl/192.6416/jps-model-impl-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/java/java-compiler-instrumentation-util/192.6416/java-compiler-instrumentation-util-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/groovy/groovy-rt/192.6416/groovy-rt-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations-java5/17.0.0/annotations-java5-17.0.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/util-class-loader/192.6416/util-class-loader-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/util-rt/192.6416/util-rt-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20190514/trove4j-1.0.20190514.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/java/java-gui-forms-jps/192.6416/java-gui-forms-jps-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/util/192.6416/util-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/java/dev/jna/jna-platform/5.3.1/jna-platform-5.3.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/java/dev/jna/jna/5.3.1/jna-5.3.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/oro/oro/2.0.8/oro-2.0.8.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/lz4/lz4-java/1.6.0/lz4-java-1.6.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/java/java-gui-forms-compiler/192.6416/java-gui-forms-compiler-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/java/java-gui-forms-rt/192.6416/java-gui-forms-rt-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/tools/jps-ant-tasks/192.6416/jps-ant-tasks-192.6416.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/gant/gant_groovy2.3/1.9.11/gant_groovy2.3-1.9.11.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/build/dependencies/setupBuildScriptsDeps.gradle b/build/dependencies/setupBuildScriptsDeps.gradle
index f5fdd3c6f8de..dc74bf2558df 100644
--- a/build/dependencies/setupBuildScriptsDeps.gradle
+++ b/build/dependencies/setupBuildScriptsDeps.gradle
@@ -6,6 +6,7 @@ repositories {
   maven { url "https://cache-redirector.jetbrains.com/intellij-third-party-dependencies" }
   maven { url "https://cache-redirector.jetbrains.com/jetbrains.bintray.com/test-discovery" }
   maven { url "https://cache-redirector.jetbrains.com/jcenter.bintray.com" }
+  maven { url 'https://www.jetbrains.com/intellij-repository/releases' }
 }
 
 configurations {
@@ -13,39 +14,12 @@ configurations {
   testDiscoveryDeps
 }
 
-List<String> projectLibraries = [
-  "ASM",
-  "jetbrains-annotations-java5",
-  "Groovy",
-  "cli-parser",
-  "protobuf",
-  "OroMatcher",
-  "commons-codec",
-  "commons-logging",
-  "commons-compress",
-  "Trove4j",
-  "JDOM",
-  "NanoXML",
-  "Guava",
-  "JUnit4",
-  "netty-codec-http",
-  "lz4-java",
-  "gant-groovy",
-  "Log4J",
-  "Slf4j",
-  "jna",
-  "jgoodies-forms",
-  "http-client",
-  "maven-model",
-  "gson"
-]
-
 dependencies {
-  (projectLibraries.collect { loadProjectLibraryProperties(it) } +
-   loadModuleLibraryProperties("aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml")
-  ).each { properties ->
-    buildScriptsDeps(properties.first, { transitive = properties.second })
-  }
+  def jpsLibraryCoordinates = loadProjectLibraryProperties("jps-build-script-dependencies-bootstrap").first
+  def jpsLibraryVersion = jpsLibraryCoordinates.substring(jpsLibraryCoordinates.lastIndexOf(':')+1)
+  buildScriptsDeps(jpsLibraryCoordinates)
+  buildScriptsDeps('commons-cli:commons-cli:1.2')
+  buildScriptsDeps('com.jetbrains.intellij.platform:test-framework-core:' + jpsLibraryVersion)
 }
 
 /**
@@ -85,27 +59,6 @@ private Tuple2<String, Boolean> loadProjectLibraryProperties(String libraryName,
   loadLibraryProperties(propertiesTags.first())
 }
 
-private List<Tuple2<String, Boolean>> loadModuleLibraryProperties(String moduleFileRelativePath) {
-  File file = new File(project.rootDir, "../../$moduleFileRelativePath")
-  if (!file.exists()) {
-    throw new GradleException("Cannot find $moduleFileRelativePath module: $file doesn't exist")
-  }
-
-  def root = new XmlParser().parse(file)
-  def rootManager = root.component?.find { it.@name == 'NewModuleRootManager' }
-  if (rootManager == null) {
-    throw new GradleException("Cannot find 'NewModuleRootManager' component in $file")
-  }
-  rootManager.orderEntry.findAll { it.@type == 'module-library' }.collect {
-    def libraryTag = it.library.first()
-    if (libraryTag.properties.isEmpty()) {
-      throw new GradleException("Library '${libraryTag.'@name'}' in $moduleFileRelativePath is not a repository library")
-    }
-    //noinspection GroovyAssignabilityCheck
-    loadLibraryProperties(libraryTag.properties.first())
-  }
-}
-
 private static Tuple2<String, Boolean> loadLibraryProperties(Node propertiesTag) {
   new Tuple2(propertiesTag.'@maven-id', propertiesTag.'@include-transitive-deps' != "false")
 }
\ No newline at end of file
diff --git a/build/gant.xml b/build/gant.xml
index 581250a27ddb..86ec9628be16 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -43,17 +43,11 @@
 
   <target name="doGant" depends="init">
     <path id="gant.classpath">
-      <fileset dir="${project.home}/build/lib/jps">
-        <include name="*.jar"/>
-      </fileset>
       <pathelement path="${project.home}/platform/build-scripts/groovy"/>
       <pathelement path="${project.home}/build/groovy"/>
       <fileset dir="${project.home}/build/dependencies/build/build-scripts-deps">
         <include name="*.jar"/>
       </fileset>
-      <fileset dir="${idea.lib}">
-        <include name="snappy-in-java-*.jar"/>
-      </fileset>
     </path>
 
     <taskdef name="gant" classname="org.jetbrains.jps.gant.GantWithClasspathTask">
diff --git a/build/intellij.idea.community.build.iml b/build/intellij.idea.community.build.iml
index 7e188243095e..08ba75f534f1 100644
--- a/build/intellij.idea.community.build.iml
+++ b/build/intellij.idea.community.build.iml
@@ -11,35 +11,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Groovy" level="project" />
-    <orderEntry type="library" exported="" name="Ant" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="ASM" level="project" />
-    <orderEntry type="library" exported="" scope="RUNTIME" name="cli-parser" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="JDOM" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="protobuf" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Log4J" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="jna" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model" exported="" />
-    <orderEntry type="module" module-name="intellij.tools.jps.build.standalone" exported="" />
-    <orderEntry type="module-library" exported="" scope="PROVIDED">
-      <library name="commons-cli" type="repository">
-        <properties maven-id="commons-cli:commons-cli:1.2" />
-        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/commons-cli/commons-cli/1.2/commons-cli-1.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="intellij.tools.jps.antTasks" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
     <orderEntry type="module" module-name="intellij.platform.buildScripts" exported="" />
-    <orderEntry type="module" module-name="intellij.java.guiForms.jps" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.groovy.jps" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.groovy.rt" scope="RUNTIME" />
-    <orderEntry type="library" scope="RUNTIME" name="netty-codec-http" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/build/lib/jps/aether-dependency-resolver.jar b/build/lib/jps/aether-dependency-resolver.jar
deleted file mode 100644
index e2072e03c844..000000000000
Binary files a/build/lib/jps/aether-dependency-resolver.jar and /dev/null differ
diff --git a/build/lib/jps/antlayout.jar b/build/lib/jps/antlayout.jar
deleted file mode 100644
index 9bd055ccd6f6..000000000000
Binary files a/build/lib/jps/antlayout.jar and /dev/null differ
diff --git a/build/lib/jps/groovy-jps-plugin.jar b/build/lib/jps/groovy-jps-plugin.jar
deleted file mode 100644
index a0fd9dfef832..000000000000
Binary files a/build/lib/jps/groovy-jps-plugin.jar and /dev/null differ
diff --git a/build/lib/jps/groovy-rt-constants.jar b/build/lib/jps/groovy-rt-constants.jar
deleted file mode 100644
index 2f4567142985..000000000000
Binary files a/build/lib/jps/groovy-rt-constants.jar and /dev/null differ
diff --git a/build/lib/jps/groovy_rt.jar b/build/lib/jps/groovy_rt.jar
deleted file mode 100644
index f044bcece79a..000000000000
Binary files a/build/lib/jps/groovy_rt.jar and /dev/null differ
diff --git a/build/lib/jps/jps-builders-6.jar b/build/lib/jps/jps-builders-6.jar
deleted file mode 100644
index 0683e542d939..000000000000
Binary files a/build/lib/jps/jps-builders-6.jar and /dev/null differ
diff --git a/build/lib/jps/jps-builders.jar b/build/lib/jps/jps-builders.jar
deleted file mode 100644
index 3e9a8e174994..000000000000
Binary files a/build/lib/jps/jps-builders.jar and /dev/null differ
diff --git a/build/lib/jps/jps-model.jar b/build/lib/jps/jps-model.jar
deleted file mode 100644
index d31e4c789ccb..000000000000
Binary files a/build/lib/jps/jps-model.jar and /dev/null differ
diff --git a/build/lib/jps/testFramework.core.jar b/build/lib/jps/testFramework.core.jar
deleted file mode 100644
index 447b46a97157..000000000000
Binary files a/build/lib/jps/testFramework.core.jar and /dev/null differ
diff --git a/build/lib/jps/ui-designer-jps-plugin.jar b/build/lib/jps/ui-designer-jps-plugin.jar
deleted file mode 100644
index 80d3cd5e5c45..000000000000
Binary files a/build/lib/jps/ui-designer-jps-plugin.jar and /dev/null differ
diff --git a/build/lib/jps/util.jar b/build/lib/jps/util.jar
deleted file mode 100644
index b9695f18cdcf..000000000000
Binary files a/build/lib/jps/util.jar and /dev/null differ
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 9506ba898f77..7b7eec3e2f04 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -549,6 +549,7 @@ class CommunityLibraryLicenses {
     jetbrainsLibrary("intellij-markdown"),
     jetbrainsLibrary("intellij-test-discovery"),
     jetbrainsLibrary("JPS"),
+    jetbrainsLibrary("jps-build-script-dependencies-bootstrap"),
     jetbrainsLibrary("kotlin-reflect"),
     jetbrainsLibrary("kotlin-script-runtime"),
     jetbrainsLibrary("kotlin-stdlib-jdk8"),
diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml
index fbbe02a5ed4d..e1f575c72301 100644
--- a/platform/build-scripts/intellij.platform.buildScripts.iml
+++ b/platform/build-scripts/intellij.platform.buildScripts.iml
@@ -8,28 +8,20 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Groovy" level="project" />
     <orderEntry type="library" exported="" name="Ant" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="ASM" level="project" />
-    <orderEntry type="library" exported="" scope="RUNTIME" name="cli-parser" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="JDOM" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="protobuf" level="project" />
-    <orderEntry type="library" name="Log4J" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="jna" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="intellij.tools.jps.antTasks" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model" exported="" />
-    <orderEntry type="module" module-name="intellij.tools.jps.build.standalone" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
-    <orderEntry type="module" module-name="intellij.java.guiForms.jps" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.groovy.jps" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.groovy.rt" scope="RUNTIME" />
-    <orderEntry type="library" exported="" name="gant-groovy" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="maven-model" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="library" name="http-client" level="project" />
-    <orderEntry type="library" name="commons-compress" level="project" />
+    <orderEntry type="library" exported="" name="jps-build-script-dependencies-bootstrap" level="project" />
+    <orderEntry type="module-library" exported="" scope="PROVIDED">
+      <library name="commons-cli" type="repository">
+        <properties maven-id="commons-cli:commons-cli:1.2" />
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/commons-cli/commons-cli/1.2/commons-cli-1.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MAVEN_REPOSITORY$/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
index 361315993d92..656db3a189d0 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
@@ -900,8 +900,8 @@ class AppTest {
     addGroovyLibrary(anotherModule)
 
     PsiTestUtil.addProjectLibrary(module, "junit", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("JUnit3"))
-    PsiTestUtil.addProjectLibrary(module, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.idea.community.build", "commons-cli").classesPaths)
-    PsiTestUtil.addProjectLibrary(anotherModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.idea.community.build", "commons-cli").classesPaths)
+    PsiTestUtil.addProjectLibrary(module, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.platform.buildScripts", "commons-cli").classesPaths)
+    PsiTestUtil.addProjectLibrary(anotherModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.platform.buildScripts", "commons-cli").classesPaths)
 
     myFixture.addFileToProject("a.groovy", "class Foo extends GroovyTestCase {}")
     myFixture.addFileToProject("b.groovy", "class Bar extends CliBuilder {}")
diff --git a/python/build/intellij.pycharm.community.build.iml b/python/build/intellij.pycharm.community.build.iml
index 07e88f562e79..c6620ed22914 100644
--- a/python/build/intellij.pycharm.community.build.iml
+++ b/python/build/intellij.pycharm.community.build.iml
@@ -7,8 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="intellij.tools.jps.build.standalone" />
     <orderEntry type="module" module-name="intellij.idea.community.build" />
   </component>
 </module>
\ No newline at end of file