Merge branch 'maintenance-1.0-2'
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaDiscovererBenchmarkTest.java b/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaDiscovererBenchmarkTest.java
index 69e225a..bb5d09c 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaDiscovererBenchmarkTest.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaDiscovererBenchmarkTest.java
@@ -10,6 +10,7 @@
* Fabien Giquel (Mia-Software) - Bug 339720 : MoDisco Discoverers (infra + techno) API clean
* Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework
* Gregoire Dupe (Mia-Software) - Bug 346087 - Regression of the report of the Java discoverer benchmark
+ * Gregoire Dupe (Mia-Software) - Bug 511745 - [Unit Test Failure] org.eclipse.modisco.java.discoverer.benchmark.tests.JavaDiscovererBenchmarkTest.test001
*******************************************************************************/
package org.eclipse.modisco.java.discoverer.benchmark.tests;
@@ -57,7 +58,7 @@
AcceleoEnginePlugin.getDefault().getLog().addLogListener(this.listener);
}
- @Test(timeout = 15 * 60 * 1000)
+ @Test(timeout = 25 * 60 * 1000)
public void test001() throws CoreException, IOException {
if (Boolean.parseBoolean(System.getenv().get("skip.long.junit.tests"))) {
throw new RuntimeException("skipped");
diff --git a/org.eclipse.modisco.releng.tycho/helios/test_dependencies.xml b/org.eclipse.modisco.releng.tycho/helios/test_dependencies.xml
index dffe946..ef190d6 100644
--- a/org.eclipse.modisco.releng.tycho/helios/test_dependencies.xml
+++ b/org.eclipse.modisco.releng.tycho/helios/test_dependencies.xml
@@ -14,34 +14,28 @@
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.eclipse.feature.group</artifactId>
- <version>${swtbot-version}</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.ide.feature.group</artifactId>
- <version>${swtbot-version}</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.eclipse.test.junit4.feature.group</artifactId>
- <version>${swtbot-version}</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.forms.feature.group</artifactId>
- <version>${swtbot-version}</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.swtbot.feature.group</artifactId>
- <version>${swtbot-version}</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>
</dependency>
<!-- Test dependencies -->
<dependency>
