Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat...

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

diff --git a/pom.xml b/pom.xml
index 2726333..a55a77a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,7 @@
 
     <properties>
         <java-version>1.6</java-version>
 
     <properties>
         <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>
+        <google.android-version>4.2.2_r2</google.android-version>

         <actionbarsherlock-version>4.2.0</actionbarsherlock-version>
     </properties>
 
         <actionbarsherlock-version>4.2.0</actionbarsherlock-version>
     </properties>
 


@@ -27,19 +26,13 @@
     <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>