[509216] Update the version of Tycho used in the build to 0.26.0
Reworked the way dependencies are defined for the test bundles, as the
old way didn't work any longer
Bug: 509216
Change-Id: I535c0021c48514b593b18bfdf5f3ac188e813983
Signed-off-by: Krum Tsvetkov <krum.tsvetkov@sap.com>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7df8f2f..7d826d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -16,7 +16,7 @@
<name>MAT Parent</name>
<properties>
- <tycho-version>0.18.1</tycho-version>
+ <tycho-version>0.26.0</tycho-version>
<signer-input-directory>/home/data/httpd/download-staging.priv/tools/mat</signer-input-directory>
<download-publish-path>/home/data/httpd/download.eclipse.org/mat/snapshots/update-site</download-publish-path>
<download-publish-rcp-path>/home/data/httpd/download.eclipse.org/mat/snapshots/rcp</download-publish-rcp-path>
diff --git a/plugins/org.eclipse.mat.tests/pom.xml b/plugins/org.eclipse.mat.tests/pom.xml
index 85f8520..61f29d5 100644
--- a/plugins/org.eclipse.mat.tests/pom.xml
+++ b/plugins/org.eclipse.mat.tests/pom.xml
@@ -18,39 +18,38 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
<configuration>
- <dependencies>
- <dependency>
- <type>eclipse-plugin</type>
- <groupId>org.eclipse.mat</groupId>
- <artifactId>org.eclipse.mat.parser</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>eclipse-plugin</type>
- <groupId>org.eclipse.mat</groupId>
- <artifactId>org.eclipse.mat.hprof</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>eclipse-plugin</type>
- <groupId>org.eclipse.mat</groupId>
- <artifactId>org.eclipse.mat.dtfj</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>eclipse-plugin</type>
- <groupId>org.eclipse.mat</groupId>
- <artifactId>org.eclipse.mat.ibmdumps</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>com.ibm.dtfj.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- </dependencies>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.mat.hprof</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.mat.parser</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.mat.dtfj</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.mat.ibmdumps</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>p2-installable-unit</type>
+ <id>com.ibm.dtfj.feature.feature.group</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
</configuration>
</plugin>
</plugins>
diff --git a/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml b/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml
index e6c2cab..f72d753 100644
--- a/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml
+++ b/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml
@@ -61,6 +61,32 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.hamcrest</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>p2-installable-unit</type>
+ <id>com.ibm.dtfj.feature.feature.group</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>p2-installable-unit</type>
+ <id>org.eclipse.mat.ui.rcp.MemoryAnalyzer</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<includes>
@@ -71,24 +97,6 @@
<product>org.eclipse.mat.ui.rcp.MemoryAnalyzer</product>
<application>org.eclipse.mat.ui.rcp.application</application>
<argLine>${ui.test.vmargs}</argLine>
-
- <dependencies>
- <dependency>
- <type>eclipse-plugin</type>
- <artifactId>org.hamcrest</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <groupId>org.eclipse.mat</groupId>
- <artifactId>org.eclipse.mat.ui.rcp.MemoryAnalyzer</artifactId>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>com.ibm.dtfj.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- </dependencies>
</configuration>
</plugin>
</plugins>
