diff --git a/build.gradle b/build.gradle index fb556c6..16b8492 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ task wrapper(type: Wrapper) { ext.src = 'src/main/mpack/' ext.repostemplate = 'src/main/template/repos/repoinfo.xml' -ext.reposinfo554 = 'custom-services/SOLR/5.5.4/repos/' +ext.reposinfo555 = 'custom-services/SOLR/5.5.5/repos/' distributions { @@ -27,10 +27,10 @@ distributions { line.replace("{VERSION}", "${version}") } - into(reposinfo554) { + into(reposinfo555) { from { repostemplate } filter { String line -> - line.replace("{REPOID}", "${repoid554}") + line.replace("{REPOID}", "${repoid555}") } } } diff --git a/gradle.properties b/gradle.properties index 6b8d9f9..61986d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=2.2.9 +version=2.2.10 packageName=solr-service # repos ids -repoid554=HDP-SOLR-XXXX +repoid555=HDP-SOLR-XXXX diff --git a/src/main/mpack/common-services/SOLR/5.5.4/alerts.json b/src/main/mpack/common-services/SOLR/5.5.5/alerts.json similarity index 97% rename from src/main/mpack/common-services/SOLR/5.5.4/alerts.json rename to src/main/mpack/common-services/SOLR/5.5.5/alerts.json index a67633a..9a3ca29 100755 --- a/src/main/mpack/common-services/SOLR/5.5.4/alerts.json +++ b/src/main/mpack/common-services/SOLR/5.5.5/alerts.json @@ -40,7 +40,7 @@ "scope": "ANY", "source": { "type": "SCRIPT", - "path": "SOLR/5.5.4/package/alerts/alert_solr_cpu_metrics.py", + "path": "SOLR/5.5.5/package/alerts/alert_solr_cpu_metrics.py", "parameters": [ { "name": "connection.timeout", @@ -90,7 +90,7 @@ "scope": "ANY", "source": { "type": "SCRIPT", - "path": "SOLR/5.5.4/package/alerts/alert_solr_memory_metrics.py", + "path": "SOLR/5.5.5/package/alerts/alert_solr_memory_metrics.py", "parameters": [ { "name": "connection.timeout", diff --git a/src/main/mpack/common-services/SOLR/5.5.4/configuration/example-collection.xml b/src/main/mpack/common-services/SOLR/5.5.5/configuration/example-collection.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/configuration/example-collection.xml rename to src/main/mpack/common-services/SOLR/5.5.5/configuration/example-collection.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-cloud.xml b/src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-cloud.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-cloud.xml rename to src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-cloud.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-config-env.xml b/src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-config-env.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-config-env.xml rename to src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-config-env.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-hdfs.xml b/src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-hdfs.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-hdfs.xml rename to src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-hdfs.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-log4j.xml b/src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-log4j.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-log4j.xml rename to src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-log4j.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-metrics.xml b/src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-metrics.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-metrics.xml rename to src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-metrics.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-security.xml b/src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-security.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-security.xml rename to src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-security.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-ssl.xml b/src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-ssl.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/configuration/solr-ssl.xml rename to src/main/mpack/common-services/SOLR/5.5.5/configuration/solr-ssl.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/kerberos.json b/src/main/mpack/common-services/SOLR/5.5.5/kerberos.json similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/kerberos.json rename to src/main/mpack/common-services/SOLR/5.5.5/kerberos.json diff --git a/src/main/mpack/common-services/SOLR/5.5.4/metainfo.xml b/src/main/mpack/common-services/SOLR/5.5.5/metainfo.xml similarity index 96% rename from src/main/mpack/common-services/SOLR/5.5.4/metainfo.xml rename to src/main/mpack/common-services/SOLR/5.5.5/metainfo.xml index 7d27037..29267dc 100755 --- a/src/main/mpack/common-services/SOLR/5.5.4/metainfo.xml +++ b/src/main/mpack/common-services/SOLR/5.5.5/metainfo.xml @@ -10,7 +10,7 @@ faceted search, dynamic clustering, database integration, and rich document (e.g., Word, PDF) handling. - 5.5.4 + 5.5.5 @@ -18,7 +18,7 @@ Solr MASTER 1+ - true + false PYTHON diff --git a/src/main/mpack/common-services/SOLR/5.5.4/metrics.json b/src/main/mpack/common-services/SOLR/5.5.5/metrics.json similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/metrics.json rename to src/main/mpack/common-services/SOLR/5.5.5/metrics.json diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/alerts/alert_solr_cpu_metrics.py b/src/main/mpack/common-services/SOLR/5.5.5/package/alerts/alert_solr_cpu_metrics.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/alerts/alert_solr_cpu_metrics.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/alerts/alert_solr_cpu_metrics.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/alerts/alert_solr_memory_metrics.py b/src/main/mpack/common-services/SOLR/5.5.5/package/alerts/alert_solr_memory_metrics.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/alerts/alert_solr_memory_metrics.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/alerts/alert_solr_memory_metrics.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/params.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/params.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/params.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/params.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/service_check.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/service_check.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/service_check.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/service_check.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_cloud.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_cloud.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_cloud.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_cloud.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_hdfs_support.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_hdfs_support.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_hdfs_support.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_hdfs_support.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_kerberos_auth.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_kerberos_auth.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_kerberos_auth.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_kerberos_auth.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_metrics.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_metrics.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_metrics.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_metrics.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_ssl_support.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_ssl_support.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/setup_solr_ssl_support.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/setup_solr_ssl_support.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/solr.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/solr.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/solr.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/solr.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/solr_utils.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/solr_utils.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/solr_utils.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/solr_utils.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/scripts/status_params.py b/src/main/mpack/common-services/SOLR/5.5.5/package/scripts/status_params.py similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/scripts/status_params.py rename to src/main/mpack/common-services/SOLR/5.5.5/package/scripts/status_params.py diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/templates/log4j2.xml b/src/main/mpack/common-services/SOLR/5.5.5/package/templates/log4j2.xml similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/templates/log4j2.xml rename to src/main/mpack/common-services/SOLR/5.5.5/package/templates/log4j2.xml diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/templates/solr.xml.j2 b/src/main/mpack/common-services/SOLR/5.5.5/package/templates/solr.xml.j2 similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/templates/solr.xml.j2 rename to src/main/mpack/common-services/SOLR/5.5.5/package/templates/solr.xml.j2 diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/templates/solr_metrics_jaas.conf.j2 b/src/main/mpack/common-services/SOLR/5.5.5/package/templates/solr_metrics_jaas.conf.j2 similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/templates/solr_metrics_jaas.conf.j2 rename to src/main/mpack/common-services/SOLR/5.5.5/package/templates/solr_metrics_jaas.conf.j2 diff --git a/src/main/mpack/common-services/SOLR/5.5.4/package/templates/solr_server_jaas.conf.j2 b/src/main/mpack/common-services/SOLR/5.5.5/package/templates/solr_server_jaas.conf.j2 similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/package/templates/solr_server_jaas.conf.j2 rename to src/main/mpack/common-services/SOLR/5.5.5/package/templates/solr_server_jaas.conf.j2 diff --git a/src/main/mpack/common-services/SOLR/5.5.4/quicklinks/quicklinks.json b/src/main/mpack/common-services/SOLR/5.5.5/quicklinks/quicklinks.json similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/quicklinks/quicklinks.json rename to src/main/mpack/common-services/SOLR/5.5.5/quicklinks/quicklinks.json diff --git a/src/main/mpack/common-services/SOLR/5.5.4/role_command_order.json b/src/main/mpack/common-services/SOLR/5.5.5/role_command_order.json similarity index 100% rename from src/main/mpack/common-services/SOLR/5.5.4/role_command_order.json rename to src/main/mpack/common-services/SOLR/5.5.5/role_command_order.json diff --git a/src/main/mpack/common-services/SOLR/5.5.4/service_advisor.py b/src/main/mpack/common-services/SOLR/5.5.5/service_advisor.py similarity index 99% rename from src/main/mpack/common-services/SOLR/5.5.4/service_advisor.py rename to src/main/mpack/common-services/SOLR/5.5.5/service_advisor.py index 49b5532..b8781e1 100755 --- a/src/main/mpack/common-services/SOLR/5.5.4/service_advisor.py +++ b/src/main/mpack/common-services/SOLR/5.5.5/service_advisor.py @@ -22,7 +22,7 @@ PROPERTIES = "properties" -class SOLR554ServiceAdvisor(service_advisor.ServiceAdvisor): +class SOLR555ServiceAdvisor(service_advisor.ServiceAdvisor): def is_not_null_or_empty(self, property_value): if property_value is None: return self.getErrorItem("Value cannot be null or empty") diff --git a/src/main/mpack/custom-services/SOLR/5.5.4/metainfo.xml b/src/main/mpack/custom-services/SOLR/5.5.5/metainfo.xml similarity index 91% rename from src/main/mpack/custom-services/SOLR/5.5.4/metainfo.xml rename to src/main/mpack/custom-services/SOLR/5.5.5/metainfo.xml index 1fcb937..dd0e8b0 100755 --- a/src/main/mpack/custom-services/SOLR/5.5.4/metainfo.xml +++ b/src/main/mpack/custom-services/SOLR/5.5.5/metainfo.xml @@ -18,8 +18,8 @@ SOLR - 5.5.4 - common-services/SOLR/5.5.4 + 5.5.5 + common-services/SOLR/5.5.5 diff --git a/src/main/mpack/extensions/SOLR/5.5.4/metainfo.xml b/src/main/mpack/extensions/SOLR/5.5.5/metainfo.xml similarity index 100% rename from src/main/mpack/extensions/SOLR/5.5.4/metainfo.xml rename to src/main/mpack/extensions/SOLR/5.5.5/metainfo.xml diff --git a/src/main/mpack/mpack.json b/src/main/mpack/mpack.json index c19901d..895409a 100755 --- a/src/main/mpack/mpack.json +++ b/src/main/mpack/mpack.json @@ -12,7 +12,7 @@ "name": "solr-service-definitions ", "type": "service-definitions", "source_dir": "common-services", - "service_version": "5.5.4" + "service_version": "5.5.5" }, { "name" : "solr-extension-definitions", @@ -26,7 +26,7 @@ "service_versions_map": [ { "service_name" : "SOLR", - "service_version" : "5.5.4", + "service_version" : "5.5.5", "applicable_stacks" : [ { "stack_name" : "HDP",