[ 
https://issues.apache.org/jira/browse/AMBARI-24746?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16642449#comment-16642449
 ] 

ASF GitHub Bot commented on AMBARI-24746:
-----------------------------------------

oleewere closed pull request #6: AMBARI-24746. Upgrade Solr version to 7.5.0
URL: https://github.com/apache/ambari-logsearch/pull/6
 
 
   

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 8f541212a2..ea77a09a67 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 9f1c36d44b..946f215c03 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 866b218905..4c8cc1cb30 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 1c8fac2319..41a5ff1a74 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 fb14622902..dc136bf01a 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 72a332a31b..8966361269 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 2975af6048..5bef837063 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 0837dd837b..9d27d4f085 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 d6ecde52a3..649cf3ba91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
     <deb.python.ver>python (&gt;= 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>


 

----------------------------------------------------------------
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:
us...@infra.apache.org


> Infra Solr: upgrade solr version to 7.5.0
> -----------------------------------------
>
>                 Key: AMBARI-24746
>                 URL: https://issues.apache.org/jira/browse/AMBARI-24746
>             Project: Ambari
>          Issue Type: Task
>          Components: ambari-infra, ambari-logsearch
>    Affects Versions: 2.7.3
>            Reporter: Olivér Szabó
>            Assignee: Olivér Szabó
>            Priority: Major
>              Labels: pull-request-available
>             Fix For: 2.8.0
>
>




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to