geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r653503 - in /geronimo/server/trunk/testsuite/console-testsuite: advanced/goals.txt advanced/pom.xml basic/goals.txt basic/pom.xml pom.xml
Date Mon, 05 May 2008 15:35:18 GMT
Author: jdillon
Date: Mon May  5 08:35:18 2008
New Revision: 653503

URL: http://svn.apache.org/viewvc?rev=653503&view=rev
Log:
(GERONIMO-3980) Use shitty-maven-plugin instead of maven-maven-plugin to drive test builds

Added:
    geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt   (with props)
    geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt   (with props)
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

Added: geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt?rev=653503&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt (added)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt Mon May  5 08:35:18
2008
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=653503&r1=653502&r2=653503&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml Mon May  5 08:35:18
2008
@@ -32,37 +32,9 @@
 
     <artifactId>advanced</artifactId>
     <name>Geronimo TestSuite :: Console Testsuite :: Advanced Tests</name>
-    <packaging>jar</packaging>
 
     <description>
         Advanced test for the Geronimo console.
-        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>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <suiteXmlFiles>
-                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
-                            </suiteXmlFiles>
-                            <systemProperties>
-                                <property>
-                                    <name>geronimoVersion</name>
-                                    <value>${version}</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

Added: geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt?rev=653503&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt (added)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt Mon May  5 08:35:18
2008
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=653503&r1=653502&r2=653503&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Mon May  5 08:35:18 2008
@@ -32,31 +32,9 @@
 
     <artifactId>basic</artifactId>
     <name>Geronimo TestSuite :: Console Testsuite :: Basic Tests</name>
-    <packaging>jar</packaging>
 
     <description>
         Basic test for the Geronimo console.
-        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>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <suiteXmlFiles>
-                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
-                            </suiteXmlFiles>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=653503&r1=653502&r2=653503&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Mon May  5 08:35:18 2008
@@ -39,13 +39,70 @@
     </description>
     
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                        <systemProperties>
+                            <property>
+                                <name>geronimoVersion</name>
+                                <value>${version}</value>
+                            </property>
+                        </systemProperties>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>selenium-maven-plugin</artifactId>
+                <inherited>false</inherited>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <inherited>false</inherited>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>shitty-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <projects>
+                        <fileset>
+                            <directory>${project.basedir}</directory>
+                            <includes>
+                                <include>*/pom.xml</include>
+                            </includes>
+                        </fileset>
+                    </projects>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>clean</goal>
+                            <goal>install</goal>
+                            <goal>test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <executions>
                     <execution>
-                        <id>generate-surefire-xml</id>
                         <phase>install</phase>
                         <goals>
                             <goal>generate-surefire-xml</goal>
@@ -55,37 +112,5 @@
             </plugin>
         </plugins>
     </build>
-    
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>selenium-maven-plugin</artifactId>
-                    </plugin>
-                    
-                    <plugin>
-                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                        <artifactId>maven-maven-plugin</artifactId>
-                    </plugin>
-                    
-                    <plugin>
-                        <groupId>org.apache.geronimo.buildsupport</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>child</id>
-        </profile>
-    </profiles>
 
 </project>



Mime
View raw message