Update httpclient to 4.3.4
diff --git a/.classpath b/.classpath
index 9873ddb..a3a29e3 100644
--- a/.classpath
+++ b/.classpath
@@ -11,6 +11,10 @@
<classpathentry kind="lib" path="ext/guava-17.0.jar" sourcepath="ext/src/guava-17.0.jar" />
<classpathentry kind="lib" path="ext/guice-servlet-4.0-gb1.jar" sourcepath="ext/src/guice-servlet-4.0-gb1.jar" />
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
+ <classpathentry kind="lib" path="ext/httpclient-4.3.4.jar" sourcepath="ext/src/httpclient-4.3.4.jar" />
+ <classpathentry kind="lib" path="ext/httpcore-4.3.2.jar" sourcepath="ext/src/httpcore-4.3.2.jar" />
+ <classpathentry kind="lib" path="ext/commons-logging-1.1.3.jar" sourcepath="ext/src/commons-logging-1.1.3.jar" />
+ <classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar" />
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
<classpathentry kind="lib" path="ext/slf4j-api-1.7.7.jar" sourcepath="ext/src/slf4j-api-1.7.7.jar" />
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.7.jar" sourcepath="ext/src/slf4j-log4j12-1.7.7.jar" />
@@ -44,10 +48,6 @@
<classpathentry kind="lib" path="ext/org.eclipse.jgit-3.4.1.201406201815-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.4.1.201406201815-r.jar" />
<classpathentry kind="lib" path="ext/jsch-0.1.50.jar" sourcepath="ext/src/jsch-0.1.50.jar" />
<classpathentry kind="lib" path="ext/JavaEWAH-0.7.9.jar" sourcepath="ext/src/JavaEWAH-0.7.9.jar" />
- <classpathentry kind="lib" path="ext/httpclient-4.1.3.jar" sourcepath="ext/src/httpclient-4.1.3.jar" />
- <classpathentry kind="lib" path="ext/httpcore-4.1.4.jar" sourcepath="ext/src/httpcore-4.1.4.jar" />
- <classpathentry kind="lib" path="ext/commons-logging-1.1.1.jar" sourcepath="ext/src/commons-logging-1.1.1.jar" />
- <classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar" />
<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar" />
<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.49.jar" sourcepath="ext/src/bcprov-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.49.jar" sourcepath="ext/src/bcmail-jdk15on-1.49.jar" />
@@ -88,7 +88,7 @@
<classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" />
<classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" />
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
- <classpathentry kind="src" path="src/main/gen">
+ <classpathentry kind="src" path="src/main/dagger">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
diff --git a/build.moxie b/build.moxie
index 3f18bf5..7ada2bd 100644
--- a/build.moxie
+++ b/build.moxie
@@ -134,6 +134,8 @@
- compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
- compile 'com.google.guava:guava:17.0' :war :fedclient
- compile 'com.intellij:annotations:12.0' :war
+- compile 'org.apache.httpcomponents:httpclient:4.3.4' :war
+- compile 'org.apache.httpcomponents:httpcore:4.3.2' :war
- compile 'log4j:log4j:1.2.17' :war :fedclient
- compile 'org.slf4j:slf4j-api:1.7.7' :war :fedclient
- compile 'org.slf4j:slf4j-log4j12:1.7.7' :war :fedclient
diff --git a/gitblit.iml b/gitblit.iml
index 878fdc3..ad39963 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -80,6 +80,50 @@
</library>
</orderEntry>
<orderEntry type="module-library">
+ <library name="httpclient-4.3.4.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/httpclient-4.3.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.3.4.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="httpcore-4.3.2.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/httpcore-4.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.3.2.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="commons-logging-1.1.3.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.3.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="commons-codec-1.7.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/commons-codec-1.7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.7.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
<library name="log4j-1.2.17.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/log4j-1.2.17.jar!/" />
@@ -441,50 +485,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="httpclient-4.1.3.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/httpclient-4.1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.1.3.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="httpcore-4.1.4.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/httpcore-4.1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.1.4.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="commons-logging-1.1.1.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.1.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="commons-codec-1.7.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/commons-codec-1.7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.7.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" />
