Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove java 1.8 support #242

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove java 1.8 support #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$version still defaults to 5.7.1. Is 5.7.1 still supported by atlassian? Does it support running on jdk11?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've looked into this now.
According to https://confluence.atlassian.com/support/atlassian-support-end-of-life-policy-201851003.html 7.19 is the oldest supported version with EOL 13 Dec 2024
Since 7.x is still supported on java8 and Oracle continue to support java8 for paying customers https://www.oracle.com/java/technologies/java-se-support-roadmap.html it's a bit to early to remove support in the module.

$jvm_xms = '256m',
$jvm_xmx = '1024m',
$jvm_permgen = '256m',
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/1_default_parameters_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like my change to the archive resource above in 2a4bfcc is incomplete ...
Title 'jdk11' but it downloads zulu jdk8.

download_url => fact('download_url'),
javahome => $jh,
}
Expand Down Expand Up @@ -55,6 +55,6 @@
end

describe command('wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090') do
its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - AlmaLinux 8 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - AlmaLinux 8 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - AlmaLinux 9 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - AlmaLinux 9 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - Rocky 8 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - Rocky 8 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - Rocky 9 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - Rocky 9 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - CentOS 9 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - CentOS 9 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - Ubuntu 20.04 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - Ubuntu 20.04 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - Ubuntu 22.04 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - Ubuntu 22.04 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - Debian 11 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - Debian 11 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - Debian 12 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->

Check failure on line 58 in spec/acceptance/1_default_parameters_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - Debian 12 

confluence Command "wget -q --tries=240 --retry-connrefused --read-timeout=10 -O- localhost:8090" stdout is expected to match /http:\/\/www.atlassian.com\//

Failure/Error: its(:stdout) { is_expected.to match %r{http://www.atlassian.com/} }
  expected "<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->\n" to match /http:\/\/www.atlassian.com\//
  Diff:
  @@ -1 +1 @@
  -/http:\/\/www.atlassian.com\//
  +<!-- Dummy file to trigger action handling from a welcome file in Tomcat 6 -->
end
end
2 changes: 1 addition & 1 deletion spec/acceptance/2_default_parameters_upgrade_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/3_custom_parameters_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
16 changes: 0 additions & 16 deletions spec/classes/confluence_config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 0 additions & 2 deletions templates/setenv.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Loading