From b3292c652137353c37a8d33e9e64e7f5b5f1fa5d Mon Sep 17 00:00:00 2001 From: Thiago Marinho Date: Mon, 22 Jun 2020 12:30:31 -0300 Subject: [PATCH 1/2] Fix packages URLs from maven.org http://central.maven.org is not working anymore; replacing with https://repo1.maven.org --- README.md | 10 +++++----- spec/acceptance/1_standalone_spec.rb | 2 +- spec/acceptance/2_deployment_spec.rb | 4 ++-- spec/acceptance/3_recursive_resource_spec.rb | 2 +- spec/acceptance/4_domain_spec.rb | 2 +- spec/acceptance/5_domain_spec_custom_server_group.rb | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 9d8823d5..3ee3ed8b 100644 --- a/README.md +++ b/README.md @@ -531,7 +531,7 @@ Source supports these protocols: `http://`, `ftp://`, `puppet://`, `file://` ```puppet wildfly::deployment { 'hawtio.war': - source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.48/hawtio-web-1.4.48.war', + source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war', } ``` @@ -551,7 +551,7 @@ wildfly::deployment { 'hawtio.war': ```puppet wildfly::deployment { 'hawtio.war': - source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.48/hawtio-web-1.4.48.war', + source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war', server_group => 'main-server-group', } ``` @@ -609,7 +609,7 @@ Install a JAR module from a remote file system, puppet file server or local file ```puppet wildfly::config::module { 'org.postgresql': - source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar', + source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar', dependencies => ['javax.api', 'javax.transaction.api'] } ``` @@ -654,7 +654,7 @@ Alternatively, you can install a JDBC driver and module using deployment if your ```puppet wildfly::deployment { 'postgresql-9.3-1103-jdbc4.jar': - source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar' + source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar' } -> wildfly::datasources::datasource { 'DemoDS': @@ -672,7 +672,7 @@ A postgresql normal & XA datasource example ```puppet wildfly::config::module { 'org.postgresql': - source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar', + source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar', dependencies => ['javax.api', 'javax.transaction.api'], require => Class['wildfly'], } diff --git a/spec/acceptance/1_standalone_spec.rb b/spec/acceptance/1_standalone_spec.rb index e760fe5f..5de4878d 100644 --- a/spec/acceptance/1_standalone_spec.rb +++ b/spec/acceptance/1_standalone_spec.rb @@ -13,7 +13,7 @@ class { 'wildfly': } wildfly::config::module { 'org.postgresql': - source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar', + source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar', dependencies => ['javax.api', 'javax.transaction.api'] } -> diff --git a/spec/acceptance/2_deployment_spec.rb b/spec/acceptance/2_deployment_spec.rb index e9f422aa..183d1a8e 100644 --- a/spec/acceptance/2_deployment_spec.rb +++ b/spec/acceptance/2_deployment_spec.rb @@ -14,11 +14,11 @@ class { 'wildfly': } wildfly::deployment { 'hawtio.war': - source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war' + source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war' } wildfly::deployment { 'sample.war': - source => 'http://central.maven.org/maven2/org/codehaus/cargo/simple-war/1.6.2/simple-war-1.6.2.war' + source => 'https://repo1.maven.org/maven2/org/codehaus/cargo/simple-war/1.6.2/simple-war-1.6.2.war' } EOS diff --git a/spec/acceptance/3_recursive_resource_spec.rb b/spec/acceptance/3_recursive_resource_spec.rb index 00855ce4..c229577f 100644 --- a/spec/acceptance/3_recursive_resource_spec.rb +++ b/spec/acceptance/3_recursive_resource_spec.rb @@ -13,7 +13,7 @@ class { 'wildfly': } wildfly::config::module { 'org.postgresql': - source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar', + source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar', dependencies => ['javax.api', 'javax.transaction.api'], } -> diff --git a/spec/acceptance/4_domain_spec.rb b/spec/acceptance/4_domain_spec.rb index 0cd7c880..1281ef09 100644 --- a/spec/acceptance/4_domain_spec.rb +++ b/spec/acceptance/4_domain_spec.rb @@ -24,7 +24,7 @@ class { 'wildfly': } wildfly::deployment { 'hawtio.war': - source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war', + source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.warhawtio-web-1.4.66.war', server_group => 'main-server-group', } diff --git a/spec/acceptance/5_domain_spec_custom_server_group.rb b/spec/acceptance/5_domain_spec_custom_server_group.rb index e4bbc965..6421b868 100644 --- a/spec/acceptance/5_domain_spec_custom_server_group.rb +++ b/spec/acceptance/5_domain_spec_custom_server_group.rb @@ -20,7 +20,7 @@ class { 'wildfly': } wildfly::deployment { 'hawtio.war': - source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war', + source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war', server_group => 'app-server-group', } From bc3e7be0ee351e2609614e410da7bdb6ed2357bc Mon Sep 17 00:00:00 2001 From: Thiago Marinho Date: Mon, 22 Jun 2020 15:51:45 -0300 Subject: [PATCH 2/2] Using "jdk" key from .travis.yml to install openjdk 8 Keeping method "install_java" (now as "install_wget") because wget package is still needed --- .travis.yml | 2 ++ spec/spec_helper_acceptance.rb | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a014f157..e06868dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ cache: - wget_cache rvm: - 2.3.7 +jdk: + - openjdk8 bundler_args: --without acceptance script: - bundle exec rake syntax diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index cdea3ae8..aaa20e5a 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -16,9 +16,8 @@ def install_with_dependencies(host) on host, puppet('module', 'install', 'jethrocarr-initfact') end -def install_java(host) +def install_wget(host) on host, puppet('resource', 'package', 'wget', 'ensure=installed') - on host, 'wget https://doc-0o-9c-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/7eelvqree5q8ski1d13625m75bahknja/1568980800000/18214363628765128033/*/1tkj8_kAFRCNxZLqOaqU6XRj6ac0iEjer?e=download -O /var/cache/wget/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz && tar -C /opt -zxvf /var/cache/wget/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz' end RSpec.configure do |c| @@ -33,7 +32,7 @@ def install_java(host) if master.nil? hosts.each do |host| install_with_dependencies(host) - install_java(host) + install_wget(host) end else install_with_dependencies(master) @@ -46,7 +45,7 @@ def install_java(host) puppet_server_fqdn = fact_on('master', 'fqdn') hosts.agents.each do |agent| - install_java(agent) + install_wget(agent) config = { 'main' => { @@ -87,6 +86,6 @@ def test_data data['service_name'] = ENV['TEST_service_name'] end -data['java_home'] = '/opt/jdk8u192-b12/' +data['java_home'] = '/usr/lib/jvm/jre-1.8.0-openjdk' RSpec.configuration.test_data = data