[jbosstools-commits] JBoss Tools SVN: r23330 - branches/jbosstools-3.2.0.M1.
Author: nickboldt
Date: 2010-07-08 18:16:43 -0400 (Thu, 08 Jul 2010)
New Revision: 23330
Modified:
branches/jbosstools-3.2.0.M1/parent-pom.xml
Log:
merge changes to trunk into branch; fix spacing
Modified: branches/jbosstools-3.2.0.M1/parent-pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/parent-pom.xml 2010-07-08 22:14:21 UTC (rev 23329)
+++ branches/jbosstools-3.2.0.M1/parent-pom.xml 2010-07-08 22:16:43 UTC (rev 23330)
@@ -85,8 +85,8 @@
<version>${tychoVersion}</version>
<configuration>
<!-- timeout in seconds -->
- <surefire.timeout>900</surefire.timeout>
- <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
+ <surefire.timeout>1200</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties}
@@ -176,6 +176,9 @@
-->
<profile>
<id>helios-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<repositories>
<repository>
<id>helios</id>
@@ -271,9 +274,6 @@
</repository>
</repositories>
</profile>
-
- <!-- TODO: verify that this profile overrides the default profile if BUILD_NUMBER
- is set (by a Hudson job) -->
<profile>
<id>hudson</id>
<activation>
@@ -615,7 +615,6 @@
</build>
</profile>
</profiles>
-
<pluginRepositories>
<pluginRepository>
<id>sonatype-maven-central</id>