remove java 1.8 support

voxpupuli · Aug 20, 2024 · 2717828 · 2717828
1 parent 7d61784
commit 2717828
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -252,22 +252,6 @@
           end
         end
 
-        context 'java 8 specific option' do
-          let(:params) do
-            {
-              version: '7.12.0',
-              javahome: '/opt/java',
-              jvm_type: 'oracle-jdk-1.8'
-            }
-          end
-
-          it do
-            is_expected.to compile.with_all_deps
-            is_expected.to contain_file('/opt/confluence/atlassian-confluence-7.12.0/bin/setenv.sh').
-              with_content(%r{CATALINA_OPTS="-XX:-PrintGCDetails -XX:\+PrintGCDateStamps -XX:-PrintTenuringDistribution \${CATALINA_OPTS}"})
-          end
-        end
-
         context 'manage_user set to true' do
           let(:params) do
             {

diff --git a/templates/setenv.sh.erb b/templates/setenv.sh.erb
@@ -90,8 +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}"