diff --git a/smartgears/accounting-service/defaults/main.yml b/smartgears/accounting-service/defaults/main.yml index c8de38da..671991d6 100644 --- a/smartgears/accounting-service/defaults/main.yml +++ b/smartgears/accounting-service/defaults/main.yml @@ -7,3 +7,10 @@ accounting_service_extension: war accounting_service_file: '{{ accounting_service_name }}-{{ accounting_service_version }}.{{ accounting_service_extension }}' accounting_service_group_id: org.gcube.accounting accounting_service_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}' + +accounting_service_library_name: document-store-lib-accounting-service +accounting_service_library_classifier: jar-with-dependencies +accounting_couchbase_library_name: document-store-lib-couchbase +accounting_couchbase_library_extension: jar +accounting_couchbase_library_version: latest +accounting_couchbase_library_group_id: org.gcube.data.publishing diff --git a/smartgears/accounting-service/tasks/main.yml b/smartgears/accounting-service/tasks/main.yml index 866c4f5e..31db42a7 100644 --- a/smartgears/accounting-service/tasks/main.yml +++ b/smartgears/accounting-service/tasks/main.yml @@ -21,6 +21,21 @@ file: dest={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }} state=absent when: ( accounting_download | changed ) + - name: Remove the accounting service library + shell: find {{ smartgears_instance_path }}/lib -name {{ accounting_service_library_name }}-\* -exec rm -fr {} \; + ignore_errors: yes + when: ( accounting_download | changed ) + + - name: Remove the accounting couchbase library if present + shell: find {{ smartgears_instance_path }}/lib -name {{ accounting_couchbase_library_name }}-\* -exec rm -fr {} \; + ignore_errors: yes + when: ( accounting_download | changed ) + + - name: Get the couchbase library + maven_artifact: artifact_id={{ accounting_couchbase_library_name }} version={{ accounting_couchbase_library_version | default('latest') }} group_id={{ accounting_couchbase_library_group_id }} extension={{ accounting_couchbase_library_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ accounting_service_library_classifier }} dest={{ smartgears_instance_path }}/lib + when: ( accounting_download | changed ) + + - name: Copy the accounting_service war file to the destination place copy: src={{ smartgears_downloads_dir }}/{{ accounting_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }}.{{ accounting_service_extension }} remote_src=yes force=yes notify: Restart smartgears diff --git a/smartgears/dm_pool_manager/defaults/main.yml b/smartgears/dm_pool_manager/defaults/main.yml index c174bc62..70e9b4a3 100644 --- a/smartgears/dm_pool_manager/defaults/main.yml +++ b/smartgears/dm_pool_manager/defaults/main.yml @@ -1,7 +1,7 @@ --- dm_pool_manager_install: False dm_pool_manager_upgrade: False -dm_pool_manager_version: 2.3.0-4.9.0-160081 +dm_pool_manager_version: latest dm_pool_manager_name: dataminer-pool-manager dm_pool_manager_group_id: org.gcube.dataAnalysis diff --git a/smartgears/smartgears/defaults/main.yml b/smartgears/smartgears/defaults/main.yml index 81de04ac..a8944860 100644 --- a/smartgears/smartgears/defaults/main.yml +++ b/smartgears/smartgears/defaults/main.yml @@ -16,7 +16,7 @@ smartgears_user_home: '{{ d4science_user_home }}' smartgears_downloads_dir: '{{ d4science_user_home }}/downloads' smartgears_instance_path: '{{ smartgears_user_home }}/tomcat' smartgears_install_path: '{{ smartgears_user_home }}/SmartGears' -smartgears_distribution_version: 2.1.3-4.9.0-154641 +smartgears_distribution_version: 2.2.0-4.10.0-162179 smartgears_global_base_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}' smartgears_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ smartgears_gcube_repository }}' diff --git a/smartgears/smartgears/tasks/smartgears-app.yml b/smartgears/smartgears/tasks/smartgears-app.yml index 9b4928ee..adb2c2f5 100644 --- a/smartgears/smartgears/tasks/smartgears-app.yml +++ b/smartgears/smartgears/tasks/smartgears-app.yml @@ -20,6 +20,7 @@ - name: Remove the smartgears-distribution files shell: find {{ smartgears_downloads_dir }} -type d -name smartgears-distribution-\* -exec rm -fr {} \; + ignore_errors: yes when: ( smartgears_download | changed ) tags: [ 'smartgears', 'smartgears_distribution', 'tomcat' ] diff --git a/smartgears/social-networking-library-ws/defaults/main.yml b/smartgears/social-networking-library-ws/defaults/main.yml index 6d79a4e4..d9af0a64 100644 --- a/smartgears/social-networking-library-ws/defaults/main.yml +++ b/smartgears/social-networking-library-ws/defaults/main.yml @@ -1,6 +1,6 @@ --- social_networking_library_ws_install: False -social_networking_library_ws_version: 2.1.0-4.8.0-152935 +social_networking_library_ws_version: 2.1.0-4.10.0-152935 social_networking_library_ws_name: social-networking-library-ws social_networking_library_ws_group_id: org.gcube.portal social_networking_library_ws_extension: war diff --git a/smartgears/tabular_data/defaults/main.yml b/smartgears/tabular_data/defaults/main.yml index f6797e43..27ed2825 100644 --- a/smartgears/tabular_data/defaults/main.yml +++ b/smartgears/tabular_data/defaults/main.yml @@ -2,7 +2,7 @@ gcube_repository: gcube-staging tabular_data_install: False tabular_data_upgrade: False -tabular_data_version: 1.8.2-4.9.0-160583 +tabular_data_version: 1.8.2-4.10.0-160583 tabular_data_name: tabular-data-manager tabular_group_id: org.gcube.data.analysis.tabulardata