Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-08-13 04:11:25 -0400
committerUwe Stieber2014-08-13 04:11:25 -0400
commitb9e592662848587baa54e1c659f2095a6a459053 (patch)
treeae0715fad456f0e37ac6aaad963b99c7ae381aec
parent94d97a3b122c55206976c8133948f015d81bffce (diff)
downloadorg.eclipse.tcf-b9e592662848587baa54e1c659f2095a6a459053.tar.gz
org.eclipse.tcf-b9e592662848587baa54e1c659f2095a6a459053.tar.xz
org.eclipse.tcf-b9e592662848587baa54e1c659f2095a6a459053.zip
Tests: Adapt tycho-surefire-plugin dependency declaration after moving to Tycho 0.21.0
-rw-r--r--pom.xml28
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml35
-rw-r--r--tests/plugins/org.eclipse.tcf.debug.test/pom.xml40
3 files changed, 28 insertions, 75 deletions
diff --git a/pom.xml b/pom.xml
index e3482f4ac..14d001ef6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,34 @@
<module>tests/plugins/org.eclipse.tcf.debug.test</module>
-->
</modules>
+
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.sdk.feature.group</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>>org.eclipse.tcf.te.tcf.feature.feature.group</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.tcf.te.tests</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
</profile>
</profiles>
</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 3fba06351..4e2774bf8 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml
@@ -18,9 +18,6 @@
<properties>
<jacoco.append>true</jacoco.append>
- <sdk-version>3.8.2</sdk-version>
- <te-version>1.3.0</te-version>
-
<ui.test.vmargs>-Xint -Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
</properties>
@@ -51,18 +48,6 @@
<argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
<testFailureIgnore>true</testFailureIgnore>
<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>
@@ -297,25 +282,5 @@
</plugins>
</build>
</profile>
-
- <profile>
- <!-- Eclipse 4.3.x (Kepler) -->
- <id>kepler</id>
-
- <properties>
- <sdk-version>4.3.2</sdk-version>
- </properties>
- </profile>
-
- <profile>
- <!-- Eclipse 4.4 (Luna) -->
- <id>luna</id>
-
- <properties>
- <sdk-version>4.4.0</sdk-version>
- </properties>
-
- </profile>
-
</profiles>
</project>
diff --git a/tests/plugins/org.eclipse.tcf.debug.test/pom.xml b/tests/plugins/org.eclipse.tcf.debug.test/pom.xml
index 55cecb3cf..005b03970 100644
--- a/tests/plugins/org.eclipse.tcf.debug.test/pom.xml
+++ b/tests/plugins/org.eclipse.tcf.debug.test/pom.xml
@@ -18,9 +18,6 @@
<properties>
<jacoco.append>true</jacoco.append>
- <sdk-version>3.8.2</sdk-version>
- <tcf-version>1.3.0</tcf-version>
-
<ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
</properties>
@@ -56,23 +53,6 @@
<argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
<testFailureIgnore>true</testFailureIgnore>
<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.tcf.feature.feature.group</artifactId>
- <version>${tcf-version}</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.tcf.te.tests</artifactId>
- <version>${tcf-version}</version>
- </dependency>
- </dependencies>
</configuration>
</plugin>
@@ -182,25 +162,5 @@
</plugins>
</build>
</profile>
-
- <profile>
- <!-- Eclipse 4.3.x (Kepler) -->
- <id>kepler</id>
-
- <properties>
- <sdk-version>4.3.2</sdk-version>
- </properties>
- </profile>
-
- <profile>
- <!-- Eclipse 4.4 (Luna) -->
- <id>luna</id>
-
- <properties>
- <sdk-version>4.4.0</sdk-version>
- </properties>
-
- </profile>
-
</profiles>
</project>

Back to the top