diff --git a/.idea/libraries/Groovy.xml b/.idea/libraries/Groovy.xml
index 3df0b5fbd6bc..f5e7bceecec7 100644
--- a/.idea/libraries/Groovy.xml
+++ b/.idea/libraries/Groovy.xml
@@ -1,11 +1,9 @@
 <component name="libraryTable">
   <library name="Groovy">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/groovy-all-2.3.7.jar!/"/>
+      <root url="jar://$PROJECT_DIR$/lib/groovy-all-2.3.9.jar!/"/>
     </CLASSES>
-    <JAVADOC/>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/groovy-all-2.3.7-sources.jar!/"/>
-    </SOURCES>
+    <JAVADOC />
+    <SOURCES />
   </library>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/conf/classVersions.txt b/build/conf/classVersions.txt
index 377431bd105c..1ce904adc40b 100644
--- a/build/conf/classVersions.txt
+++ b/build/conf/classVersions.txt
@@ -36,9 +36,6 @@
 1.5 => plugins/Groovy/lib/groovy_rt.jar
 1.5 => lib/annotations.jar
 
-1.7 => lib/groovy-all-2.3.7.jar!org/codehaus/groovy/runtime/WritablePath.class
-1.7 => lib/groovy-all-2.3.7.jar!org/codehaus/groovy/runtime/NioGroovyMethods.class
-
 1.6 => plugins/gradle/lib/gradle-jps-plugin.jar
 
-1.3 => plugins/junit/lib/junit-rt.jar
\ No newline at end of file
+1.3 => plugins/junit/lib/junit-rt.jar
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 99d0257e0906..f7c62a02dc4d 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -83,7 +83,7 @@ binding.setVariable("checkLibLicenses", {
   if (!withoutLicenses.isEmpty()) {
     def errorMessage = []
     errorMessage << "Licenses aren't specified for ${withoutLicenses.size()} libraries:"
-    withoutLicenses.sort(String.CASE_INSENSITIVE_ORDER)
+    withoutLicenses.sort(true, String.CASE_INSENSITIVE_ORDER)
     withoutLicenses.each { errorMessage << it}
     errorMessage << "If a library is packaged into IDEA installation information about its license must be added to libLicenses.gant file"
     errorMessage << "If a library is used in tests only change its scope to 'Test'"
@@ -181,7 +181,7 @@ libraryLicense(name: "svnkit-javahl", version: "bundled with SVNKit", libraryNam
 libraryLicense(name: "Antlr", libraryName: "antlr.jar", version: "3.4", license: "BSD", url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html")
 libraryLicense(name: "Guava", version: "17.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html")
 libraryLicense(name: "Guava", libraryName: "guava-tools", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html")
-libraryLicense(name: "Groovy", version: "2.3.7", license: "Apache 2.0", url: "http://groovy.codehaus.org/")
+libraryLicense(name: "Groovy", version: "2.3.9", license: "Apache 2.0", url: "http://groovy.codehaus.org/")
 libraryLicense(name: "Gson", version: "2.2.4", libraryName: "gson", license: "Apache 2.0", url: "http://code.google.com/p/google-gson/")
 libraryLicense(name: "ini4j", libraryName: "ini4j-0.5.2-patched", version: "0.5.2 (with a patch by JetBrains)", license: "Apache 2.0", url: "http://ini4j.sourceforge.net/", attachedTo: "git4idea")
 libraryLicense(name: "ISO RELAX", libraryName: "isorelax.jar", license: "MIT License", url: "http://sourceforge.net/projects/iso-relax/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
diff --git a/lib/groovy-all-2.3.7.jar b/lib/groovy-all-2.3.9.jar
similarity index 66%
rename from lib/groovy-all-2.3.7.jar
rename to lib/groovy-all-2.3.9.jar
index 11497a36356a..d365846f5961 100644
Binary files a/lib/groovy-all-2.3.7.jar and b/lib/groovy-all-2.3.9.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index dc14bae97971..4ec015430d21 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -15,7 +15,7 @@ fluent-hc-4.3.6.jar
 freemarker.jar
 httpmime-4.3.6.jar
 ecj-4.4.jar
-groovy-all-2.3.7.jar
+groovy-all-2.3.9.jar
 gson-2.3.jar
 guava-17.0.jar
 hamcrest-core-1.3.jar
diff --git a/lib/src/groovy-all-2.3.7-sources.jar b/lib/src/groovy-all-2.3.7-sources.jar
deleted file mode 100644
index 7c9d3c8dcf8a..000000000000
Binary files a/lib/src/groovy-all-2.3.7-sources.jar and /dev/null differ