From 6e8e2ae65532ed7488fcce9590b2f1f28def129a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 16 Jul 2013 16:33:19 -0700
Subject: [PATCH] Use OpenJDK 7 instead of OpenJDK 6 with Gerrit.
Oracle has EOLed Java 6. While OpenJDK 6 is still supported, development
on it has slowed. Upgrade to OpenJDK 7 and run Gerrit on this newer
platform.
Change-Id: Id5867a0269bc6af3e7f6214112e91c8848ffbbe4
---
modules/gerrit/manifests/init.pp | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 22e119b5aa..eab26428ed 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -119,9 +119,7 @@ class gerrit(
include pip
$java_home = $::lsbdistcodename ? {
- 'precise' => '/usr/lib/jvm/java-6-openjdk-amd64/jre',
- 'oneiric' => '/usr/lib/jvm/java-6-openjdk/jre',
- 'natty' => '/usr/lib/jvm/java-6-openjdk/jre',
+ 'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
}
user { 'gerrit2':
@@ -144,12 +142,15 @@ class gerrit(
}
}
- $packages = ['openjdk-6-jre-headless']
-
- package { $packages:
+ package { 'openjdk-7-jre-headless':
ensure => present,
}
+ package { 'openjdk-6-jre-headless':
+ ensure => purged,
+ require => Package['openjdk-7-jre-headless'],
+ }
+
if ! defined(Package['gerritlib']) {
package { 'gerritlib':
ensure => latest,
@@ -436,7 +437,7 @@ class gerrit(
user => 'gerrit2',
command => '/usr/bin/java -jar /home/gerrit2/review_site/bin/gerrit.war init -d /home/gerrit2/review_site --batch --no-auto-start',
subscribe => File['/home/gerrit2/review_site/bin/gerrit.war'],
- require => [Package['openjdk-6-jre-headless'],
+ require => [Package['openjdk-7-jre-headless'],
User['gerrit2'],
Mysql::Db['reviewdb'],
File['/home/gerrit2/review_site/etc/gerrit.config'],
@@ -454,7 +455,7 @@ class gerrit(
command => '/etc/init.d/gerrit stop; /usr/bin/java -jar /home/gerrit2/review_site/bin/gerrit.war init -d /home/gerrit2/review_site --batch --no-auto-start',
subscribe => File['/home/gerrit2/review_site/bin/gerrit.war'],
refreshonly => true,
- require => [Package['openjdk-6-jre-headless'],
+ require => [Package['openjdk-7-jre-headless'],
User['gerrit2'],
Mysql::Db['reviewdb'],
File['/home/gerrit2/review_site/etc/gerrit.config'],