517325: move form openjdk7 to openjdk8
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=517325
Change-Id: Ib534205969091bb3bd0d432fcd2c951e602d1abe
Signed-off-by: Frank Becker <eclipse@frank-becker.de>
diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp
index adeade9..0c0ba95 100644
--- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp
+++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp
@@ -8,7 +8,7 @@
onlyif => "find /var/lib/apt/lists/ -mtime -7 | (grep -q Package; [ $? != 0 ])",
}
- $requirements = ["apache2", "openjdk-7-jre-headless:i386", "git-core",]
+ $requirements = ["apache2", "git-core",]
package { $requirements:
ensure => "installed",
diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb
index 02d995e..332ccbc 100644
--- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb
+++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb
@@ -14,7 +14,7 @@
smtpServer = localhost
[container]
#user = tools
- javaHome = /usr/lib/jvm/java-7-openjdk-i386/jre
+ javaHome = /usr/lib/jvm/java-8-openjdk-amd64/jre
javaOptions = -client
heapLimit = 128m
[sshd]
