From 84a8215f9a0fdb622c5a017bc6b02ab5b75b2f35 Mon Sep 17 00:00:00 2001 From: Enzo Rivello Date: Wed, 4 Jan 2017 21:34:07 +0000 Subject: [PATCH 1/2] updated default version of aos, googledocs and rm for enterprise and community --- .kitchen.docker.yml | 4 ++-- Berksfile.lock | 2 +- attributes/aos.rb | 4 ++-- recipes/_googledocs-attributes.rb | 4 ++-- recipes/_rm-attributes.rb | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml index 2e380d7..8565a08 100644 --- a/.kitchen.docker.yml +++ b/.kitchen.docker.yml @@ -57,8 +57,8 @@ suites: "name": "chef-alfresco-enterprise", "hostname": "alfresco-allinone-test", "alfresco" : { - "version" : "5.1.1.1", - "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr","mysql","aos", "rm"], + "version" : "5.1.2", + "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr","mysql","aos", "rm",'googledocs','yourkit'], "edition" : "enterprise", "ssl_enabled" : false }, diff --git a/Berksfile.lock b/Berksfile.lock index ebbeaa4..f67d76d 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -26,7 +26,7 @@ GRAPH windows (>= 1.2.2) activemq (3.0.0) java (~> 1.13) - alfresco (0.7.11) + alfresco (0.7.17) activemq (>= 1.3.3) alfresco-webserver (~> 0.7.3) artifact-deployer (>= 0.8.18) diff --git a/attributes/aos.rb b/attributes/aos.rb index 2663624..28db985 100644 --- a/attributes/aos.rb +++ b/attributes/aos.rb @@ -1,6 +1,6 @@ node.default['artifacts']['_vti_bin']['groupId'] = "org.alfresco.aos-module" node.default['artifacts']['_vti_bin']['artifactId'] = "alfresco-vti-bin" -node.default['artifacts']['_vti_bin']['version'] = "1.1" +node.default['artifacts']['_vti_bin']['version'] = "1.1.5" node.default['artifacts']['_vti_bin']['type'] = 'war' node.default['artifacts']['_vti_bin']['owner'] = node['alfresco']['user'] @@ -12,7 +12,7 @@ node.default['artifacts']['aos-module']['groupId'] = "org.alfresco.aos-module" node.default['artifacts']['aos-module']['artifactId'] = "alfresco-aos-module" -node.default['artifacts']['aos-module']['version'] = "1.1" +node.default['artifacts']['aos-module']['version'] = "1.1.5" node.default['artifacts']['aos-module']['type'] = 'amp' node.default['artifacts']['aos-module']['owner'] = node['alfresco']['user'] node.default['artifacts']['aos-module']['destination'] = "/usr/share/tomcat/amps" diff --git a/recipes/_googledocs-attributes.rb b/recipes/_googledocs-attributes.rb index 446b6d1..93565ea 100644 --- a/recipes/_googledocs-attributes.rb +++ b/recipes/_googledocs-attributes.rb @@ -1,13 +1,13 @@ node.default['artifacts']['googledocs-repo']['groupId'] = 'org.alfresco.integrations' node.default['artifacts']['googledocs-repo']['artifactId'] = 'alfresco-googledocs-repo' -node.default['artifacts']['googledocs-repo']['version'] = '3.0.2' +node.default['artifacts']['googledocs-repo']['version'] = '3.0.3' node.default['artifacts']['googledocs-repo']['destination'] = node['alfresco']['amps_folder'] node.default['artifacts']['googledocs-repo']['owner'] = node['alfresco']['user'] node.default['artifacts']['googledocs-repo']['type'] = "amp" node.default['artifacts']['googledocs-share']['groupId'] = 'org.alfresco.integrations' node.default['artifacts']['googledocs-share']['artifactId'] = 'alfresco-googledocs-share' -node.default['artifacts']['googledocs-share']['version'] = '3.0.2' +node.default['artifacts']['googledocs-share']['version'] = '3.0.3' node.default['artifacts']['googledocs-share']['destination'] = node['alfresco']['amps_share_folder'] node.default['artifacts']['googledocs-share']['owner'] = node['alfresco']['user'] node.default['artifacts']['googledocs-share']['type'] = "amp" diff --git a/recipes/_rm-attributes.rb b/recipes/_rm-attributes.rb index 350b694..82580bd 100644 --- a/recipes/_rm-attributes.rb +++ b/recipes/_rm-attributes.rb @@ -1,14 +1,14 @@ if node['alfresco']['edition'] == 'enterprise' node.default['artifacts']['alfresco-rm-enterprise-repo']['groupId'] = "org.alfresco" node.default['artifacts']['alfresco-rm-enterprise-repo']['artifactId'] = "alfresco-rm-enterprise-repo" - node.default['artifacts']['alfresco-rm-enterprise-repo']['version'] = "2.5.0" + node.default['artifacts']['alfresco-rm-enterprise-repo']['version'] = "2.5.0.1" node.default['artifacts']['alfresco-rm-enterprise-repo']['type'] = "amp" node.default['artifacts']['alfresco-rm-enterprise-repo']['owner'] = node['alfresco']['user'] node.default['artifacts']['alfresco-rm-enterprise-repo']['destination'] = node['alfresco']['amps_folder'] node.default['artifacts']['alfresco-rm-enterprise-share']['groupId'] = "org.alfresco" node.default['artifacts']['alfresco-rm-enterprise-share']['artifactId'] = "alfresco-rm-enterprise-share" - node.default['artifacts']['alfresco-rm-enterprise-share']['version'] = "2.5.0" + node.default['artifacts']['alfresco-rm-enterprise-share']['version'] = "2.5.0.1" node.default['artifacts']['alfresco-rm-enterprise-share']['type'] = "amp" node.default['artifacts']['alfresco-rm-enterprise-share']['owner'] = node['alfresco']['user'] node.default['artifacts']['alfresco-rm-enterprise-share']['destination'] = node['alfresco']['amps_share_folder'] @@ -17,14 +17,14 @@ node.default['artifacts']['alfresco-rm-community-repo']['groupId'] = "org.alfresco" node.default['artifacts']['alfresco-rm-community-repo']['artifactId'] = "alfresco-rm-community-repo" - node.default['artifacts']['alfresco-rm-community-repo']['version'] = "2.5.0" + node.default['artifacts']['alfresco-rm-community-repo']['version'] = "2.5.a" node.default['artifacts']['alfresco-rm-community-repo']['type'] = "amp" node.default['artifacts']['alfresco-rm-community-repo']['owner'] = node['alfresco']['user'] node.default['artifacts']['alfresco-rm-community-repo']['destination'] = node['alfresco']['amps_folder'] node.default['artifacts']['alfresco-rm-community-share']['groupId'] = "org.alfresco" node.default['artifacts']['alfresco-rm-community-share']['artifactId'] = "alfresco-rm-community-share" - node.default['artifacts']['alfresco-rm-community-share']['version'] = "2.5.0" + node.default['artifacts']['alfresco-rm-community-share']['version'] = "2.5.a" node.default['artifacts']['alfresco-rm-community-share']['type'] = "amp" node.default['artifacts']['alfresco-rm-community-share']['owner'] = node['alfresco']['user'] node.default['artifacts']['alfresco-rm-community-share']['destination'] = node['alfresco']['amps_share_folder'] From 9a52d8d795f1566e1642be247f1d0a709efe383b Mon Sep 17 00:00:00 2001 From: Enzo Rivello Date: Wed, 4 Jan 2017 22:16:10 +0000 Subject: [PATCH 2/2] Update metadata.rb --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index d11652a..8ac839d 100644 --- a/metadata.rb +++ b/metadata.rb @@ -6,7 +6,7 @@ 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.17' +version '0.7.18' supports 'centos', '>= 7.0' supports 'redhat', '>= 7.0'