Merge branch 'maintenance-1.0' into master-2
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
index 93e3905..cbb94e9 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
@@ -351,13 +351,18 @@
* of the Acceleo module with the main template that has caused the creation of this class will
* revert your modifications.
*/
+//gdupe> The method isInWorkspace() does not exists in Helios. This avoid
+// to be install MoDisco on an Helios. The code generator is not used in a
+// workspace context : we do not need explicit load of the meta-models
+// That why I've commented the following lines.
+/*
if (!isInWorkspace(org.eclipse.modisco.infra.discovery.catalog.CatalogPackage.class)) {
resourceSet.getPackageRegistry().put(org.eclipse.modisco.infra.discovery.catalog.CatalogPackage.eINSTANCE.getNsURI(), org.eclipse.modisco.infra.discovery.catalog.CatalogPackage.eINSTANCE);
}
if (!isInWorkspace(org.eclipse.modisco.infra.discovery.launch.LaunchPackage.class)) {
resourceSet.getPackageRegistry().put(org.eclipse.modisco.infra.discovery.launch.LaunchPackage.eINSTANCE.getNsURI(), org.eclipse.modisco.infra.discovery.launch.LaunchPackage.eINSTANCE);
}
-
+*/
/*
* If you need additional package registrations, you can register them here. The following line
* (in comment) is an example of the package registration for UML.
diff --git a/org.eclipse.modisco.releng.tycho/releasetrain/test_dependencies.xml b/org.eclipse.modisco.releng.tycho/releasetrain/test_dependencies.xml
index 24a98b1..58bde14 100644
--- a/org.eclipse.modisco.releng.tycho/releasetrain/test_dependencies.xml
+++ b/org.eclipse.modisco.releng.tycho/releasetrain/test_dependencies.xml
@@ -14,34 +14,34 @@
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.eclipse.feature.group</artifactId>
- <version>${swtbot-version}</version>
+ <version>0.0.0</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.ide.feature.group</artifactId>
- <version>${swtbot-version}</version>
+ <version>0.0.0</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.eclipse.test.junit.feature.group</artifactId>
- <version>${swtbot-version}</version>
+ <version>0.0.0</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.forms.feature.group</artifactId>
- <version>${swtbot-version}</version>
+ <version>0.0.0</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.feature.group</artifactId>
- <version>${swtbot-version}</version>
+ <version>0.0.0</version>
</dependency>
<!-- Currently tested feature -->
<dependency>
<type>p2-installable-unit</type>
<groupId>${project.groupdId}</groupId>
<artifactId>org.eclipse.modisco.sdk.feature.feature.group</artifactId>
- <version>${project.versionId}</version>
+ <version>0.0.0</version>
</dependency>
<!-- Test dependencies -->
<dependency>
