Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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}")
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
faceted search, dynamic clustering, database integration, and
rich document (e.g., Word, PDF) handling.
</comment>
<version>5.5.4</version>
<version>5.5.5</version>

<components>
<component>
<name>SOLR_SERVER</name>
<displayName>Solr</displayName>
<category>MASTER</category>
<cardinality>1+</cardinality>
<versionAdvertised>true</versionAdvertised>
<versionAdvertised>false</versionAdvertised>
<commandScript>
<script>scripts/solr.py</script>
<scriptType>PYTHON</scriptType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<services>
<service>
<name>SOLR</name>
<version>5.5.4</version>
<extends>common-services/SOLR/5.5.4</extends>
<version>5.5.5</version>
<extends>common-services/SOLR/5.5.5</extends>
</service>
</services>
</metainfo>
4 changes: 2 additions & 2 deletions src/main/mpack/mpack.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down