Skip to content
This repository was archived by the owner on Oct 21, 2020. It is now read-only.

Commit

Permalink
Merge pull request #181 from Alfresco/develop
Browse files Browse the repository at this point in the history
aos, googledocs and rm default version update.
  • Loading branch information
Enzo Rivello authored Jan 4, 2017
2 parents b6e520f + 9a52d8d commit 1edc703
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .kitchen.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion Berksfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions attributes/aos.rb
Original file line number Diff line number Diff line change
@@ -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']

Expand All @@ -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"
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions recipes/_googledocs-attributes.rb
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 4 additions & 4 deletions recipes/_rm-attributes.rb
Original file line number Diff line number Diff line change
@@ -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']
Expand All @@ -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']
Expand Down

0 comments on commit 1edc703

Please sign in to comment.