[teiid-commits] teiid SVN: r1770 - trunk/test-integration/db.

Author: vhalbert(a)redhat.com Date: 2010-01-21 18:55:26 -0500 (Thu, 21 Jan 2010) New Revision: 1770 Modified: trunk/test-integration/db/pom.xml Log: Teiid-773 - adjust the pom so that it builds based on it's parent pom information Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2010-01-21 21:27:25 UTC (rev 1769) +++ trunk/test-integration/db/pom.xml 2010-01-21 23:55:26 UTC (rev 1770) @@ -7,17 +7,11 @@ build for Teiid. --> - -<!-- <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.0.0-SNAPSHOT</version> </parent> - - <packaging>pom</packaging> - - --> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-db</artifactId> @@ -27,39 +21,7 @@ <description>Integration tests that require external database dependencies </description> <version>7.0.0-SNAPSHOT</version> - <properties> - <site.url>http://www.jboss.org/teiid</site.url> - <derby.version>10.2.1.6</derby.version> - <mysql.connector.version>5.1.5</mysql.connector.version> - <postgresql.version>8.3-603.jdbc3</postgresql.version> - - <apache.ant.version>1.7.0</apache.ant.version> - </properties> - <scm> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk<... - </scm> - <licenses> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - <comments>A business-friendly OSS license</comments> - </license> - </licenses> - - <repositories> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2/</url> - </repository> - <repository> - <id>jboss-snapshot</id> - <url>http://snapshots.jboss.org/maven2</url> - </repository> - </repositories> - - <dependencies> <dependency> @@ -70,121 +32,19 @@ <dependency> <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-metadata</artifactId> - <version>${project.version}</version> + <artifactId>teiid-client-jdbc</artifactId> + <type>test-jar</type> + <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-connector-api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-txn-jbossts</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- internal dependencies that are only used by integration testing --> - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-runtime</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-loopback</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-text</artifactId> - <version>${project.version}</version> - </dependency> - - - <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>connector-jdbc</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-engine</artifactId> - <version>${project.version}</version> <type>test-jar</type> + <scope>provided</scope> </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client-jdbc</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.jboss.teiid</groupId> - <artifactId>teiid-client</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${apache.ant.version}</version> - </dependency> - - <!-- external dependencies --> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgresql.version}</version> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${mysql.connector.version}</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> - <version>${derby.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - - </dependency> - - <dependency> <groupId>ant-contrib</groupId> <artifactId>cpptasks</artifactId> <version>1.0b3</version> @@ -250,6 +110,34 @@ <showWarnings>false</showWarnings> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/assembly/binaries.xml</descriptor> + </descriptors> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -528,11 +416,7 @@ <profile> <id>assemble</id> <!-- assemble will compile, but not run the tests prior to assemblying the kit --> - <activation> - <property> - <name>qe.artifacts</name> - </property> - </activation> + <build> <plugins> @@ -545,36 +429,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${apache.ant.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <!-- zip up the qe artificats --> - - <id>assembly-qe-artifacxts</id> - <phase>package</phase> - <configuration> - <tasks> - <zip destfile="target/qe_artifacts.zip"> - <zipfileset dir="${qe.artifacts}" prefix="qe_artifacts" /> - </zip> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> <configuration> @@ -582,15 +436,8 @@ <descriptor>src/assembly/binaries.xml</descriptor> </descriptors> <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> + <workDirectory>target/work/assembly</workDirectory> - <systemProperties> - <property> - <name>qe.artifacts.file</name> - <value>target/qe_artifacts.zip</value> - </property> - </systemProperties> - </configuration> <executions>