Browse Source

Merge branch 'develop' into share_link_show_shared_files

masensio 11 years ago
parent
commit
e6bf6968fa

BIN
libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar


BIN
oc_framework/libs/commons-httpclient-3.1.jar


BIN
oc_framework/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar


BIN
oc_framework/libs/jackrabbit-webdav-2.7.2.jar


BIN
oc_framework/libs/slf4j-api-1.7.5.jar


+ 1 - 7
oc_framework/pom.xml

@@ -29,16 +29,10 @@
             <scope>provided</scope>
         </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>

+ 0 - 6
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>