[dna-commits] DNA SVN: r129 - trunk.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2008-05-08 15:26:39 -0400 (Thu, 08 May 2008)
New Revision: 129

Modified:
   trunk/pom.xml
Log:
Added integration tests back into list of modules, and removed 'integration-tests' profile.  With the separate profile, continuous integration did not compile the integration tests.  Now, the CI runs to compile, but only run the integration tests if the 'integration' goal is run (during the nightly builds).

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-05-08 19:06:57 UTC (rev 128)
+++ trunk/pom.xml	2008-05-08 19:26:39 UTC (rev 129)
@@ -17,6 +17,7 @@
 		<module>dna-repository</module>
 		<module>sequencers/dna-sequencer-images</module>
 		<module>dna-maven-classloader</module>
+        <module>dna-integration-tests</module>
 	</modules>
 	<properties>
 		<dna-version>${project.version}</dna-version>
@@ -24,21 +25,6 @@
 	<profiles>
 		<profile>
 		    <!-- 
-			This profile is activated when the "integration.tests" property is set,
-			as in "mvn ... -Dintegration.tests=true ..."
-		    -->
-	      <id>integration-tests</id>
-	      <activation>
-	        <property>
-	          <name>integration.tests</name>
-	        </property>
-	      </activation>
-	      <modules>
-	        <module>dna-integration-tests</module>
-	      </modules>
-	    </profile>
-		<profile>
-		    <!-- 
 			This profile is activated when the "generate.docs" property is set,
 			as in "mvn ... -Dgenerate.docs=true ..."
 		    -->
@@ -97,7 +83,6 @@
 	        </plugins>
 	      </build>
 	      <modules>
-	        <module>dna-integration-tests</module>
 	        <module>docs</module>
 	        <module>docs/examples/gettingstarted</module>
 	      </modules>