AMBARI-25067. Upgrade to Solr version 7.6.0 (#64)
diff --git a/ambari-logsearch-server/src/main/configsets/audit_logs/conf/solrconfig.xml b/ambari-logsearch-server/src/main/configsets/audit_logs/conf/solrconfig.xml
index ea77a09..d5ea3ab 100644
--- a/ambari-logsearch-server/src/main/configsets/audit_logs/conf/solrconfig.xml
+++ b/ambari-logsearch-server/src/main/configsets/audit_logs/conf/solrconfig.xml
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>7.5.0</luceneMatchVersion>
+ <luceneMatchVersion>7.6.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/ambari-logsearch-server/src/main/configsets/hadoop_logs/conf/solrconfig.xml b/ambari-logsearch-server/src/main/configsets/hadoop_logs/conf/solrconfig.xml
index 946f215..1a08149 100644
--- a/ambari-logsearch-server/src/main/configsets/hadoop_logs/conf/solrconfig.xml
+++ b/ambari-logsearch-server/src/main/configsets/hadoop_logs/conf/solrconfig.xml
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>7.5.0</luceneMatchVersion>
+ <luceneMatchVersion>7.6.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/ambari-logsearch-server/src/main/configsets/logsearch_metadata/conf/solrconfig.xml b/ambari-logsearch-server/src/main/configsets/logsearch_metadata/conf/solrconfig.xml
index 4c8cc1c..eaa7b21 100644
--- a/ambari-logsearch-server/src/main/configsets/logsearch_metadata/conf/solrconfig.xml
+++ b/ambari-logsearch-server/src/main/configsets/logsearch_metadata/conf/solrconfig.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<config>
- <luceneMatchVersion>7.5.0</luceneMatchVersion>
+ <luceneMatchVersion>7.6.0</luceneMatchVersion>
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" />
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 41a5ff1..e69171a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -55,7 +55,7 @@
RUN git config --global url."https://".insteadOf git://
# Install Solr
-ENV SOLR_VERSION 7.5.0
+ENV SOLR_VERSION 7.6.0
RUN wget --no-check-certificate -O /root/solr-$SOLR_VERSION.tgz http://public-repo-1.hortonworks.com/ARTIFACTS/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
RUN cd /root && tar -zxvf /root/solr-$SOLR_VERSION.tgz
diff --git a/docker/cloud-docker-compose.yml b/docker/cloud-docker-compose.yml
index ae0c8b3..64c89fc 100644
--- a/docker/cloud-docker-compose.yml
+++ b/docker/cloud-docker-compose.yml
@@ -26,7 +26,7 @@
ZOO_MY_ID: 1
ZOO_SERVERS: server.1=zookeeper:2888:3888
solr:
- image: solr:${SOLR_VERSION:-7.5.0}
+ image: solr:${SOLR_VERSION:-7.6.0}
restart: always
hostname: solr
ports:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index dc136bf..911ecf3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -26,7 +26,7 @@
ZOO_MY_ID: 1
ZOO_SERVERS: server.1=zookeeper:2888:3888
solr:
- image: solr:${SOLR_VERSION:-7.5.0}
+ image: solr:${SOLR_VERSION:-7.6.0}
restart: always
hostname: solr
ports:
diff --git a/docker/logsearch-docker.sh b/docker/logsearch-docker.sh
index 8966361..8bd6f5b 100755
--- a/docker/logsearch-docker.sh
+++ b/docker/logsearch-docker.sh
@@ -109,7 +109,7 @@
ZOOKEEPER_VERSION=3.4.10
ZOOKEEPER_CONNECTION_STRING=zookeeper:2181
-SOLR_VERSION=7.5.0
+SOLR_VERSION=7.6.0
EOF
echo ".env file has been created. Check it out before starting Log Search. ($sdir/.env)"
exit
diff --git a/docker/solr.yml b/docker/solr.yml
index 5bef837..efe6017 100644
--- a/docker/solr.yml
+++ b/docker/solr.yml
@@ -15,7 +15,7 @@
version: '3.3'
services:
solr:
- image: solr:${SOLR_VERSION:-7.5.0}
+ image: solr:${SOLR_VERSION:-7.6.0}
restart: always
networks:
- logsearch-network
diff --git a/docker/sso.yml b/docker/sso.yml
index 9d27d4f..3815597 100644
--- a/docker/sso.yml
+++ b/docker/sso.yml
@@ -26,7 +26,7 @@
ZOO_MY_ID: 1
ZOO_SERVERS: server.1=zookeeper:2888:3888
solr:
- image: solr:${SOLR_VERSION:-7.5.0}
+ image: solr:${SOLR_VERSION:-7.6.0}
restart: always
hostname: solr
ports:
diff --git a/pom.xml b/pom.xml
index c810257..80b3217 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<deb.python.ver>python (>= 2.6)</deb.python.ver>
<deb.architecture>amd64</deb.architecture>
<deb.dependency.list>${deb.python.ver}</deb.dependency.list>
- <solr.version>7.5.0</solr.version>
+ <solr.version>7.6.0</solr.version>
<hadoop.version>3.1.1.3.0.2.0-50</hadoop.version>
<common.io.version>2.5</common.io.version>
<zookeeper.version>3.4.6.2.3.0.0-2557</zookeeper.version>
