geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r650905 [1/2] - in /geronimo/server/trunk/testsuite: ./ console-testsuite/ console-testsuite/advanced/ console-testsuite/basic/ corba-testsuite/ corba-testsuite/corba-helloworld/ corba-testsuite/corba-helloworld/corba-helloworld-client/ cor...
Date Wed, 23 Apr 2008 15:30:40 GMT
Author: jdillon
Date: Wed Apr 23 08:30:16 2008
New Revision: 650905

URL: http://svn.apache.org/viewvc?rev=650905&view=rev
Log:
Pom cleanup

Modified:
    geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>console-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>advanced</artifactId>

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?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>console-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>basic</artifactId>

Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>console-testsuite</artifactId>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-helloworld</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-helloworld-client</artifactId>
@@ -36,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-ejb</artifactId>
             <version>${version}</version>
             <type>ejb</type>
@@ -44,12 +43,13 @@
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-war</artifactId>
             <version>${version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
@@ -60,6 +60,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <description>Geronimo Hello World Enterprise Application CORBA Client JAR</description>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -40,19 +40,21 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-ejb</artifactId>
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
+        
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-war</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
+        
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-client</artifactId>
             <version>${version}</version>
             <type>jar</type>
@@ -64,7 +66,6 @@
           <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
                 <executions>
                     <execution>
                         <id>generate-surefire-xml</id>
@@ -84,6 +85,7 @@
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <description>Geronimo Hello World Enterprise Application EAR</description>
@@ -109,6 +111,7 @@
                     </modules>
                 </configuration>
             </plugin>
+            
             <!-- Deploy the ear and invoke the imbedded CORBA app client  -->
             <!-- ======================================================== -->
             <!-- ===================================================================== -->
@@ -130,7 +133,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>geronimo-maven-plugin</artifactId>
-
                 <executions>
                     <!-- ============================================================================= -->
                     <!-- These modules must be running before deploying a CORBA module can be deployed -->
@@ -213,7 +215,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml Wed Apr 23 08:30:16 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-helloworld</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-helloworld-ejb</artifactId>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-helloworld</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-helloworld-war</artifactId>
@@ -36,16 +35,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-ejb</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-helloworld</artifactId>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-marshal</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-marshal-client</artifactId>
@@ -36,12 +35,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-marshal-ejb</artifactId>
             <version>${version}</version>
             <type>ejb</type>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
@@ -52,6 +52,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <description>Geronimo Marshal Enterprise Application CORBA Client JAR</description>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-marshal</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-marshal-ear</artifactId>
@@ -40,13 +39,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-marshal-ejb</artifactId>
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-marshal-client</artifactId>
             <version>${version}</version>
             <type>jar</type>
@@ -58,7 +57,6 @@
           <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
                 <executions>
                     <execution>
                         <id>generate-surefire-xml</id>
@@ -78,6 +76,7 @@
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <description>Geronimo Marshal Enterprise Application EAR</description>
@@ -85,12 +84,12 @@
                     <version>5</version>
                     <modules>
                         <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>corba-marshal-ejb</artifactId>
                             <bundleFileName>corba-marshal-ejb-${version}.jar</bundleFileName>
                         </ejbModule>
                         <jarModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>corba-marshal-client</artifactId>
                             <bundleFileName>corba-marshal-client-${version}.jar</bundleFileName>
                         </jarModule>
@@ -167,7 +166,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml Wed Apr 23 08:30:16 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-marshal</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-marshal-ejb</artifactId>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-marshal</artifactId>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-mytime</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-mytime-ear</artifactId>
@@ -40,17 +39,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-mytime-ejb</artifactId>
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
+        
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-mytime-war</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
@@ -64,7 +65,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
                 <executions>
                     <execution>
                         <id>generate-surefire-xml</id>
@@ -84,6 +84,7 @@
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <description>Geronimo My Time Enterprise Application EAR</description>
@@ -199,7 +200,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>corba-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>corba-mytime</artifactId>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Geronimo TestSuite :: CORBA TestSuite</name>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>deployment-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>deployment-tests</artifactId>
@@ -73,15 +72,15 @@
                                 </goals>
                                 <configuration>
                                     <modules>
-                                      <!-- Deploy only 1 module until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
-<!--
-                                           <module>
-                                               <groupId>org.apache.geronimo.testsupport</groupId>
-                                               <artifactId>test-ear-j2ee_1.3</artifactId>
-                                               <version>${version}</version>
-                                               <type>ear</type>
-                                           </module>
-  -->
+                                        <!-- Deploy only 1 module until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
+                                        <!--
+                                        <module>
+                                            <groupId>org.apache.geronimo.testsupport</groupId>
+                                            <artifactId>test-ear-j2ee_1.3</artifactId>
+                                            <version>${version}</version>
+                                            <type>ear</type>
+                                        </module>
+                                        -->
                                         
                                         <module>
                                             <groupId>org.apache.geronimo.testsupport</groupId>
@@ -92,9 +91,8 @@
                                     </modules>
                                 </configuration>
                             </execution>
-                            
-                                      <!-- Comment the following block until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
-<!--
+                                <!-- Comment the following block until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
+                                <!--
                                <execution>
                                    <id>undeploy-ear-as-module</id>
                                    <phase>post-integration-test</phase>
@@ -112,7 +110,7 @@
                                        </modules>
                                    </configuration>
                                </execution>
-  -->
+                               -->
                             
                             <execution>
                                 <id>undeploy-ear-as-moduleId</id>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -15,13 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
+<!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jca-cms-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jca-cms-ear</artifactId>
@@ -34,6 +36,7 @@
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <type>rar</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jca-cms-war</artifactId>
@@ -47,7 +50,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
                 <executions>
                     <execution>
                         <id>generate-surefire-xml</id>
@@ -67,6 +69,7 @@
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <displayName>Manifest Classpath Itest ear</displayName>
@@ -102,10 +105,10 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>selenium-maven-plugin</artifactId>
             </plugin>
-                    
 
              <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <executions>
                     <execution>
@@ -118,6 +121,7 @@
 
             <!-- "ear" packaging doesn't process test resources -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Wed Apr 23 08:30:16 2008
@@ -22,7 +22,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jca-cms-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jca-cms-war</artifactId>
@@ -35,11 +34,13 @@
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/pom.xml Wed Apr 23 08:30:16 2008
@@ -15,8 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
+<!-- $Rev$ $Date$ -->
+
 <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>
+
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>deployment-testsuite</artifactId>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -21,7 +21,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>manifestcp-ear</artifactId>
@@ -78,6 +77,7 @@
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <displayName>Manifest Classpath Itest ear</displayName>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml Wed Apr 23 08:30:16 2008
@@ -21,13 +21,21 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>manifestcp-ejb</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EJB</name>
     <packaging>ejb</packaging>
-
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>manifestcp-jar</artifactId>
+            <version>${version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
@@ -43,13 +51,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>manifestcp-jar</artifactId>
-            <version>${version}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
 </project>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml Wed Apr 23 08:30:16 2008
@@ -21,7 +21,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>manifestcp-jar</artifactId>
@@ -39,4 +38,5 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
+
 </project>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml Wed Apr 23 08:30:16 2008
@@ -21,7 +21,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>manifestcp-jar2</artifactId>
@@ -35,4 +34,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
 </project>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml Wed Apr 23 08:30:16 2008
@@ -22,7 +22,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>manifestcp-war-jar</artifactId>
@@ -34,6 +33,7 @@
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-jar2</artifactId>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml Wed Apr 23 08:30:16 2008
@@ -22,7 +22,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>manifestcp-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>manifestcp-war</artifactId>
@@ -54,4 +53,5 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
 </project>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Wed Apr 23 08:30:16 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>deployment-testsuite</artifactId>
@@ -71,6 +70,7 @@
                           That expects it's parent (this pom) to be installed already.
                           So installing it ahead before we invoke it in the integration-test phase
                         -->
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-install-plugin</artifactId>
                         <inherited>false</inherited>
                         <executions>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>ejb-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>ejb-ear</artifactId>
@@ -125,6 +124,7 @@
 
             <!-- "ear" packaging doesn't process test resources -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <executions>
                     <execution>
@@ -137,6 +137,7 @@
 
             <!-- "ear" packaging doesn't process test resources -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -174,7 +175,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>ejb-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>ejb-ejb</artifactId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>ejb-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>ejb-war</artifactId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml Wed Apr 23 08:30:16 2008
@@ -21,20 +21,19 @@
 <!-- $Rev$ $Date$ -->
 
 <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>
-    
+
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>enterprise-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>ejbcontainer-tests</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Container Tests</name>
     <packaging>jar</packaging>
-    
+
     <description>
         Tests for the ejb modules
     </description>
@@ -46,7 +45,7 @@
             <version>${openejbVersion}</version>
             <type>test-jar</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-itests-core</artifactId>
@@ -60,16 +59,16 @@
         So excluding it here from transitive dependency.
         http://jira.codehaus.org/browse/MSUREFIRE-184
         -->
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-selenium</artifactId>
             <scope>test</scope>
-                <exclusions>
-                  <exclusion>
-                        <groupId>org.testng</groupId>
-                        <artifactId>testng</artifactId>
-                  </exclusion>
-                </exclusions>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.testng</groupId>
+                    <artifactId>testng</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -78,15 +77,14 @@
             <id>child</id>
             <build>
 
-              <testResources>
-                <testResource>
-                  <directory>src/test/resources</directory>
-                  <filtering>true</filtering>
-                </testResource>
-              </testResources>
+                <testResources>
+                    <testResource>
+                        <directory>src/test/resources</directory>
+                        <filtering>true</filtering>
+                    </testResource>
+                </testResources>
 
                 <plugins>
-
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -105,17 +103,17 @@
                                             <type>jar</type>
                                             <plan>${project.build.directory}/test-classes/META-INF/junit-plan.xml</plan>
                                         </module>
-                                          <module>
-                                              <groupId>org.apache.openejb</groupId>
-                                              <artifactId>openejb-itests-core</artifactId>
-                                              <version>${openejbVersion}</version>
-                                              <type>jar</type>
-                                              <plan>${project.build.directory}/test-classes/META-INF/openejb-jar.xml</plan>
-                                          </module>
+                                        <module>
+                                            <groupId>org.apache.openejb</groupId>
+                                            <artifactId>openejb-itests-core</artifactId>
+                                            <version>${openejbVersion}</version>
+                                            <type>jar</type>
+                                            <plan>${project.build.directory}/test-classes/META-INF/openejb-jar.xml</plan>
+                                        </module>
                                     </modules>
                                 </configuration>
                             </execution>
-                            
+
                             <execution>
                                 <id>undeploy-modules</id>
                                 <phase>post-integration-test</phase>
@@ -124,12 +122,12 @@
                                 </goals>
                                 <configuration>
                                     <modules>
-                                          <module>
-                                              <groupId>org.apache.openejb</groupId>
-                                              <artifactId>openejb-itests-core</artifactId>
-                                              <version>${openejbVersion}</version>
-                                              <type>car</type>
-                                          </module>
+                                        <module>
+                                            <groupId>org.apache.openejb</groupId>
+                                            <artifactId>openejb-itests-core</artifactId>
+                                            <version>${openejbVersion}</version>
+                                            <type>car</type>
+                                        </module>
                                         <module>
                                             <groupId>junit</groupId>
                                             <artifactId>junit</artifactId>
@@ -145,4 +143,5 @@
             </build>
         </profile>
     </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jms-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jms-ear</artifactId>
@@ -40,15 +39,14 @@
     </description>
 
     <dependencies>
-
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jms-war</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jms-ejb</artifactId>
             <version>${version}</version>
             <type>ejb</type>
@@ -69,6 +67,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <displayName>Geronimo Test EAR for JMS</displayName>
@@ -76,13 +75,13 @@
                     <version>1.4</version>
                     <modules>
                         <webModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>jms-war</artifactId>
                             <contextRoot>/testjms</contextRoot>
                             <bundleFileName>web.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>jms-ejb</artifactId>
                             <bundleFileName>ejb.jar</bundleFileName>
                         </ejbModule>
@@ -93,7 +92,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
                 <executions>
                     <execution>
                         <id>generate-surefire-xml</id>
@@ -124,6 +122,7 @@
 
             <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <executions>
                     <execution>
@@ -136,6 +135,7 @@
 
             <!-- "ear" packaging doesn't process test resources -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -178,10 +178,7 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
-
     </build>
-    
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Wed Apr 23 08:30:16 2008
@@ -16,17 +16,17 @@
   limitations under the License.
 -->
 <project>
-  <parent>
-    <artifactId>jms-tests</artifactId>
+    <parent>
+        <artifactId>jms-tests</artifactId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>2.2-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.geronimo.testsuite</groupId>
-  <artifactId>jms-ejb</artifactId>
-  <name>jms-ejb</name>
+    <artifactId>jms-ejb</artifactId>
+    <name>jms-ejb</name>
     <packaging>ejb</packaging>
-  <dependencies>
+    <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
@@ -45,17 +45,18 @@
             <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-ejb-plugin</artifactId>
+                <configuration>
+                    <ejbVersion>3.0</ejbVersion>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-ejb-plugin</artifactId>
-        <configuration>
-          <ejbVersion>3.0</ejbVersion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jms-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jms-war</artifactId>
@@ -40,7 +39,6 @@
     </description>
 
     <dependencies>
-        
       <!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -67,7 +65,6 @@
             <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml Wed Apr 23 08:30:16 2008
@@ -38,7 +38,8 @@
         </profile>
     </profiles>
 
-  <modules>
-    <module>jms-ejb</module>
-  </modules>
+    <modules>
+        <module>jms-ejb</module>
+    </modules>
+
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -25,6 +25,7 @@
         <artifactId>jpa-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
+    
     <artifactId>jpa-ear</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EAR</name>
     <packaging>ear</packaging>
@@ -49,7 +50,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
                 <executions>
                     <execution>
                         <id>generate-surefire-xml</id>
@@ -69,6 +69,7 @@
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <displayName>jpa Itest ear</displayName>
@@ -102,6 +103,7 @@
 
             <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <executions>
                     <execution>
@@ -114,6 +116,7 @@
 
             <!-- "ear" packaging doesn't process test resources -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -156,10 +159,7 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
-    
-
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Wed Apr 23 08:30:16 2008
@@ -60,12 +60,12 @@
             <artifactId>xercesImpl</artifactId>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -96,6 +96,7 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ejb-plugin</artifactId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>enterprise-testsuite</artifactId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Wed Apr 23 08:30:16 2008
@@ -50,7 +50,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
-                <version>${version}</version>
                 <executions>
                     <execution>
                         <id>generate-surefire-xml</id>
@@ -70,6 +69,7 @@
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <displayName>security Itest ear</displayName>
@@ -103,6 +103,7 @@
 
             <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <executions>
                     <execution>
@@ -115,6 +116,7 @@
 
             <!-- "ear" packaging doesn't process test resources -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -157,10 +159,7 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
-    
-
 
 </project>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Wed Apr 23 08:30:16 2008
@@ -23,7 +23,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>sec-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>sec-ejb</artifactId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml Wed Apr 23 08:30:16 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>sec-tests</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>sec-war</artifactId>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Wed Apr 23 08:30:16 2008
@@ -46,14 +46,11 @@
     </description>
     
     <dependencyManagement>
-        <!-- mainatain the versioning of all dependencies in this one common location here. -->
         <dependencies>
-            <!-- testsupport-selenium brings with it testsupport-common, selenium and testng dependencies -->
             <dependency>
                 <groupId>org.apache.geronimo.testsupport</groupId>
                 <artifactId>testsupport-selenium</artifactId>
                 <version>${version}</version>
-                <scope>compile</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -91,15 +88,18 @@
                     <artifactId>testsuite-maven-plugin</artifactId>
                     <version>${version}</version>
                 </plugin>
+                
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
                     <configuration>
                         <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                     </configuration>
                 </plugin>
+                
                 <!--
-                     FIXME: Need to reset the default values here since our parent sets up wars
-                     for use with jspc.  Remove once parent pom has been fixed.
+                 FIXME: Need to reset the default values here since our parent sets up wars
+                        for use with jspc.  Remove once parent pom has been fixed.
                  -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -117,10 +117,10 @@
                         </webResources>
                     </configuration>
                 </plugin>
+                
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3</version>
                     <configuration>
                         <skip>true</skip>
                     </configuration>
@@ -148,6 +148,7 @@
                         </execution>
                     </executions>
                 </plugin>
+                
                 <plugin>
                     <groupId>org.apache.geronimo.genesis.plugins</groupId>
                     <artifactId>maven-maven-plugin</artifactId>
@@ -198,6 +199,7 @@
                         </execution>
                     </executions>
                 </plugin>
+                
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
@@ -209,6 +211,7 @@
                         </reporters>
                     </configuration>
                 </plugin>
+                
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>selenium-maven-plugin</artifactId>
@@ -228,17 +231,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
     <distributionManagement>
@@ -254,15 +246,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
             </plugin>
-            <!-- This should actually be configured in genesis:project-config -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <source>1.5</source>
-                </configuration>
-            </plugin>
         </plugins>
     </reporting>
     
@@ -275,7 +258,6 @@
             <build>
                 <pluginManagement>
                     <plugins>
-
                         <plugin>
                             <groupId>org.apache.geronimo.buildsupport</groupId>
                             <artifactId>geronimo-maven-plugin</artifactId>
@@ -354,7 +336,6 @@
             </build>
         </profile>
         
-
         <profile>
             <id>common</id>
             <build>
@@ -387,25 +368,4 @@
             <id>child</id>
         </profile>
     </profiles>
-
-    <repositories>
-        <!--
-        NOTE: This is useful to run the testsuite on any machine, independent of the Geronimo build.
-        scm location svn co https://svn.apache.org/repos/asf/geronimo/server/trunk/testsuite
-        -->
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
 </project>

Modified: geronimo/server/trunk/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>security-testsuite</artifactId>
@@ -76,6 +75,7 @@
                           That expects it's parent (this pom) to be installed already.
                           So installing it ahead before we invoke it in the integration-test phase
                         -->
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-install-plugin</artifactId>
                         <inherited>false</inherited>
                         <executions>
@@ -98,13 +98,11 @@
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
                     </plugin>
-                    
-                     
+
                     <plugin>
                         <groupId>org.apache.geronimo.genesis.plugins</groupId>
                         <artifactId>maven-maven-plugin</artifactId>
                     </plugin>
-
                 </plugins>
             </build>
         </profile>

Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>security-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>test-security</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>web-testsuite</artifactId>
@@ -86,6 +85,7 @@
                           That expects it's parent (this pom) to be installed already.
                           So installing it ahead before we invoke it in the integration-test phase
                         -->
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-install-plugin</artifactId>
                         <inherited>false</inherited>
                         <executions>
@@ -109,7 +109,6 @@
                         <artifactId>geronimo-maven-plugin</artifactId>
                     </plugin>
                     
-                     
                     <plugin>
                         <groupId>org.apache.geronimo.genesis.plugins</groupId>
                         <artifactId>maven-maven-plugin</artifactId>
@@ -122,7 +121,6 @@
                           </fileset>
                         </configuration>
                     </plugin>
-
                 </plugins>
             </build>
         </profile>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Wed Apr 23 08:30:16 2008
@@ -21,20 +21,19 @@
 <!-- $Rev$ $Date$ -->
 
 <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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>test-2.1-jsps</artifactId>
     <name>Geronimo TestSuite :: Web Testsuite :: Test JSPs</name>
     <packaging>war</packaging>
-    
+
 
     <description>
         Tests for the test-deployables.
@@ -61,16 +60,10 @@
             <id>child</id>
             <build>
                 <plugins>
-                  <plugin>
-                      <groupId>org.codehaus.mojo</groupId>
-                      <artifactId>selenium-maven-plugin</artifactId>
-                   </plugin>
-
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -81,7 +74,7 @@
                             </suiteXmlFiles>
                         </configuration>
                     </plugin>
-                    
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -93,10 +86,10 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                  <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
                                 </configuration>
                             </execution>
-                            
+
                             <execution>
                                 <id>undeploy-war-as-moduleId</id>
                                 <phase>post-integration-test</phase>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml Wed Apr 23 08:30:16 2008
@@ -21,20 +21,19 @@
 <!-- $Rev$ $Date$ -->
 
 <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>
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>test-2.5-servlets</artifactId>
     <name>Geronimo TestSuite :: Web Testsuite :: Test Servlets</name>
     <packaging>war</packaging>
-    
+
 
     <description>
         Tests for the test-deployables.
@@ -49,23 +48,16 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
     <profiles>
         <profile>
             <id>child</id>
             <build>
                 <plugins>
-
-                  <plugin>
-                      <groupId>org.codehaus.mojo</groupId>
-                      <artifactId>selenium-maven-plugin</artifactId>
-                   </plugin>
-
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -76,7 +68,7 @@
                             </suiteXmlFiles>
                         </configuration>
                     </plugin>
-                    
+
                     <plugin>
                         <groupId>org.apache.geronimo.buildsupport</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -88,10 +80,10 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                  <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
                                 </configuration>
                             </execution>
-                            
+
                             <execution>
                                 <id>undeploy-war-as-moduleId</id>
                                 <phase>post-integration-test</phase>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Wed Apr 23 08:30:16 2008
@@ -25,7 +25,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>test-jetty</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Wed Apr 23 08:30:16 2008
@@ -27,7 +27,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>test-myfaces</artifactId>
@@ -41,7 +40,6 @@
     </description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
@@ -53,7 +51,6 @@
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <profiles>
@@ -62,16 +59,10 @@
             <build>
                 <plugins>
 
-                  <plugin>
-                      <groupId>org.codehaus.mojo</groupId>
-                      <artifactId>selenium-maven-plugin</artifactId>
-                   </plugin>
-
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -94,7 +85,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                  <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
                                 </configuration>
                             </execution>
 

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml?rev=650905&r1=650904&r2=650905&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Wed Apr 23 08:30:16 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>web-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>test-tomcat</artifactId>
@@ -48,7 +47,6 @@
             <artifactId>geronimo-jsp_2.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <profiles>



Mime
View raw message