Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2011-01-22 03:40:51 -0500
committerspingel2011-01-22 03:40:51 -0500
commit6bfdbf468bc70ed29395288c23d9ecc287e3e107 (patch)
tree4154b5abc7037df54b4e62883cffa848a84f2f79
parent112d8d9e7097cafa7a06fbf2c117150c34a91c28 (diff)
downloadorg.eclipse.mylyn.incubator-6bfdbf468bc70ed29395288c23d9ecc287e3e107.tar.gz
org.eclipse.mylyn.incubator-6bfdbf468bc70ed29395288c23d9ecc287e3e107.tar.xz
org.eclipse.mylyn.incubator-6bfdbf468bc70ed29395288c23d9ecc287e3e107.zip
NEW - bug 330155: [releng] modularize Mylyn build
https://bugs.eclipse.org/bugs/show_bug.cgi?id=330155
-rw-r--r--org.eclipse.mylyn.examples.monitor.study/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.mylyn.examples.monitor.study/build.properties6
-rw-r--r--org.eclipse.mylyn.tests.ui/pom.xml29
3 files changed, 32 insertions, 6 deletions
diff --git a/org.eclipse.mylyn.examples.monitor.study/META-INF/MANIFEST.MF b/org.eclipse.mylyn.examples.monitor.study/META-INF/MANIFEST.MF
index 1bd2618f..0165bbe3 100644
--- a/org.eclipse.mylyn.examples.monitor.study/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.examples.monitor.study/META-INF/MANIFEST.MF
@@ -20,7 +20,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.mylyn.commons.net,
org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)"
Eclipse-AutoStart: true
-Bundle-ClassPath: mylyn-study.jar
Export-Package: org.eclipse.mylyn.examples.monitor.study
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: Eclipse Mylyn
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.examples.monitor.study/build.properties b/org.eclipse.mylyn.examples.monitor.study/build.properties
index 2f398600..ecf3dfcd 100644
--- a/org.eclipse.mylyn.examples.monitor.study/build.properties
+++ b/org.eclipse.mylyn.examples.monitor.study/build.properties
@@ -10,8 +10,8 @@ bin.includes = META-INF/,\
doc/,\
plugin.xml,\
icons/,\
- mylyn-study.jar
+ .
src.includes = doc/,\
icons/
-jars.compile.order = mylyn-study.jar
-source.mylyn-study.jar = src/
+source.. = src/
+output.. = bin/
diff --git a/org.eclipse.mylyn.tests.ui/pom.xml b/org.eclipse.mylyn.tests.ui/pom.xml
index 0f4bc8e8..4c9497f1 100644
--- a/org.eclipse.mylyn.tests.ui/pom.xml
+++ b/org.eclipse.mylyn.tests.ui/pom.xml
@@ -10,11 +10,38 @@
<groupId>org.eclipse.mylyn</groupId>
<artifactId>org.eclipse.mylyn.tests.ui</artifactId>
<version>3.5.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
+ <packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <mylyn-ui-test-suite>org.eclipse.mylyn.tests.ui.AllUiTests</mylyn-ui-test-suite>
+ <mylyn-ui-test-skip>${maven.test.skip}</mylyn-ui-test-skip>
+ </properties>
+ <profiles>
+ <profile>
+ <id>heartbeat</id>
+ <properties>
+ <mylyn-ui-test-skip>true</mylyn-ui-test-skip>
+ </properties>
+ </profile>
+ </profiles>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
+ <testSuite>org.eclipse.mylyn.tests.ui</testSuite>
+ <testClass>${mylyn-ui-test-suite}</testClass>
+ <argLine>-Xmx1024m -XX:MaxPermSize=256m -Djava.io.tmpdir=${project.build.directory} ${mylyn-test-args}</argLine>
+ <appArgLine>${mylyn-test-app-args}</appArgLine>
+ <skip>${mylyn-ui-test-skip}</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-source-plugin</artifactId>
</plugin>
<plugin>

Back to the top