From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 28 Oct 2013 11:52:20 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/586ef8ad2d3e8f16bcaffe1f9152db1eaa7a11fe?hp=ea26174440d1a1e3b16627dfd90b780c1fd87e1c

Merge branch 'develop' into review_build_process
---

diff --git a/libs/commons-httpclient-3.1.jar b/libs/commons-httpclient-3.1.jar
new file mode 100755
index 00000000..7c59774a
Binary files /dev/null and b/libs/commons-httpclient-3.1.jar differ
diff --git a/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar b/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar
deleted file mode 100755
index 2dd374f9..00000000
Binary files a/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar and /dev/null differ
diff --git a/libs/jackrabbit-webdav-2.6.4.jar b/libs/jackrabbit-webdav-2.6.4.jar
new file mode 100755
index 00000000..9d6d6f12
Binary files /dev/null and b/libs/jackrabbit-webdav-2.6.4.jar differ
diff --git a/pom.xml b/pom.xml
index a55a77a1..bba3d333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
-            <version>2.5.2</version>
+            <version>2.6.4</version>
         </dependency>
 
     </dependencies>