Merge branch 'develop' into regular_authentication_in_saml_server

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

diff --git a/pom.xml b/pom.xml
index 2726333..15bd0b6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,17 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.owncloud.android</groupId>
     <artifactId>owncloud</artifactId>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.owncloud.android</groupId>
     <artifactId>owncloud</artifactId>

-    <version>1.3.21-SNAPSHOT</version>
+    <version>${owncloud.version}</version>

     <packaging>apk</packaging>
     <name>Owncloud Android</name>
 
     <properties>
     <packaging>apk</packaging>
     <name>Owncloud Android</name>
 
     <properties>

+        <owncloud.version>1.5.1-SNAPSHOT</owncloud.version>

         <java-version>1.6</java-version>
         <java-version>1.6</java-version>

-        <google.android-version>4.1.1.4</google.android-version>
-        <google.android.support-version>r7</google.android.support-version>
+        <!-- Given by maven-android-sdk-deployer -->
+        <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>
     </properties>
 
         <actionbarsherlock-version>4.2.0</actionbarsherlock-version>
     </properties>
 


@@ -23,23 +26,17 @@
         <developerConnection>scm:git:git@github.com:owncloud/android.git</developerConnection>
         <url>https://github.com/owncloud/android</url>
     </scm>
         <developerConnection>scm:git:git@github.com:owncloud/android.git</developerConnection>
         <url>https://github.com/owncloud/android</url>
     </scm>

-
+    

     <dependencies>
 
         <dependency>
     <dependencies>
 
         <dependency>

-            <groupId>com.google.android</groupId>
+            <groupId>android</groupId>

             <artifactId>android</artifactId>
             <version>${google.android-version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <artifactId>android</artifactId>
             <version>${google.android-version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>

-            <groupId>com.google.android</groupId>
-            <artifactId>support-v4</artifactId>
-            <version>${google.android.support-version}</version>
-        </dependency>
-
-        <dependency>

             <groupId>com.actionbarsherlock</groupId>
             <artifactId>actionbarsherlock</artifactId>
             <version>${actionbarsherlock-version}</version>
             <groupId>com.actionbarsherlock</groupId>
             <artifactId>actionbarsherlock</artifactId>
             <version>${actionbarsherlock-version}</version>


@@ -53,11 +50,12 @@
             <type>apklib</type>
         </dependency>
 
             <type>apklib</type>
         </dependency>
 

+        <!-- MUST BE INSTALLED FIRST: cd owncloud-android-library; mvn install -->

         <dependency>
         <dependency>

-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-webdav</artifactId>
-            <version>2.5.2</version>
-        </dependency>
+         <groupId>com.owncloud.android</groupId>
+         <artifactId>owncloud-android-library</artifactId>
+         <version>${owncloud.version}</version>
+      </dependency>

 
     </dependencies>
 
 
     </dependencies>
 


@@ -81,12 +79,11 @@
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>

-                <version>3.5.0</version>
+                <version>3.8.0</version>

                 <configuration>
                     <sdk>
                 <configuration>
                     <sdk>

-                        <!-- platform or api level (api level 4 = platform 1.6)-->

                         <path>${env.ANDROID_HOME}</path>
                         <path>${env.ANDROID_HOME}</path>

-                        <platform>17</platform>
+                        <platform>${google.android-api}</platform>

                     </sdk>
                 </configuration>
                 <extensions>true</extensions>
                     </sdk>
                 </configuration>
                 <extensions>true</extensions>