Author: manaRH Date: 2010-09-15 10:24:43 -0400 (Wed, 15 Sep 2010) New Revision: 13754 Removed: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/ Modified: branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml branches/enterprise/JBPAPP_4_3_FP01/build/mail.pom.xml branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml Log: fixing settings for local repository and synchronized testng dependency Modified: branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml 2010-09-14 14:16:10 UTC (rev 13753) +++ branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml 2010-09-15 14:24:43 UTC (rev 13754) @@ -220,13 +220,12 @@ <optional>true</optional> </dependency> - <!-- Surefire can't cope with such a new version of testng, so we have to specify it - here, otherwise ui build fails --> - <dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.6</version> + <version>${version.testng}</version> <optional>true</optional> + <classifier>jdk15</classifier> <exclusions> <exclusion> <groupId>junit</groupId> Modified: branches/enterprise/JBPAPP_4_3_FP01/build/mail.pom.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/build/mail.pom.xml 2010-09-14 14:16:10 UTC (rev 13753) +++ branches/enterprise/JBPAPP_4_3_FP01/build/mail.pom.xml 2010-09-15 14:24:43 UTC (rev 13754) @@ -60,11 +60,12 @@ <scope>provided</scope> </dependency> - <dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.6</version> + <version>${version.testng}</version> <optional>true</optional> + <classifier>jdk15</classifier> <exclusions> <exclusion> <groupId>junit</groupId> Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-09-14 14:16:10 UTC (rev 13753) +++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-09-15 14:24:43 UTC (rev 13754) @@ -9,10 +9,19 @@ <name>JBoss Seam</name> <packaging>pom</packaging> + <repositories> + <repository> + <id>local-repository</id> + <name>Seam Local Repository</name> + <url>file://@local.repo@</url> + </repository> + </repositories> + <!-- Externalize some version numbers here --> <properties> <version.richfaces>3.3.1.SP2</version.richfaces> <version.drools>4.0.7-SOA-P</version.drools> + <version.testng>5.6</version.testng> </properties> <dependencyManagement> @@ -930,7 +939,7 @@ <groupId>emma</groupId> <artifactId>emma</artifactId> <version>2.0.5312</version> - </dependency> + </dependency> </dependencies> </dependencyManagement> @@ -969,7 +978,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> + <version>2.4.3</version> </plugin> <plugin> Modified: branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml 2010-09-14 14:16:10 UTC (rev 13753) +++ branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml 2010-09-15 14:24:43 UTC (rev 13754) @@ -188,11 +188,12 @@ <optional>true</optional> </dependency> - <dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.1</version> + <version>${version.testng}</version> <scope>test</scope> + <optional>true</optional> <classifier>jdk15</classifier> <exclusions> <exclusion>