Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2017-05-28 06:52:20 +0000
committerFrank Becker2017-05-30 16:45:13 +0000
commit50d8a6196eecb7f98cfabd13582899ef16f3bf66 (patch)
treebc154d2a827f13cc91a4eb18fa15e82e28d7fab9
parent722c91f1e0a29553dd0d0c7c9a2c37adf1b71b08 (diff)
downloadorg.eclipse.mylyn.reviews-R_3_23_0.tar.gz
org.eclipse.mylyn.reviews-R_3_23_0.tar.xz
org.eclipse.mylyn.reviews-R_3_23_0.zip
517325: move form openjdk7 to openjdk8R_3_23_0
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=517325 Change-Id: Ib534205969091bb3bd0d432fcd2c951e602d1abe Signed-off-by: Frank Becker <eclipse@frank-becker.de>
-rw-r--r--org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp2
-rw-r--r--org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb2
2 files changed, 2 insertions, 2 deletions
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 adeade92..0c0ba951 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 @@ class gerrit {
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 02d995ed..332ccbc8 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]

Back to the top