Merge branch 'develop'

Berksfile.lock

@@ -4,7 +4,7 @@ DEPENDENCIES
     metadata: true
   commons
     git: https://github.com/Alfresco/chef-commons.git
-    revision: 19af076187090e9bc90b8af7287577e22ef2b932
+    revision: 1fcab995e749d372997e0c6957f9a2199ba151ef
   database
     git: https://github.com/enzor/database.git
     revision: 416897fdc662766025eaf2ace668a3f3c62850c3
@@ -26,7 +26,7 @@ GRAPH
     windows (>= 1.2.2)
   activemq (2.0.4)
     java (~> 1.13)
-  alfresco (0.6.45)
+  alfresco (0.7.2)
     activemq (>= 1.3.3)
     artifact-deployer (>= 0.8.16)
     build-essential (>= 2.2.3)
@@ -76,7 +76,7 @@ GRAPH
     line (>= 0.6.3)
     python (>= 1.4.6)
     yum-epel (>= 0.6.0)
-  compat_resource (12.10.7)
+  compat_resource (12.14.0)
   cpu (0.2.0)
   database (5.0.0)
     postgresql (>= 1.0.0)
@@ -88,18 +88,17 @@ GRAPH
     x264 (>= 0.0.0)
     yasm (>= 0.0.0)
   file (2.0.0)
-  git (4.6.0)
+  git (5.0.0)
     build-essential (>= 0.0.0)
     dmg (>= 0.0.0)
-    windows (>= 0.0.0)
     yum-epel (>= 0.0.0)
   haproxy (1.6.7)
     build-essential (>= 0.0.0)
     cpu (>= 0.2.0)
   homebrew (2.1.0)
     build-essential (>= 2.1.2)
   imagemagick (0.2.3)
-  java (1.41.0)
+  java (1.42.0)
     apt (>= 0.0.0)
     homebrew (>= 0.0.0)
     windows (>= 0.0.0)
@@ -137,7 +136,7 @@ GRAPH
   ohai (2.1.0)
   openssl (4.4.0)
     chef-sugar (>= 3.1.1)
-  packagecloud (0.2.4)
+  packagecloud (0.2.5)
   postgresql (4.0.6)
     apt (>= 1.9.0)
     build-essential (>= 0.0.0)
@@ -161,19 +160,19 @@ GRAPH
     line (>= 0.0.0)
     openssl (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  windows (1.44.1)
+  windows (1.44.3)
     chef_handler (>= 0.0.0)
   x264 (0.6.0)
     build-essential (>= 0.0.0)
     git (>= 0.0.0)
     yasm (>= 0.0.0)
-  yasm (1.0.3)
+  yasm (1.1.0)
     build-essential (>= 0.0.0)
     git (>= 0.0.0)
-  yum (3.11.0)
+  yum (3.12.0)
   yum-atrpms (0.1.3)
     yum (~> 3.2)
-  yum-epel (0.7.0)
+  yum-epel (0.7.1)
     yum (>= 3.6.3)
-  yum-mysql-community (0.2.0)
+  yum-mysql-community (0.3.0)
     yum (>= 3.2)

attributes/default.rb

@@ -83,7 +83,7 @@
 default['mysql']['update_gcc'] = true
 
 #3rd-party defaults
-default['alfresco']['imagemagick_version'] = "6.9.5-8"
+default['alfresco']['imagemagick_version'] = "6.9.5-9"
 default['alfresco']['use_imagemagick_os_repo'] = true
 
 default['alfresco']['imagemagick_libs_name'] = "ImageMagick-libs-#{node['alfresco']['imagemagick_version']}.x86_64.rpm"

metadata.rb

@@ -6,7 +6,7 @@
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 issues_url ""
 source_url ""
-version "0.7.1"
+version "0.7.2"
 
 # Resolved by Berkshelf, not present in Supermarket or forked
 depends "file"