pom cleanup

rladstaetter · Jul 20, 2016 · 07e6df5 · 07e6df5
1 parent eb35ca3
commit 07e6df5
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/android-opencv/pom.xml b/android-opencv/pom.xml
@@ -18,8 +18,6 @@
         <dependency>
             <groupId>android</groupId>
             <artifactId>android</artifactId>
-            <version>5.0.1_r2</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -51,6 +51,30 @@
                 <version>2.2.2</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>android</groupId>
+                <artifactId>android</artifactId>
+                <version>5.0.1_r2</version>
+                <!--  <version>6.0_r2</version> -->
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.android.gms</groupId>
+                <artifactId>play-services-ads</artifactId>
+                <version>9.2.0</version>
+                <type>aar</type>
+            </dependency>
+            <dependency>
+                <groupId>net.ladstatt.sudoku</groupId>
+                <artifactId>sudoku-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.ladstatt.sudoku</groupId>
+                <artifactId>android-opencv</artifactId>
+                <version>${project.version}</version>
+                <type>aar</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/sudoku-android/pom.xml b/sudoku-android/pom.xml
@@ -21,7 +21,6 @@
         <dependency>
             <groupId>net.ladstatt.sudoku</groupId>
             <artifactId>sudoku-core</artifactId>
-            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.opencv</groupId>
@@ -32,19 +31,15 @@
         <dependency>
             <groupId>net.ladstatt.sudoku</groupId>
             <artifactId>android-opencv</artifactId>
-            <version>${project.version}</version>
             <type>aar</type>
         </dependency>
         <dependency>
             <groupId>android</groupId>
             <artifactId>android</artifactId>
-            <version>6.0_r2</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.android.gms</groupId>
             <artifactId>play-services-ads</artifactId>
-            <version>9.2.0</version>
             <type>aar</type>
         </dependency>
 

diff --git a/sudoku-core/pom.xml b/sudoku-core/pom.xml
@@ -23,12 +23,10 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.scalacheck</groupId>
             <artifactId>scalacheck_2.11</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.scalatest</groupId>

diff --git a/sudoku-javafx/pom.xml b/sudoku-javafx/pom.xml
@@ -16,7 +16,6 @@
         <dependency>
             <groupId>net.ladstatt.sudoku</groupId>
             <artifactId>sudoku-core</artifactId>
-            <version>1.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jfxtras</groupId>