[teiid-commits] teiid SVN: r1319 - in trunk/test-integration: common and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-09-10 14:32:02 -0400 (Thu, 10 Sep 2009)
New Revision: 1319

Added:
   trunk/test-integration/common/pom.xml
Removed:
   trunk/test-integration/src/
Modified:
   trunk/test-integration/pom.xml
Log:
Teiid 773 - organize integration test

Added: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml	                        (rev 0)
+++ trunk/test-integration/common/pom.xml	2009-09-10 18:32:02 UTC (rev 1319)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+	<parent>
+		<artifactId>teiid-test-integration</artifactId>
+		<groupId>org.jboss.teiid</groupId>
+		<version>6.2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>common</artifactId>
+
+	<name>Common Integration Tests</name>
+ 	<groupId>org.jboss.teiid.teiid-test-integration</groupId>
+	<description>Common Integration tests that do not require external dependencies</description>
+
+</project>
\ No newline at end of file


Property changes on: trunk/test-integration/common/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml	2009-09-10 18:23:29 UTC (rev 1318)
+++ trunk/test-integration/pom.xml	2009-09-10 18:32:02 UTC (rev 1319)
@@ -8,9 +8,20 @@
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>teiid-test-integration</artifactId>
+  	<packaging>pom</packaging>
 	<name>Integration Tests</name>
 	<description>Integration tests spanning
 		server/embedded/connectors.</description>
+
+	<properties>
+ 		<apache.ant.version>1.7.0</apache.ant.version>
+
+    <!-- Database Driver Versions  -->
+		<mysql.connector.version>5.1.5</mysql.connector.version>
+		<postgresql.version>8.3-603.jdbc3</postgresql.version>
+		<derby.version>10.2.1.6</derby.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.jboss.teiid</groupId>
@@ -52,6 +63,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.teiid</groupId>
+			<artifactId>teiid-connector-metadata</artifactId>
+			<type>test-jar</type>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.teiid</groupId>
 			<artifactId>teiid-client-jdbc</artifactId>
 			<type>test-jar</type>
 		</dependency>
@@ -77,42 +94,46 @@
 			<groupId>org.jboss.teiid.connectors</groupId>
 			<artifactId>connector-loopback</artifactId>
 			<version>${project.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.teiid.connectors</groupId>
 			<artifactId>connector-text</artifactId>
 			<version>${project.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.teiid.connectors</groupId>
 			<artifactId>connector-text</artifactId>
 			<type>test-jar</type>
 			<version>${project.version}</version>
+			<scope>test</scope>
 		</dependency>
+
 		<dependency>
-			<groupId>org.jboss.teiid</groupId>
-			<artifactId>teiid-connector-metadata</artifactId>
-			<type>test-jar</type>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
 			<groupId>org.jboss.teiid.connectors</groupId>
 			<artifactId>connector-jdbc</artifactId>
 			<version>${project.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.teiid.connectors</groupId>
 			<artifactId>connector-jdbc</artifactId>
 			<type>test-jar</type>
 			<version>${project.version}</version>
+			<scope>test</scope>
 		</dependency>
 
 		<!-- external dependencies -->
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.2.1.6</version>
+			<version>${derby.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+  <modules>
+    <module>common</module>
+  </modules>
 </project>
\ No newline at end of file