[exo-jcr-commits] exo-jcr SVN: r297 - jcr/trunk/component/core.

Author: pnedonosko Date: 2009-10-19 09:30:46 -0400 (Mon, 19 Oct 2009) New Revision: 297 Modified: jcr/trunk/component/core/pom.xml Log: EXOJCR-164: JCR pom formatting Modified: jcr/trunk/component/core/pom.xml =================================================================== --- jcr/trunk/component/core/pom.xml 2009-10-19 13:04:34 UTC (rev 296) +++ jcr/trunk/component/core/pom.xml 2009-10-19 13:30:46 UTC (rev 297) @@ -1,12 +1,13 @@ <!-- - Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software - Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General - Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. + Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is + distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with + this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: + http://www.fsf.org. --> - <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"> <modelVersion>4.0.0</modelVersion> @@ -110,9 +111,11 @@ </dependency> <!-- JOTM comes from exo.kernel.component.common --> + <!-- - dependency> <groupId>jotm</groupId> <artifactId>jotm</artifactId> <scope>compile</scope> <exclusions> <exclusion> <groupId>javax.resource</groupId> <artifactId>connector</artifactId> - </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> </exclusions> </dependency + dependency> <groupId>jotm</groupId> <artifactId>jotm</artifactId> <scope>compile</scope> <exclusions> <exclusion> <groupId>javax.resource</groupId> + <artifactId>connector</artifactId> </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> </exclusions> + </dependency --> <dependency> @@ -165,74 +168,97 @@ </dependency> <!-- For MySQL support --> - <!-- dependency> + <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.0.5</version> <scope>test</scope> - </dependency --> + </dependency> <!-- For PostgresSQL support --> - <!-- - dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> <version>8.2-504.jdbc3</version> <scope>compile</scope> </dependency - --> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504.jdbc3</version> + <scope>compile</scope> + </dependency> <!-- For Oracle 10g support (local-jcr repository) --> - <!-- - dependency> <groupId>ojdbc</groupId> <artifactId>ojdbc</artifactId> <version>14</version> <scope>compile</scope> </dependency> <dependency> <groupId>ojdbc</groupId> - <artifactId>orai18n</artifactId> <version>14</version> <scope>compile</scope> </dependency - --> + <dependency> + <groupId>ojdbc</groupId> + <artifactId>ojdbc</artifactId> + <version>14</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>ojdbc</groupId> + <artifactId>orai18n</artifactId> + <version>14</version> + <scope>compile</scope> + </dependency> <!-- For IBM DB2 support (local-jcr repository) --> - <!-- - dependency> <groupId>com.ibm.db2</groupId> <artifactId>db2jcc</artifactId> <version>9.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc_license_cu</artifactId> <version>9.1</version> <scope>compile</scope> </dependency - --> + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc</artifactId> + <version>9.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>9.1</version> + <scope>compile</scope> + </dependency> <!-- For MS SQL 7/2000/2005 and Sybase ASE/Anywhere support (jTDS driver) --> - <!-- dependency> + <dependency> <groupId>net.sourceforge.jtds</groupId> <artifactId>jtds</artifactId> <version>1.2</version> <scope>compile</scope> - </dependency --> + </dependency> <!-- For MS SQL 2005 support (Microsoft JDBC driver) (local-jcr repository) --> - <!-- - dependency> <groupId>com.microsoft.sqlserver</groupId> <artifactId>sqljdbc</artifactId> <version>9.0</version> <scope>compile</scope> </dependency - --> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>sqljdbc</artifactId> + <version>9.0</version> + <scope>compile</scope> + </dependency> <!-- For Sybase ASE/Anywhere support (jConnect driver) (local-jcr repository) --> - <!-- dependency> + <dependency> <groupId>com.sybase.jdbc3.jdbc</groupId> <artifactId>jconn3</artifactId> <version>6.05</version> <scope>compile</scope> - </dependency --> + </dependency> <!-- For Apache Derby support (aka JavaDB) --> - <!-- dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>10.2.2.0</version> <scope>compile</scope> - </dependency --> + </dependency> <!-- Ingres Database (local repository) --> - <!-- dependency> + <dependency> <groupId>com.ingres.jdbc</groupId> <artifactId>iijdbc</artifactId> <version>9.2</version> <scope>test</scope> - </dependency --> + </dependency> <!-- H2 Database --> - <!--dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.0.74</version> <scope>compile</scope> - </dependency --> + </dependency> + <!-- ======================================================================= --> </dependencies> @@ -454,6 +480,7 @@ </plugin> </plugins> </build> + <profiles> <!-- ***************** --> <!-- INTEGRATION TESTS --> @@ -532,14 +559,40 @@ <!-- debug mode: mvn -Dmaven.test.skip=false -Dexo.tck.skip=false -DforkMode=never clean install --> <!-- forking: to run both eXo test and TCK use forkMode=once, to run one of them (only) in Eclipse debug use forkMode=never --> <executions> - <!-- - execution> <id>execution2 - pause 10 sec</id> <phase>test</phase> <goals> <goal>test</goal> </goals> <configuration> <skip>${exo.tck.skip}</skip> <includes> - <include>**/util/Sleeping10Seconds.java</include> </includes> </configuration> </execution> <execution> <id>execution3 - TCK init section</id> <phase>test</phase> <goals> - <goal>test</goal> </goals> <configuration> <skip>${exo.tck.skip}</skip> <argLine>-Xmx512M</argLine> <systemProperties> <property> <name>jcr.test.configuration.file</name> - <value>${jcr.test.configuration.file}</value> </property> </systemProperties> <includes> <include>org/exoplatform/services/jcr/integration/PrepareTestRepository.java</include> - </includes> </configuration> </execution - --> <execution> + <id>execution2 - pause 10 sec</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>${exo.tck.skip}</skip> + <includes> + <include>**/util/Sleeping10Seconds.java</include> + </includes> + </configuration> + </execution> + <!-- execution> + <id>execution3 - TCK init section</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>${exo.tck.skip}</skip> + <argLine>-Xmx512M</argLine> + <systemProperties> + <property> + <name>jcr.test.configuration.file</name> + <value>${jcr.test.configuration.file}</value> + </property> + </systemProperties> + <includes> + <include>org/exoplatform/services/jcr/integration/PrepareTestRepository.java</include> + </includes> + </configuration> + </execution --> + <execution> <id>execution4 - pause 10 sec</id> <phase>test</phase> <goals>