This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch cloudbreak in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
commit 1436800f27243d4bcd4395fd36c8a69c9ee550fa Author: Olivér Szabó <oleew...@gmail.com> AuthorDate: Mon Oct 8 22:36:42 2018 +0200 AMBARI-24746. Upgrade Solr version to 7.5.0 (#6) --- .../src/main/configsets/audit_logs/conf/solrconfig.xml | 2 +- .../src/main/configsets/hadoop_logs/conf/solrconfig.xml | 2 +- ambari-logsearch-server/src/main/configsets/history/conf/solrconfig.xml | 2 +- docker/Dockerfile | 2 +- docker/docker-compose.yml | 2 +- docker/logsearch-docker.sh | 2 +- docker/solr.yml | 2 +- docker/sso.yml | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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 8f54121..ea77a09 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.4.0</luceneMatchVersion> + <luceneMatchVersion>7.5.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 9f1c36d..946f215 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.4.0</luceneMatchVersion> + <luceneMatchVersion>7.5.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/history/conf/solrconfig.xml b/ambari-logsearch-server/src/main/configsets/history/conf/solrconfig.xml index 866b218..4c8cc1c 100644 --- a/ambari-logsearch-server/src/main/configsets/history/conf/solrconfig.xml +++ b/ambari-logsearch-server/src/main/configsets/history/conf/solrconfig.xml @@ -16,7 +16,7 @@ limitations under the License. --> <config> - <luceneMatchVersion>7.4.0</luceneMatchVersion> + <luceneMatchVersion>7.5.0</luceneMatchVersion> <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" /> diff --git a/docker/Dockerfile b/docker/Dockerfile index 1c8fac2..41a5ff1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -55,7 +55,7 @@ RUN echo 'X11DisplayOffset 10\n' /etc/ssh/sshd_config RUN git config --global url."https://".insteadOf git:// # Install Solr -ENV SOLR_VERSION 7.4.0 +ENV SOLR_VERSION 7.5.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/docker-compose.yml b/docker/docker-compose.yml index fb14622..dc136bf 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -26,7 +26,7 @@ services: ZOO_MY_ID: 1 ZOO_SERVERS: server.1=zookeeper:2888:3888 solr: - image: solr:${SOLR_VERSION:-7.4.0} + image: solr:${SOLR_VERSION:-7.5.0} restart: always hostname: solr ports: diff --git a/docker/logsearch-docker.sh b/docker/logsearch-docker.sh index 72a332a..8966361 100755 --- a/docker/logsearch-docker.sh +++ b/docker/logsearch-docker.sh @@ -109,7 +109,7 @@ AMBARI_LOCATION=$AMBARI_LOCATION ZOOKEEPER_VERSION=3.4.10 ZOOKEEPER_CONNECTION_STRING=zookeeper:2181 -SOLR_VERSION=7.4.0 +SOLR_VERSION=7.5.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 2975af6..5bef837 100644 --- a/docker/solr.yml +++ b/docker/solr.yml @@ -15,7 +15,7 @@ version: '3.3' services: solr: - image: solr:${SOLR_VERSION:-7.4.0} + image: solr:${SOLR_VERSION:-7.5.0} restart: always networks: - logsearch-network diff --git a/docker/sso.yml b/docker/sso.yml index 0837dd8..9d27d4f 100644 --- a/docker/sso.yml +++ b/docker/sso.yml @@ -26,7 +26,7 @@ services: ZOO_MY_ID: 1 ZOO_SERVERS: server.1=zookeeper:2888:3888 solr: - image: solr:${SOLR_VERSION:-7.4.0} + image: solr:${SOLR_VERSION:-7.5.0} restart: always hostname: solr ports: diff --git a/pom.xml b/pom.xml index d6ecde5..649cf3b 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,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.4.0</solr.version> + <solr.version>7.5.0</solr.version> <hadoop.version>3.0.0</hadoop.version> <common.io.version>2.5</common.io.version> <zookeeper.version>3.4.6.2.3.0.0-2557</zookeeper.version>