diff --git a/.idea/libraries/commons_lang.xml b/.idea/libraries/commons_lang.xml
index ee8c45a85f3ff..6dba47e3de16e 100644
--- a/.idea/libraries/commons_lang.xml
+++ b/.idea/libraries/commons_lang.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="commons-lang">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/third_party/java/commons-lang/commons-lang3-3.3.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/third_party/java/commons-lang/commons-lang3-3.4.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/third_party/java/commons-lang/commons-lang3-3.3.2-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/third_party/java/commons-lang/commons-lang3-3.4-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/cssparser.xml b/.idea/libraries/cssparser.xml
index 4314b6d6e3666..a48fce1975bd5 100644
--- a/.idea/libraries/cssparser.xml
+++ b/.idea/libraries/cssparser.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="cssparser">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/third_party/java/cssparser/cssparser-0.9.14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/third_party/java/cssparser/cssparser-0.9.15.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/htmlunit.xml b/.idea/libraries/htmlunit.xml
index 8b35e220419f3..8e61c948de50d 100644
--- a/.idea/libraries/htmlunit.xml
+++ b/.idea/libraries/htmlunit.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="htmlunit">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/third_party/java/htmlunit/htmlunit-2.15.jar!/" />
-      <root url="jar://$PROJECT_DIR$/third_party/java/htmlunit/htmlunit-core-js-2.15.jar!/" />
+      <root url="jar://$PROJECT_DIR$/third_party/java/htmlunit/htmlunit-2.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/third_party/java/htmlunit/htmlunit-core-js-2.16.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/third_party/java/htmlunit/htmlunit-2.15-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/third_party/java/htmlunit/htmlunit-2.16-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/nekohtml.xml b/.idea/libraries/nekohtml.xml
index d55207f3a1a90..7616a690051d2 100644
--- a/.idea/libraries/nekohtml.xml
+++ b/.idea/libraries/nekohtml.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="nekohtml">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/third_party/java/nekohtml/nekohtml-1.9.21.jar!/" />
+      <root url="jar://$PROJECT_DIR$/third_party/java/nekohtml/nekohtml-1.9.22.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/third_party/java/nekohtml/nekohtml-1.9.21-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/third_party/java/nekohtml/nekohtml-1.9.22-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/java/client/client.iml b/java/client/client.iml
index 4ab43bab7b116..1a5ca492ec425 100644
--- a/java/client/client.iml
+++ b/java/client/client.iml
@@ -15,7 +15,6 @@
     <orderEntry type="library" scope="RUNTIME" name="commons-collections" level="project" />
     <orderEntry type="library" name="commons-exec" level="project" />
     <orderEntry type="library" name="commons-fileupload" level="project" />
-    <orderEntry type="library" name="commons-httpclient" level="project" />
     <orderEntry type="library" name="commons-io" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-lang" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-logging" level="project" />
@@ -41,5 +40,6 @@
     <orderEntry type="library" scope="TEST" name="slf4j" level="project" />
     <orderEntry type="library" name="mockito-core-1.9.5-srcs" level="project" />
     <orderEntry type="library" name="objenesis-1.0" level="project" />
+    <orderEntry type="library" name="apache-httpclient" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/server/server.iml b/java/server/server.iml
index 9aa21f751d711..70440d6f384e5 100644
--- a/java/server/server.iml
+++ b/java/server/server.iml
@@ -12,7 +12,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="client" exported="" />
     <orderEntry type="library" name="bouncycastle" level="project" />
-    <orderEntry type="library" name="commons-httpclient" level="project" />
     <orderEntry type="library" name="commons-io" level="project" />
     <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="library" name="jcip-annotations" level="project" />
@@ -26,6 +25,6 @@
     <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
     <orderEntry type="library" name="mockito-core-1.9.5-srcs" level="project" />
     <orderEntry type="library" name="objenesis-1.0" level="project" />
+    <orderEntry type="library" name="apache-httpclient" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file