[jboss-identity-commits] JBoss Identity SVN: r949 - idm/trunk/parent.

Author: bdaw Date: 2009-11-14 06:24:34 -0500 (Sat, 14 Nov 2009) New Revision: 949 Modified: idm/trunk/parent/pom.xml Log: - rearrange maven profiles for hudson jdbc drivers Modified: idm/trunk/parent/pom.xml =================================================================== --- idm/trunk/parent/pom.xml 2009-11-14 10:39:29 UTC (rev 948) +++ idm/trunk/parent/pom.xml 2009-11-14 11:24:34 UTC (rev 949) @@ -82,6 +82,11 @@ <profile> <id>hudson-jdbc-drivers</id> + <activation> + <property> + <name>hudson-jdbc-drivers</name> + </property> + </activation> <repositories> <repository> <id>qa-jdbc-drivers</id> @@ -95,8 +100,17 @@ </repository> </repositories> </profile> + + <!--Oracle--> + <profile> - <id>hudson-ojdbc14</id> + <id>hudson-oracle9i</id> + <activation> + <property> + <name>dataSourceName</name> + <value>oracle9i</value> + </property> + </activation> <dependencies> <dependency> <groupId>com.oracle</groupId> @@ -107,18 +121,30 @@ </dependencies> </profile> <profile> - <id>hudson-jconnect</id> + <id>hudson-oracle10g</id> + <activation> + <property> + <name>dataSourceName</name> + <value>oracle10g</value> + </property> + </activation> <dependencies> <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>6.0.5</version> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>10.2.0.4</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>hudson-ojdbc5</id> + <id>hudson-oracle11R1</id> + <activation> + <property> + <name>dataSourceName</name> + <value>oracle11R1</value> + </property> + </activation> <dependencies> <dependency> <groupId>com.oracle</groupId> @@ -129,35 +155,53 @@ </dependencies> </profile> <profile> - <id>hudson-ojdbc6</id> + <id>hudson-oracle11R1-RAC</id> + <activation> + <property> + <name>dataSourceName</name> + <value>oracle11R1-RAC</value> + </property> + </activation> <dependencies> <dependency> <groupId>com.oracle</groupId> - <artifactId>ojdbc6</artifactId> + <artifactId>ojdbc5</artifactId> <version>11.1.0.7.0</version> <scope>test</scope> </dependency> </dependencies> </profile> + + <!--Sybase--> + <profile> - <id>hudson-db2jcc-31</id> + <id>hudson-sybase152</id> + <activation> + <property> + <name>dataSourceName</name> + <value>sybase152</value> + </property> + </activation> <dependencies> <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.1.57</version> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> <scope>test</scope> </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.1.57</version> - <scope>test</scope> - </dependency> </dependencies> </profile> + + <!--DB2--> + <profile> - <id>hudson-db2jcc-38</id> + <id>hudson-db291</id> + <activation> + <property> + <name>dataSourceName</name> + <value>db291</value> + </property> + </activation> <dependencies> <dependency> <groupId>com.ibm</groupId> @@ -173,25 +217,34 @@ </dependency> </dependencies> </profile> + + <!--MS SQLServer--> + <profile> - <id>hudson-db2jcc-357</id> + <id>hudson-sqlserver2005</id> + <activation> + <property> + <name>dataSourceName</name> + <value>sqlserver2005</value> + </property> + </activation> <dependencies> <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.57.86</version> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>2.0.1008.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.57.86</version> - <scope>test</scope> - </dependency> </dependencies> </profile> <profile> - <id>hudson-msjdbc</id> + <id>hudson-sqlserver2008</id> + <activation> + <property> + <name>dataSourceName</name> + <value>sqlserver2008</value> + </property> + </activation> <dependencies> <dependency> <groupId>com.microsoft.sqlserver</groupId> @@ -201,8 +254,17 @@ </dependency> </dependencies> </profile> + + <!--PostgreSQL--> + <profile> - <id>hudson-postgresql-82</id> + <id>hudson-postgresql8</id> + <activation> + <property> + <name>dataSourceName</name> + <value>postgresql8</value> + </property> + </activation> <dependencies> <dependency> <groupId>postgresql</groupId> @@ -213,100 +275,181 @@ </dependency> </dependencies> </profile> + + <!--MySQL--> + <profile> - <id>hudson-postgresql-83</id> + <id>hudson-mysql4</id> + <activation> + <property> + <name>dataSourceName</name> + <value>mysql4</value> + </property> + </activation> <dependencies> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-604</version> - <classifier>jdbc3</classifier> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.8</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>hudson-postgresql-83-jdbc4</id> + <id>hudson-mysql50</id> + <activation> + <property> + <name>dataSourceName</name> + <value>mysql50</value> + </property> + </activation> <dependencies> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-604</version> - <classifier>jdbc4</classifier> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.8</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>hudson-mysql-508</id> + <id>hudson-mysql51</id> + <activation> + <property> + <name>dataSourceName</name> + <value>mysql51</value> + </property> + </activation> <dependencies> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.0.8</version> + <version>5.1.7</version> <scope>test</scope> </dependency> </dependencies> </profile> + + + <!--Unused drivers:--> <profile> - <id>hudson-mysql-517</id> + <id>hudson-postgresql-83</id> <dependencies> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.7</version> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-604</version> + <classifier>jdbc3</classifier> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>provided-jdbc-driver</id> + <id>hudson-postgresql-83-jdbc4</id> <dependencies> <dependency> - <groupId>privided</groupId> - <artifactId>jdbc-driver</artifactId> - <version>NA</version> - <scope>system</scope> - <systemPath>${provided.jdbc.driver.path}</systemPath> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-604</version> + <classifier>jdbc4</classifier> + <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>provided-jdbc-driver2</id> + <id>hudson-db2jcc-357</id> <dependencies> <dependency> - <groupId>privided</groupId> - <artifactId>jdbc-driver2</artifactId> - <version>NA</version> - <scope>system</scope> - <systemPath>${provided.jdbc.driver.path2}</systemPath> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.57.86</version> + <scope>test</scope> </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.57.86</version> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> - <id>provided-jdbc-driver3</id> + <id>hudson-db2jcc-31</id> <dependencies> <dependency> - <groupId>privided</groupId> - <artifactId>jdbc-driver3</artifactId> - <version>NA</version> - <scope>system</scope> - <systemPath>${provided.jdbc.driver.path3}</systemPath> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + <scope>test</scope> </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> - <id>provided-jdbc-driver4</id> + <id>hudson-ojdbc6</id> <dependencies> <dependency> - <groupId>privided</groupId> - <artifactId>jdbc-driver4</artifactId> - <version>NA</version> - <scope>system</scope> - <systemPath>${provided.jdbc.driver.path4}</systemPath> + <groupId>com.oracle</groupId> + <artifactId>ojdbc6</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> </dependency> </dependencies> </profile> + + <!--<profile>--> + <!--<id>provided-jdbc-driver</id>--> + <!--<dependencies>--> + <!--<dependency>--> + <!--<groupId>privided</groupId>--> + <!--<artifactId>jdbc-driver</artifactId>--> + <!--<version>NA</version>--> + <!--<scope>system</scope>--> + <!--<systemPath>${provided.jdbc.driver.path}</systemPath>--> + <!--</dependency>--> + <!--</dependencies>--> + <!--</profile>--> + <!--<profile>--> + <!--<id>provided-jdbc-driver2</id>--> + <!--<dependencies>--> + <!--<dependency>--> + <!--<groupId>privided</groupId>--> + <!--<artifactId>jdbc-driver2</artifactId>--> + <!--<version>NA</version>--> + <!--<scope>system</scope>--> + <!--<systemPath>${provided.jdbc.driver.path2}</systemPath>--> + <!--</dependency>--> + <!--</dependencies>--> + <!--</profile>--> + <!--<profile>--> + <!--<id>provided-jdbc-driver3</id>--> + <!--<dependencies>--> + <!--<dependency>--> + <!--<groupId>privided</groupId>--> + <!--<artifactId>jdbc-driver3</artifactId>--> + <!--<version>NA</version>--> + <!--<scope>system</scope>--> + <!--<systemPath>${provided.jdbc.driver.path3}</systemPath>--> + <!--</dependency>--> + <!--</dependencies>--> + <!--</profile>--> + <!--<profile>--> + <!--<id>provided-jdbc-driver4</id>--> + <!--<dependencies>--> + <!--<dependency>--> + <!--<groupId>privided</groupId>--> + <!--<artifactId>jdbc-driver4</artifactId>--> + <!--<version>NA</version>--> + <!--<scope>system</scope>--> + <!--<systemPath>${provided.jdbc.driver.path4}</systemPath>--> + <!--</dependency>--> + <!--</dependencies>--> + <!--</profile>--> </profiles> <repositories>