Author: nickboldt
Date: 2011-01-05 16:22:50 -0500 (Wed, 05 Jan 2011)
New Revision: 27926
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/.classpath
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-6581 bump up to source/target = 1.6 and increase
test timeout from 30 to 45 mins
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/.classpath
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/.classpath 2011-01-05 20:42:54
UTC (rev 27925)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/.classpath 2011-01-05 21:22:50
UTC (rev 27926)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2011-01-05
20:42:54 UTC (rev 27925)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2011-01-05
21:22:50 UTC (rev 27926)
@@ -40,5 +40,5 @@
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Import-Package: org.eclipse.jdt.launching
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2011-01-05 20:42:54 UTC
(rev 27925)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2011-01-05 21:22:50 UTC
(rev 27926)
@@ -1,19 +1,45 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
- <artifactId>org.jboss.tools.ws.creation.core.test</artifactId>
+ <artifactId>org.jboss.tools.ws.creation.core.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA</systemProperties>
<emma.filter>org.jboss.tools.ws.creation.core*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles>
</properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-compiler-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <!-- timeout in seconds -->
+ <surefire.timeout>2700</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>2700</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>