Author: shawkins
Date: 2012-09-14 11:01:26 -0400 (Fri, 14 Sep 2012)
New Revision: 4443
Modified:
trunk/test-integration/perf/pom.xml
trunk/test-integration/pom.xml
Log:
switching perf to always be a child module so that it's updated as part of a release
Modified: trunk/test-integration/perf/pom.xml
===================================================================
--- trunk/test-integration/perf/pom.xml 2012-09-14 14:45:21 UTC (rev 4442)
+++ trunk/test-integration/perf/pom.xml 2012-09-14 15:01:26 UTC (rev 4443)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.2.0.Alpha1-SNAPSHOT</version>
+ <version>8.2.0.Alpha2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-perf</artifactId>
@@ -18,4 +18,31 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>perf</id>
+ </profile>
+
+ </profiles>
+
</project>
\ No newline at end of file
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2012-09-14 14:45:21 UTC (rev 4442)
+++ trunk/test-integration/pom.xml 2012-09-14 15:01:26 UTC (rev 4443)
@@ -19,18 +19,6 @@
<apache.ant.version>1.7.0</apache.ant.version>
</properties>
- <profiles>
- <profile>
- <!--
- This profile is activated manually, as in "mvn ... -P release ..."
- -->
- <id>perf</id>
- <modules>
- <module>perf</module>
- </modules>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.jboss.teiid</groupId>
@@ -132,5 +120,6 @@
<modules>
<module>common</module>
<module>db</module>
+ <module>perf</module>
</modules>
</project>
\ No newline at end of file