geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r477888 - in /geronimo/server/trunk/testsuite: console-testsuite/basic/pom.xml deployment-testsuite/test-deployments/pom.xml pom.xml
Date Tue, 21 Nov 2006 21:09:54 GMT
Author: prasad
Date: Tue Nov 21 13:09:53 2006
New Revision: 477888

URL: http://svn.apache.org/viewvc?view=rev&rev=477888
Log:
* moved testng dependency down to the actual testset pom that needs it.
* it was masking junit in those poms that needed junit.

Modified:
    geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
    geronimo/server/trunk/testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml?view=diff&rev=477888&r1=477887&r2=477888
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Tue Nov 21 13:09:53 2006
@@ -29,12 +29,22 @@
     <artifactId>basic</artifactId>
     <name>Geronimo TestSuite, Console :: Basic</name>
     <packaging>jar</packaging>
+
     <description>Basic test for the Geronimo console.
         Note the parent artifactId and the relativePath.
         Since no other build executions are done here, the profile is not explicitly
         defined. It inherits the 'child' profile from parent. maven-maven-plugin:invoke
         executes the 'child' profile.i
     </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <classifier>jdk15</classifier>
+        </dependency>
+    </dependencies>
+
     <profiles>
         <profile>
             <id>child</id>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml?view=diff&rev=477888&r1=477887&r2=477888
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml Tue Nov
21 13:09:53 2006
@@ -39,7 +39,14 @@
         maven-maven-plugin:invoke executes the 'child' profile.
         Since build executions are done here, a 'child' profile is explicitly defined here
to prevent inheriting other configurations and executions from parent.
     </description>
-    
+
+    <dependencies>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <classifier>jdk15</classifier>
+        </dependency>
+    </dependencies>
     
     <profiles>
         <profile>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?view=diff&rev=477888&r1=477887&r2=477888
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Tue Nov 21 13:09:53 2006
@@ -62,6 +62,7 @@
                 <artifactId>testng</artifactId>
                 <classifier>jdk15</classifier>
                 <version>5.1</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.openqa.selenium.client-drivers</groupId>
@@ -77,15 +78,6 @@
     </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <classifier>jdk15</classifier>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-common</artifactId>
             <scope>test</scope>
@@ -274,7 +266,7 @@
                                         <!-- EXAMPLE: Use the following option to re-use
a single installation of the server for all tests -->
                                         <!--
                                         <installDirectory>c:\apache</installDirectory>
-                                        -->
+                                         -->
                                     </configuration>
                                 </execution>
                                 <execution>



Mime
View raw message