diff options
| author | Uwe Stieber | 2012-03-09 13:20:07 +0000 |
|---|---|---|
| committer | Uwe Stieber | 2012-03-09 13:20:07 +0000 |
| commit | 0bbae43c3544eec78ada560294d9f5cd2d41fb7b (patch) | |
| tree | a76c97d565e543b3be8c5eb90a8a8e1fb8889c42 | |
| parent | 5486823e0154460f8f9b0519fa1c8c9a2de82df5 (diff) | |
| download | org.eclipse.tcf-0bbae43c3544eec78ada560294d9f5cd2d41fb7b.tar.gz org.eclipse.tcf-0bbae43c3544eec78ada560294d9f5cd2d41fb7b.tar.xz org.eclipse.tcf-0bbae43c3544eec78ada560294d9f5cd2d41fb7b.zip | |
Maven: Works better with separated root pom for unit tests
| -rw-r--r-- | pom-tests.xml | 24 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml | 91 |
3 files changed, 66 insertions, 51 deletions
diff --git a/pom-tests.xml b/pom-tests.xml new file mode 100644 index 000000000..3086330f7 --- /dev/null +++ b/pom-tests.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + + <parent> + <groupId>org.eclipse.tcf</groupId> + <artifactId>org.eclipse.tcf.maven-build</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>admin/pom-build.xml</relativePath> + </parent> + + <groupId>org.eclipse.tcf</groupId> + <artifactId>tcf-tests-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>TCF and Target Explorer, Unit Tests Master</name> + + <modules> + <module>target_explorer/plugins/org.eclipse.tcf.te.tests</module> + </modules> + +</project> @@ -79,7 +79,5 @@ <module>target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature</module> <module>features/org.eclipse.tcf.repo</module> - - <module>target_explorer/plugins/org.eclipse.tcf.te.tests</module> </modules> </project> diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml index 0b7735d91..a261f0927 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml +++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml @@ -6,61 +6,54 @@ <parent> <groupId>org.eclipse.tcf</groupId> - <artifactId>tcf-parent</artifactId> + <artifactId>tcf-tests-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../../../pom-tests.xml</relativePath> </parent> <version>1.0.0.qualifier</version> <artifactId>org.eclipse.tcf.te.tests</artifactId> <packaging>eclipse-test-plugin</packaging> - <profiles> - <profile> - <id>run-tests</id> - - <properties> - <sdk-version>3.8.0</sdk-version> - <te-version>1.0.0</te-version> - - <ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs> - </properties> + <properties> + <sdk-version>3.8.0</sdk-version> + <te-version>1.0.0</te-version> + + <ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs> + </properties> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <testSuite>org.eclipse.tcf.te.tests</testSuite> - <testClass>org.eclipse.tcf.te.tests.suites.AllCoreTests</testClass> - <useUIHarness>true</useUIHarness> - <useUIThread>true</useUIThread> - <product>org.eclipse.platform.ide</product> - <argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine> - <application>org.eclipse.ui.ide.workbench</application> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.sdk.feature.group</artifactId> - <version>${sdk-version}</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.tcf.te.feature.feature.group</artifactId> - <version>${te-version}</version> - </dependency> - </dependencies> - </configuration> - </plugin> - </plugins> - </build> - - </profile> - </profiles> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <testSuite>org.eclipse.tcf.te.tests</testSuite> + <testClass>org.eclipse.tcf.te.tests.suites.AllCoreTests</testClass> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <product>org.eclipse.platform.ide</product> + <argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine> + <application>org.eclipse.ui.ide.workbench</application> + <dependencies> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.sdk.feature.group</artifactId> + <version>${sdk-version}</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.tcf.te.feature.feature.group</artifactId> + <version>${te-version}</version> + </dependency> + </dependencies> + </configuration> + </plugin> + </plugins> + </build> </project> |