Merge pull request #240 from Alfresco/develop

Please merge develop into master

Berksfile

@@ -1,12 +1,12 @@
 source 'https://api.berkshelf.com'
 
-metadata
-
 cookbook 'tomcat', git: 'https://github.com/maoo/tomcat.git', tag: 'v11.17.3'
 # cookbook 'tomcat', path: '../tomcat'
 
 # Resolve transitive deps of artifact-deployer
-cookbook 'maven', git: 'https://github.com/maoo/maven.git', tag: 'v1.2.0-fork'
+cookbook 'maven', git: 'https://github.com/Alfresco/maven.git', tag: 'v1.2.0-fork'
 cookbook 'file', git: 'https://github.com/jenssegers/chef-file.git', tag: 'v1.0.0'
-cookbook 'commons', git: 'https://github.com/Alfresco/chef-commons.git', tag: 'v0.5.5'
-cookbook 'database', git: 'https://github.com/enzor/database.git'
+cookbook 'commons', git: 'https://github.com/Alfresco/chef-commons.git', tag: 'v0.5.7'
+cookbook 'database', git: 'https://github.com/Alfresco/database.git', tag: 'v4.0.6'
+
+metadata

metadata.rb

@@ -6,23 +6,22 @@
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 issues_url       'https://github.com/Alfresco/chef-alfresco/issues'
 source_url       'https://github.com/Alfresco/chef-alfresco'
-version '0.7.30'
+version '0.7.31'
 
 supports 'centos', '>= 7.0'
 supports 'redhat', '>= 7.0'
 
 # Resolved by Berkshelf, not present in Supermarket or forked
-depends 'file'
 depends 'tomcat'
 depends 'maven'
+depends 'file'
 depends 'commons'
-depends 'alfresco-webserver', '~> 0.7.4'
-depends 'nginx-hardening', '~> 1.1.0'
+depends 'database'
+depends 'alfresco-webserver', '~> 0.7.5'
 
 # Community cookbooks
 depends 'activemq', '>= 1.3.3'
 depends 'artifact-deployer', '>= 0.8.18'
-depends 'database', '>= 4.0.6'
 depends 'ffmpeg', '>= 0.4.4'
 depends 'haproxy', '~> 1.6.6'
 depends 'imagemagick', '>= 0.2.3'
@@ -36,5 +35,5 @@
 depends 'postgresql', '>= 3.4.18'
 depends 'rsyslog', '>= 1.15.0'
 depends 'swftools', '>= 0.2.4'
-depends 'yum-epel'
+depends 'yum-epel', '>= 0.7.1'
 depends 'yum-atrpms', '>= 0.1.0'