diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fa595e20de73..569ac7af0c1b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -20,7 +20,11 @@
       <entry name="!*.class" />
       <entry name="!*.groovy" />
     </wildcardResourcePatterns>
-    <annotationProcessing enabled="false" useClasspath="true" />
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
   </component>
   <component name="EclipseCompilerSettings">
     <option name="GENERATE_NO_WARNINGS" value="true" />
diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index 723479636794..17c9f3393500 100644
--- a/.idea/libraries/Netty.xml
+++ b/.idea/libraries/Netty.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Netty">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/netty-3.4.5.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-3.5.0.Final.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/netty-3.4.5.Final-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/netty-3.5.0.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/lib/netty-3.4.5.Final.jar b/lib/netty-3.4.5.Final.jar
deleted file mode 100644
index d0eda237002f..000000000000
Binary files a/lib/netty-3.4.5.Final.jar and /dev/null differ
diff --git a/lib/netty-3.5.0.Final.jar b/lib/netty-3.5.0.Final.jar
new file mode 100644
index 000000000000..f3f7db438487
Binary files /dev/null and b/lib/netty-3.5.0.Final.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index d822b97af6d3..12397d5681bc 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -46,5 +46,5 @@ xmlrpc-2.0.jar
 xpp3-1.1.4-min.jar
 xstream.jar
 swingx-core-1.6.2.jar
-netty-3.4.5.Final.jar
+netty-3.5.0.Final.jar
 protobuf-2.4.1.jar
diff --git a/lib/src/netty-3.4.5.Final-sources.jar b/lib/src/netty-3.4.5.Final-sources.jar
deleted file mode 100644
index e529c31619a8..000000000000
Binary files a/lib/src/netty-3.4.5.Final-sources.jar and /dev/null differ
diff --git a/lib/src/netty-3.5.0.Final-sources.jar b/lib/src/netty-3.5.0.Final-sources.jar
new file mode 100644
index 000000000000..bdea21732fed
Binary files /dev/null and b/lib/src/netty-3.5.0.Final-sources.jar differ