Author: sbunciak
Date: 2012-01-24 11:22:05 -0500 (Tue, 24 Jan 2012)
New Revision: 38106
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTestsMaven.launch
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml
Log:
Mavenization
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF 2012-01-24
16:14:41 UTC (rev 38105)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF 2012-01-24
16:22:05 UTC (rev 38106)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: OpenShift SWTBot Tests
Bundle-SymbolicName: org.jboss.tools.openshift.ui.bot.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.ui.bot.test.Activator
Bundle-Vendor: Red Hat
Require-Bundle: org.eclipse.ui,
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTestsMaven.launch
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTestsMaven.launch 2012-01-24
16:14:41 UTC (rev 38105)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTestsMaven.launch 2012-01-24
16:22:05 UTC (rev 38106)
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
<launchConfiguration
type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean install"/>
+<stringAttribute key="M2_GOALS" value="clean install -P
jbosstools-nightly-staging-composite"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES"/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="swtbot.test.skip=false"/>
+<listEntry value="configurations.dir=/home/sbunciak/"/>
+</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION"
value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY"
value="${workspace_loc:/org.jboss.tools.openshift.ui.bot.test}"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="true"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY"
value="${workspace_loc:/openshift/tests/org.jboss.tools.openshift.ui.bot.test}"/>
</launchConfiguration>
Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml 2012-01-24
16:14:41 UTC (rev 38105)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml 2012-01-24
16:22:05 UTC (rev 38106)
@@ -1,33 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.tools.openshift</groupId>
- <artifactId>tests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools.openshift.tests</groupId>
- <artifactId>org.jboss.tools.openshift.ui.bot.test</artifactId>
-
- <packaging>eclipse-test-plugin</packaging>
-
- <properties>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.openshift</groupId>
+ <artifactId>tests</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.openshift.tests</groupId>
+ <artifactId>org.jboss.tools.openshift.ui.bot.test</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+
+ <packaging>eclipse-test-plugin</packaging>
+
+ <properties>
<systemProperties>-Dtest.configurations.dir=${configurations.dir}</systemProperties>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <skip>${swtbot.test.skip}</skip>
- <useUIThread>false</useUIThread>
-
<testSuite>org.jboss.tools.openshift.ui.bot.test</testSuite>
-
<testClass>org.jboss.tools.openshift.ui.bot.test.OpenShiftAllBotTests</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <skip>${swtbot.test.skip}</skip>
+ <useUIThread>false</useUIThread>
+ <testSuite>org.jboss.tools.openshift.ui.bot.test</testSuite>
+ <testClass>org.jboss.tools.openshift.ui.bot.test.OpenShiftAllBotTests</testClass>
+ <dependencies combine.children="append">
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.openshift.express.feature.feature.group</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file