From: masensio <masensio@solidgear.es>
Date: Thu, 16 Jan 2014 17:46:07 +0000 (+0100)
Subject: Merge branch 'develop' into share_link_show_shared_files
X-Git-Tag: oc-android-1.5.5~35^2~65
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e6bf6968fa081d06d75af8d7a7625f0b79375df3?hp=7aeda0b4dcf757ce5138c90916d7a33cf53e09b9

Merge branch 'develop' into share_link_show_shared_files
---

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/oc_framework/libs/commons-httpclient-3.1.jar b/oc_framework/libs/commons-httpclient-3.1.jar
new file mode 100755
index 00000000..7c59774a
Binary files /dev/null and b/oc_framework/libs/commons-httpclient-3.1.jar differ
diff --git a/oc_framework/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar b/oc_framework/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar
deleted file mode 100644
index 2dd374f9..00000000
Binary files a/oc_framework/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar and /dev/null differ
diff --git a/oc_framework/libs/jackrabbit-webdav-2.7.2.jar b/oc_framework/libs/jackrabbit-webdav-2.7.2.jar
new file mode 100755
index 00000000..6ebfbf70
Binary files /dev/null and b/oc_framework/libs/jackrabbit-webdav-2.7.2.jar differ
diff --git a/oc_framework/libs/slf4j-api-1.7.5.jar b/oc_framework/libs/slf4j-api-1.7.5.jar
new file mode 100755
index 00000000..8f004d39
Binary files /dev/null and b/oc_framework/libs/slf4j-api-1.7.5.jar differ
diff --git a/oc_framework/pom.xml b/oc_framework/pom.xml
index 674c0310..e811ffda 100755
--- a/oc_framework/pom.xml
+++ b/oc_framework/pom.xml
@@ -30,15 +30,9 @@
         </dependency>
 
         <dependency>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-          <version>3.1</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
-            <version>2.5.2</version>
+            <version>2.7.2</version>
         </dependency>
 
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 4e4b7241..5e7c1ea3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,12 +50,6 @@
             <type>apklib</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-webdav</artifactId>
-            <version>2.5.2</version>
-        </dependency>
-        
         <!-- MUST BE INSTALLED FIRST: cd oc_framework; mvn install -->
         <dependency>
          <groupId>com.owncloud.android</groupId>