Merge pull request #63 from bdwyertech/2.0

2.0.0
bdwyertech · Aug 7, 2018 · c28208f · c28208f
2 parents c3fd273 + dda830c
commit c28208f
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 18 deletions.
diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
@@ -29,7 +29,7 @@ verifier:
 platforms:
 - name: amazon
   driver:
-    image: amazonlinux:latest
+    image: amazonlinux:1
     pid_one_command: /sbin/init
     intermediate_instructions:
       - >

diff --git a/Berksfile b/Berksfile
@@ -4,4 +4,6 @@ source 'https://supermarket.chef.io'
 
 metadata
 
-cookbook 'test', path: './test/fixtures/cookbooks/test'
+group :integration do
+  cookbook 'test', path: './test/fixtures/cookbooks/test'
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 WildFly Cookbook CHANGELOG
 ==========================
 
+# 2.0.0 (2018-7-6)
+* WildFly 13.0.0
+* Remove Java cookbook dependency -- Bring your own Java
+* Remove unnecessary `apt` & `yum` dependencies
+
 # 1.1.0 (2018-5-28)
 * WildFly 12.0.0
 * Update Java to 8u171

diff --git a/README.md b/README.md
@@ -28,7 +28,6 @@ Example wrapper cookbook scenarios are available in the test cookbook, under `te
 
 
 # Attributes
-* `node['wildfly']['install_java']` - Install Java using Java Cookbook.  Default `true`
 * `node['wildfly']['base']` - Base directory to run Wildfly from
 * `node['wildfly']['version']` - Specify the version of Wildfly
 * `node['wildfly']['url']` - URL to Wildfly tarball

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -16,9 +16,9 @@
 
 # => Wildfly Configuration
 # => Source
-default['wildfly']['version'] = '12.0.0'
-default['wildfly']['url'] = 'http://download.jboss.org/wildfly/12.0.0.Final/wildfly-12.0.0.Final.tar.gz'
-default['wildfly']['checksum'] = '42fa41b25a2cbf4782f78fd8c4d537a06acfa60688fcc0ece9299f140c76afe0'
+default['wildfly']['version'] = '13.0.0'
+default['wildfly']['url'] = 'http://download.jboss.org/wildfly/13.0.0.Final/wildfly-13.0.0.Final.tar.gz'
+default['wildfly']['checksum'] = 'f74fa1882a83fc6650fb43d21ed4527eeb5478f39878f15f1f79d3dc01a997f9'
 
 # => Base Directory
 default['wildfly']['base'] = '/opt/wildfly'
@@ -78,5 +78,3 @@
 # => Hardcode JAVA_HOME into init.d configuration.
 # => Based on value of node['java']['java_home']
 default['wildfly']['java']['enforce_java_home'] = true
-
-default['wildfly']['install_java'] = true
diff --git a/metadata.rb b/metadata.rb
@@ -1,20 +1,16 @@
 # Encoding: UTF-8
-
 name             'wildfly'
 maintainer       'Brian Dwyer - Intelligent Digital Services'
 maintainer_email 'bdwyertech'
 license          'Apache-2.0'
 description      'Installs/Configures wildfly'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.1.0'
+version          '2.0.0'
 chef_version     '>= 12.19' if respond_to?(:chef_version)
 
 supports 'centos'
 supports 'ubuntu'
 
-depends 'apt'
-depends 'yum'
-depends 'java', '~> 1.22'
 depends 'systemd'
 
 gem 'net-http-digest_auth'

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -18,7 +18,6 @@
 # limitations under the License.
 #
 
-include_recipe 'java' if node['wildfly']['install_java']
 include_recipe 'wildfly::install'
 include_recipe 'wildfly::mysql_connector' if node['wildfly']['mysql']['enabled']
 include_recipe 'wildfly::postgres_connector' if node['wildfly']['postgresql']['enabled']
diff --git a/resources/attribute.rb b/resources/attribute.rb
@@ -25,7 +25,7 @@
 resource_name :wildfly_attribute
 
 # => Define the Resource Properties
-property :parameter, String, required: true, name_property: true
+property :parameter, String, name_property: true
 property :value,     String, coerce: proc { |m| enable_escape ? Shellwords.escape(m) : m }
 property :path,      String
 property :restart,   [FalseClass, TrueClass], default: true

diff --git a/resources/property.rb b/resources/property.rb
@@ -25,7 +25,7 @@
 resource_name :wildfly_property
 
 # => Define the Resource Properties
-property :property, String, required: true, name_property: true
+property :property, String, name_property: true
 property :value, String, coerce: proc { |m| enable_escape ? Shellwords.escape(m) : m }
 property :enable_escape, [FalseClass, TrueClass], default: true
 property :instance, String, required: false

diff --git a/attributes/java.rb → ...ixtures/cookbooks/test/attributes/java.rb b/attributes/java.rb → ...ixtures/cookbooks/test/attributes/java.rb
@@ -19,5 +19,5 @@
 default['java']['install_flavor'] = 'oracle'
 default['java']['oracle']['accept_oracle_download_terms'] = true
 default['java']['jdk_version'] = '8'
-default['java']['jdk']['8']['x86_64']['url'] = 'http://download.oracle.com/otn-pub/java/jdk/8u171-b11/512cd62ec5174c3487ac17c61aaa89e8/jdk-8u171-linux-x64.tar.gz'
-default['java']['jdk']['8']['x86_64']['checksum'] = 'b6dd2837efaaec4109b36cfbb94a774db100029f98b0d78be68c27bec0275982'
+default['java']['jdk']['8']['x86_64']['url'] = 'http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.tar.gz'
+default['java']['jdk']['8']['x86_64']['checksum'] = '1845567095bfbfebd42ed0d09397939796d05456290fb20a83c476ba09f991d3'
diff --git a/test/fixtures/cookbooks/test/metadata.rb b/test/fixtures/cookbooks/test/metadata.rb
@@ -2,3 +2,4 @@
 version '0.0.1'
 
 depends 'wildfly'
+depends 'java'
diff --git a/test/fixtures/cookbooks/test/recipes/api.rb b/test/fixtures/cookbooks/test/recipes/api.rb
@@ -1,5 +1,6 @@
 # Encoding: UTF-8
 
+include_recipe 'java'
 include_recipe 'wildfly::default'
 
 # => Set Transaction Node Identifier

diff --git a/test/fixtures/cookbooks/test/recipes/default.rb b/test/fixtures/cookbooks/test/recipes/default.rb
@@ -1,5 +1,6 @@
 # Encoding: UTF-8
 
+include_recipe 'java'
 include_recipe 'wildfly::default'
 
 wildfly_property 'Database URL' do
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		version '0.0.1'

		depends 'wildfly'
		depends 'java'