From 3d23b98c766e0e2b9dc5d42467528c6e6f7b53cf Mon Sep 17 00:00:00 2001
From: Simon Hoenscheid <simon.hoenscheid@xyntion.consulting>
Date: Tue, 20 Aug 2024 23:13:16 +0200
Subject: [PATCH] remove java 1.8 support
---
manifests/init.pp | 2 +-
spec/acceptance/1_default_parameters_spec.rb | 4 ++--
spec/acceptance/2_default_parameters_upgrade_spec.rb | 2 +-
spec/acceptance/3_custom_parameters_spec.rb | 2 +-
spec/classes/confluence_config_spec.rb | 2 +-
templates/setenv.sh.erb | 3 ---
6 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index df47b93..be3e649 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,7 +6,7 @@
# JVM Settings
$javahome = undef,
- Enum['openjdk-11', 'oracle-jdk-1.8', 'custom'] $jvm_type = 'openjdk-11',
+ Enum['openjdk-11', 'custom'] $jvm_type = 'openjdk-11',
$jvm_xms = '256m',
$jvm_xmx = '1024m',
$jvm_permgen = '256m',
diff --git a/spec/acceptance/1_default_parameters_spec.rb b/spec/acceptance/1_default_parameters_spec.rb
index 0bfaec6..bf89b1b 100644
--- a/spec/acceptance/1_default_parameters_spec.rb
+++ b/spec/acceptance/1_default_parameters_spec.rb
@@ -23,8 +23,8 @@
cleanup => true,
} ->
class { 'confluence':
- version => '5.5.6',
- jvm_type => 'oracle-jdk-1.8',
+ version => '8.5.12',
+ jvm_type => 'openjdk-11',
download_url => fact('download_url'),
javahome => $jh,
}
diff --git a/spec/acceptance/2_default_parameters_upgrade_spec.rb b/spec/acceptance/2_default_parameters_upgrade_spec.rb
index f7a87ba..f983d21 100644
--- a/spec/acceptance/2_default_parameters_upgrade_spec.rb
+++ b/spec/acceptance/2_default_parameters_upgrade_spec.rb
@@ -24,7 +24,7 @@
} ->
class { 'confluence':
version => '5.7',
- jvm_type => 'oracle-jdk-1.8',
+ jvm_type => 'openjdk-11',
download_url => fact('download_url'),
javahome => $jh,
}
diff --git a/spec/acceptance/3_custom_parameters_spec.rb b/spec/acceptance/3_custom_parameters_spec.rb
index 80a6f90..7e7fade 100644
--- a/spec/acceptance/3_custom_parameters_spec.rb
+++ b/spec/acceptance/3_custom_parameters_spec.rb
@@ -24,7 +24,7 @@
} ->
class { 'confluence':
version => '5.7',
- jvm_type => 'oracle-jdk-1.8',
+ jvm_type => 'openjdk-11',
download_url => fact('download_url'),
javahome => $jh,
tomcat_port => '8091',
diff --git a/spec/classes/confluence_config_spec.rb b/spec/classes/confluence_config_spec.rb
index a8822ae..2532e2e 100644
--- a/spec/classes/confluence_config_spec.rb
+++ b/spec/classes/confluence_config_spec.rb
@@ -257,7 +257,7 @@
{
version: '7.12.0',
javahome: '/opt/java',
- jvm_type: 'oracle-jdk-1.8'
+ jvm_type: 'openjdk-11'
}
end
diff --git a/templates/setenv.sh.erb b/templates/setenv.sh.erb
index 5647baa..18f26b6 100644
--- a/templates/setenv.sh.erb
+++ b/templates/setenv.sh.erb
@@ -90,9 +90,6 @@ CATALINA_OPTS="-Xlog:gc+age=debug:file=$LOGBASEABS/logs/gc-`date +%F_%H-%M-%S`.l
<%- end -%>
<%- if scope.lookupvar('confluence::jvm_type') == 'openjdk-11' -%>
CATALINA_OPTS="-XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDateStamps ${CATALINA_OPTS}"
-<%- elsif scope.lookupvar('confluence::jvm_type') == 'oracle-jdk-1.8' -%>
-CATALINA_OPTS="-XX:-PrintGCDetails -XX:+PrintGCDateStamps -XX:-PrintTenuringDistribution ${CATALINA_OPTS}"
-<%- end -%>
CATALINA_OPTS="-Xloggc:$LOGBASEABS/logs/gc-`date +%F_%H-%M-%S`.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=2M ${CATALINA_OPTS}"
CATALINA_OPTS="-XX:G1ReservePercent=20 ${CATALINA_OPTS}"
CATALINA_OPTS="-Djava.awt.headless=true ${CATALINA_OPTS}"