From 76fdf50836bb1823640038e94796b2025c6981a6 Mon Sep 17 00:00:00 2001 From: Jerome Luckenbach Date: Mon, 13 May 2019 20:35:43 +0200 Subject: [PATCH] Get feature files from jfrog Signed-off-by: Jerome Luckenbach --- process_addons.groovy | 2 +- update-external-resources.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) mode change 100755 => 100644 update-external-resources.sh diff --git a/process_addons.groovy b/process_addons.groovy index 08d8c4c7eb..5f367d807e 100644 --- a/process_addons.groovy +++ b/process_addons.groovy @@ -9,7 +9,7 @@ def collect_feature_xml = { features, xml, attrs -> def collect_features = { features -> collect_feature_xml(features, '.external-resources/openhab-distro/features/addons/src/main/feature/feature.xml', ['install': 'auto', 'since': '2x']) - collect_feature_xml(features, '.external-resources/openhab2-addons/features/karaf/openhab-addons/src/main/feature/feature.xml', ['install': 'auto', 'since': '2x']) + collect_feature_xml(features, '.external-resources/jfrog-files/feature.xml', ['install': 'auto', 'since': '2x']) collect_feature_xml(features, '.external-resources/openhab1-addons/features/openhab-addons/src/main/feature/feature.xml', ['install': 'auto', 'since': '1x']) collect_feature_xml(features, '.external-resources/openhab1-addons/features/openhab-addons-legacy/src/main/feature/feature.xml', ['install': 'legacy', 'since': '1x']) } diff --git a/update-external-resources.sh b/update-external-resources.sh old mode 100755 new mode 100644 index ab0434a21d..383373ddbf --- a/update-external-resources.sh +++ b/update-external-resources.sh @@ -59,6 +59,11 @@ pull_or_clone_repo "openhab-webui" "openhab/openhab-webui.git" echo_process "Updating submodules of the 'openhab-bundles' repo... " git -C "$resourcefolder/openhab-bundles" submodule update --recursive --remote --init +echo_process "Fetching feature.xml file from the snapshot repository..." +wget -r -l 1 -npdH -A '*.xml' -P "$resourcefolder/jfrog-files" "https://openhab.jfrog.io/openhab/libs-snapshot/org/openhab/distro/openhab-addons/2.5.0-SNAPSHOT/" +# Copy the lates feature file into the finally used feature.xml +cp `ls .external-resources/jfrog-files/openhab-addons-2.5.0-*-features.xml | sort | tail -1` .external-resources/jfrog-files/feature.xml + echo_process "Running Maven Clean Plugin... " mvn clean echo_process "Running Maven Package Plugin... "