diff --git a/.idea/libraries/Groovy.xml b/.idea/libraries/Groovy.xml
index 4fa31e46e2de..6ab7a7bfb5f2 100644
--- a/.idea/libraries/Groovy.xml
+++ b/.idea/libraries/Groovy.xml
@@ -1,11 +1,47 @@
 <component name="libraryTable">
   <library name="Groovy">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/groovy-all-1.8.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/groovy-all-2.0.6.jar!/"/>
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC/>
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-1.8.5.zip!/groovy-1.8.5/src/main" />
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-json/src/main/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-json/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-test/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-xml/src/test/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-xml/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-servlet/src/test/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-servlet/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-console/src/main/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-bsf/src/test/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-bsf/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-groovysh/src/main/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-templates/src/test/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-templates/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-sql/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-swing/src/test/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-swing/src/main/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-swing/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-groovydoc/src/test/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-groovydoc/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-testng/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-jsr223/src/test/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-jsr223/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-jmx/src/test/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-jmx/src/test/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-jmx/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-ant/src/test/groovy"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-ant/src/test-resources"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/subprojects/groovy-ant/src/main/java"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/benchmark/bench"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/src/tck/src"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/src/test"/>
+      <root
+          url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/src/test-resources/stubgenerator/propertyUsageFromJava"/>
+      <root
+          url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/src/test-resources/stubgenerator/circularLanguageReference"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/src/examples"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-src-2.0.6.zip!/groovy-2.0.6/src/main"/>
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/lib/gant/bin/startGroovy b/build/lib/gant/bin/startGroovy
index 13fcdf56bf45..f9e62511cd2a 100755
--- a/build/lib/gant/bin/startGroovy
+++ b/build/lib/gant/bin/startGroovy
@@ -127,7 +127,7 @@ fi
 if [ -z "$GROOVY_CONF" ] ; then
     GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf"
 fi
-STARTER_CLASSPATH="$GROOVY_HOME/lib/groovy-all-1.7.1.jar"
+STARTER_CLASSPATH="$GROOVY_HOME/lib/groovy-all-2.0.6.jar"
 
 # Create the final classpath. Setting a classpath using the -cp or -classpath option means not to use the
 # global classpath. Groovy behaves then the same as the java interpreter
diff --git a/build/lib/gant/bin/startGroovy.bat b/build/lib/gant/bin/startGroovy.bat
index 83caa2a9b8b6..e7c34766d90e 100755
--- a/build/lib/gant/bin/startGroovy.bat
+++ b/build/lib/gant/bin/startGroovy.bat
@@ -203,7 +203,7 @@ set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
-set STARTER_CLASSPATH=%GROOVY_HOME%\%JARSPATH%\groovy-all-1.7.1.jar;%STARTER_CLASSPATH%
+set STARTER_CLASSPATH=%GROOVY_HOME%\%JARSPATH%\groovy-all-2.0.6.jar;%STARTER_CLASSPATH%
 
 if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
 
diff --git a/build/lib/gant/lib/gant_groovy1.7-1.9.2.jar b/build/lib/gant/lib/gant_groovy1.7-1.9.2.jar
deleted file mode 100644
index 3b22b4a29ce2..000000000000
Binary files a/build/lib/gant/lib/gant_groovy1.7-1.9.2.jar and /dev/null differ
diff --git a/build/lib/gant/lib/gant_groovy2.0-1.9.8.jar b/build/lib/gant/lib/gant_groovy2.0-1.9.8.jar
new file mode 100644
index 000000000000..3d0d1ca0a526
Binary files /dev/null and b/build/lib/gant/lib/gant_groovy2.0-1.9.8.jar differ
diff --git a/build/lib/gant/lib/groovy-all-1.7.1.jar b/build/lib/gant/lib/groovy-all-1.7.1.jar
deleted file mode 100644
index ac515a39ac4a..000000000000
Binary files a/build/lib/gant/lib/groovy-all-1.7.1.jar and /dev/null differ
diff --git a/lib/groovy-all-1.8.5.jar b/build/lib/gant/lib/groovy-all-2.0.6.jar
similarity index 51%
rename from lib/groovy-all-1.8.5.jar
rename to build/lib/gant/lib/groovy-all-2.0.6.jar
index 54a90a5131eb..ed8e33ae660f 100644
Binary files a/lib/groovy-all-1.8.5.jar and b/build/lib/gant/lib/groovy-all-2.0.6.jar differ
diff --git a/lib/groovy-all-2.0.6.jar b/lib/groovy-all-2.0.6.jar
new file mode 100644
index 000000000000..ed8e33ae660f
Binary files /dev/null and b/lib/groovy-all-2.0.6.jar differ
diff --git a/lib/src/groovy-src-1.8.5.zip b/lib/src/groovy-src-2.0.6.zip
similarity index 80%
rename from lib/src/groovy-src-1.8.5.zip
rename to lib/src/groovy-src-2.0.6.zip
index 494647307e89..acdd4bd16284 100644
Binary files a/lib/src/groovy-src-1.8.5.zip and b/lib/src/groovy-src-2.0.6.zip differ