You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by GitBox <gi...@apache.org> on 2018/12/27 11:46:45 UTC
[GitHub] oleewere closed pull request #64: AMBARI-25067. Upgrade to Solr
version 7.6.0
oleewere closed pull request #64: AMBARI-25067. Upgrade to Solr version 7.6.0
URL: https://github.com/apache/ambari-logsearch/pull/64
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 ea77a09a67..d5ea3abd0a 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 946f215c03..1a08149f03 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 4c8cc1cb30..eaa7b21b9b 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 41a5ff1a74..e69171aa13 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.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 ae0c8b3315..64c89fc175 100644
--- a/docker/cloud-docker-compose.yml
+++ b/docker/cloud-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.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 dc136bf01a..911ecf395a 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.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 8966361269..8bd6f5b36a 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.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 5bef837063..efe6017295 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 9d27d4f085..3815597e20 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.5.0}
+ image: solr:${SOLR_VERSION:-7.6.0}
restart: always
hostname: solr
ports:
diff --git a/pom.xml b/pom.xml
index c81025723a..80b3217419 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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services