3 files changed, 10 insertions, 1 deletions
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index e041d371fe5a..ba7a556eefe5 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -534,6 +534,12 @@ public def layoutCommunityPlugins(String home) {
       }
     }
 
+    layoutPlugin("editorconfig") {
+      fileset(dir: "$home/plugins/editorconfig/lib") {
+        include(name: "**/*.jar")
+      }
+    }
+
     pluginDir("coverage") {
       dir("lib") {
         jar("coverage.jar") {
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index d495f952b7a8..872cc5f6e9fe 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -278,6 +278,7 @@ libraryLicense(name: "ANTLR 4 Runtime", libraryName: "antlr-runtime-4.1.jar", ve
 libraryLicense(name: "minlog", libraryName: "minlog-1.2.jar", version: "1.2", license: "BSD", url: "https://github.com/EsotericSoftware/minlog", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
 libraryLicense(name: "ReflectASM", libraryName: "reflectasm-1.0.7.jar", version: "1.0.7", license: "BSD", url: "https://github.com/EsotericSoftware/reflectasm", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
 libraryLicense(name: "Objenesis", libraryName: "objenesis-1.2.jar", version: "1.2", license: "Apache 2.0", url: "http://objenesis.org/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
+libraryLicense(name: "EditorConfig Java Core", libraryName: "editorconfig-core-java.jar", version: "1.0", license: "Apache 2.0", url: "https://github.com/editorconfig/editorconfig-core-java/", licenseUrl: "https://github.com/editorconfig/editorconfig-core-java/blob/master/LICENSE")
 jetbrainsLibrary("Coverage")
 jetbrainsLibrary("CoverageReport")
 jetbrainsLibrary("JPS")
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index f30d8a2c7af2..7845d32938da 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -256,6 +256,7 @@ binding.setVariable("classPathLibs", [
 binding.setVariable("platformApiModules", [
   "analysis-api",
   "core-api",
+  "dvcs-api",
   "editor-ui-api",
   "external-system-api",
   "indexing-api",
@@ -267,6 +268,7 @@ binding.setVariable("platformApiModules", [
   "structure-view-api",
   "usageView",
   "vcs-api",
+  "vcs-api-core",
   "vcs-log-api",
   "vcs-log-graph-api",
   "xdebugger-api",
@@ -282,7 +284,7 @@ binding.setVariable("platformApiModules", [
 binding.setVariable("platformImplementationModules", [
   "analysis-impl",
   "core-impl",
-  "dvcs",
+  "dvcs-impl",
   "editor-ui-ex",
   "images",
   "indexing-impl",