Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-12-03 16:12:01 -0500
committerMatthias Sohn2018-12-03 16:12:10 -0500
commitbd7d72206b1e62f73420b0f809a7a4116a9bcc9b (patch)
tree931a9234e0a8ca3116b3ab95354ca5f28421adc6
parentd2ec6497e5abae94ef30aca6ae656c29030f743e (diff)
parentc95746fa05486cc13bf6c267d7c70bb2eb90ffaa (diff)
downloadegit-github-bd7d72206b1e62f73420b0f809a7a4116a9bcc9b.tar.gz
egit-github-bd7d72206b1e62f73420b0f809a7a4116a9bcc9b.tar.xz
egit-github-bd7d72206b1e62f73420b0f809a7a4116a9bcc9b.zip
Merge branch 'stable-5.2'
* stable-5.2: Pin versions of surefire and build helper maven plugins Fix max heap size configuration for org.eclipse.mylyn.github.tests Change-Id: I888e558810c3675c1de57daa2ee32363165eb110 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.mylyn.github.tests/pom.xml4
-rw-r--r--pom.xml10
2 files changed, 12 insertions, 2 deletions
diff --git a/org.eclipse.mylyn.github.tests/pom.xml b/org.eclipse.mylyn.github.tests/pom.xml
index 12e7d220..79bc798c 100644
--- a/org.eclipse.mylyn.github.tests/pom.xml
+++ b/org.eclipse.mylyn.github.tests/pom.xml
@@ -25,10 +25,10 @@
<packaging>eclipse-test-plugin</packaging>
<name>Eclipse EGit Mylyn GitHub Test Plug-in</name>
-
+
<properties>
<test.vmparams></test.vmparams>
- <uitest.vmparams>-Xmx512m -Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots -Xmx1024m</uitest.vmparams>
+ <uitest.vmparams>-Xmx1024m -Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots</uitest.vmparams>
</properties>
<build>
diff --git a/pom.xml b/pom.xml
index 16264251..972663e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,6 +213,11 @@
<version>${tycho-version}</version>
</plugin>
<plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho-extras-version}</version>
@@ -275,6 +280,11 @@
<artifactId>eclipse-jarsigner-plugin</artifactId>
<version>1.1.5</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</pluginManagement>
<sourceDirectory>src/</sourceDirectory>

Back to the top