Merge branch 'develop' into regular_authentication_in_saml_server

[pub/Android/ownCloud.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 4e4b724..15bd0b6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
         <owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
         <java-version>1.6</java-version>
         <!-- Given by maven-android-sdk-deployer -->
         <owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
         <java-version>1.6</java-version>
         <!-- Given by maven-android-sdk-deployer -->

-        <google.android-version>4.4_r1</google.android-version>
+        <google.android-version>4.4.2_r2</google.android-version>

         <!-- Usually the latest Android API -->
         <google.android-api>19</google.android-api>
         <actionbarsherlock-version>4.2.0</actionbarsherlock-version>
         <!-- Usually the latest Android API -->
         <google.android-api>19</google.android-api>
         <actionbarsherlock-version>4.2.0</actionbarsherlock-version>


@@ -50,16 +50,10 @@
             <type>apklib</type>
         </dependency>
 
             <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 -->
+        <!-- MUST BE INSTALLED FIRST: cd owncloud-android-library; mvn install -->

         <dependency>
          <groupId>com.owncloud.android</groupId>
         <dependency>
          <groupId>com.owncloud.android</groupId>

-         <artifactId>oc_framework</artifactId>
+         <artifactId>owncloud-android-library</artifactId>

          <version>${owncloud.version}</version>
       </dependency>
 
          <version>${owncloud.version}</version>
       </dependency>