Exclude common-logging from the cucumber-android dependencies

PR #742 missed to exclude the common-logging from the cucumber-android dependencies.
cucumber · Jul 28, 2014 · c7dc4d6 · c7dc4d6
1 parent 9a9a51f
commit c7dc4d6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.1.8" package="cucumber.api.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.1.9-SNAPSHOT" package="cucumber.api.android">
 </manifest>
diff --git a/android/pom.xml b/android/pom.xml
@@ -44,16 +44,12 @@
             <artifactId>robolectric</artifactId>
             <version>2.1.1</version>
             <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <version>4.1.1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <version>4.1.1.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -424,6 +424,12 @@
                 <artifactId>android</artifactId>
                 <version>${android.version}</version>
                 <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>