refactored poms for the batch tools to simplify the maven configuration

4 files changed, 65 insertions, 64 deletions

diff --git a/src/batchtools/headless/pom.xml b/src/batchtools/headless/pom.xml
index 4d51722..1b84aaa 100644
--- a/src/batchtools/headless/pom.xml
+++ b/src/batchtools/headless/pom.xml
@@ -2,12 +2,16 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.galois.fiveui</groupId>
+  <parent>
+    <groupId>com.galois.fiveui</groupId>
+	  <artifactId>BatchTools</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+
   <artifactId>HeadlessRunner</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -63,16 +67,6 @@
 
   <dependencies>
     <dependency>
-    	<groupId>org.seleniumhq.selenium</groupId>
-    	<artifactId>selenium-java</artifactId>
-    	<version>2.33.0</version>
-    </dependency>
-    <dependency>
-    	<groupId>com.google.guava</groupId>
-    	<artifactId>guava</artifactId>
-    	<version>13.0.1</version>
-    </dependency>
-    <dependency>
     	<groupId>com.google.code.gson</groupId>
     	<artifactId>gson</artifactId>
     	<version>2.2.2</version>
@@ -80,17 +74,12 @@
     <dependency>
     	<groupId>com.galois.fiveui</groupId>
     	<artifactId>webdrivers</artifactId>
-    	<version>0.0.1-SNAPSHOT</version>
+    	<version>${project.version}</version>
     </dependency>
     <dependency>
     	<groupId>com.galois.fiveui</groupId>
     	<artifactId>RuleSetTester</artifactId>
-    	<version>1.0</version>
-    </dependency>
-    <dependency>
-    	<groupId>junit</groupId>
-    	<artifactId>junit</artifactId>
-    	<version>4.9</version>
+    	<version>${project.version}</version>
     </dependency>
     <dependency>
     	<groupId>edu.uci.ics</groupId>
diff --git a/src/batchtools/pom.xml b/src/batchtools/pom.xml
index 548cc0f..a572219 100644
--- a/src/batchtools/pom.xml
+++ b/src/batchtools/pom.xml
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.galois.fiveui</groupId>
 	<artifactId>BatchTools</artifactId>
-	<version>1.0</version>
+	<version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -33,4 +33,39 @@
     <module>headless</module>
   </modules>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+    	<groupId>org.seleniumhq.selenium</groupId>
+    	<artifactId>selenium-java</artifactId>
+    	<version>2.33.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>13.0.1</version>
+    </dependency>
+
+
+    <dependency>
+    	<groupId>junit</groupId>
+    	<artifactId>junit</artifactId>
+    	<version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/src/batchtools/rsTester/pom.xml b/src/batchtools/rsTester/pom.xml
index 4cda46b..95d27e3 100644
--- a/src/batchtools/rsTester/pom.xml
+++ b/src/batchtools/rsTester/pom.xml
@@ -21,9 +21,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.galois.fiveui</groupId>
+
+  <parent>
+    <groupId>com.galois.fiveui</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>BatchTools</artifactId>
+    <relativePath>../</relativePath>
+  </parent>
+
 	<artifactId>RuleSetTester</artifactId>
-	<version>1.0</version>
+  <packaging>jar</packaging>
 
   <pluginRepositories>
     <pluginRepository>
@@ -77,16 +84,6 @@
 	</reporting>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-java</artifactId>
-			<version>2.33.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>10.0.1</version>
-		</dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -95,15 +92,7 @@
 		<dependency>
 		    <groupId>com.galois.fiveui</groupId>
 		    <artifactId>webdrivers</artifactId>
-		    <version>0.0.1-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Test dependencies -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
+		    <version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/src/batchtools/webdrivers/pom.xml b/src/batchtools/webdrivers/pom.xml
index bc6bbba..f08b04f 100644
--- a/src/batchtools/webdrivers/pom.xml
+++ b/src/batchtools/webdrivers/pom.xml
@@ -1,29 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.galois.fiveui</groupId>
+
+  <parent>
+    <groupId>com.galois.fiveui</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>BatchTools</artifactId>
+    <relativePath>../</relativePath>
+  </parent>
+
   <artifactId>webdrivers</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
   <name>Web Drivers</name>
-  <description>Wrapper around Selenium Web Driver creation to handle configuration details that we wish to be uniform across all FiveUI applications.</description>
 
-  <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>2.33.0</version>
-        </dependency>
+  <description>Wrapper around Selenium Web Driver creation to handle configuration details that we wish to be uniform across all FiveUI applications.</description>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>10.0.1</version>
-        </dependency>
-  </dependencies>
 </project>