[bigtop] branch master updated: BIGTOP-3313: Bump solr to 6.6.6 (#604)

[sekikn]

This is an automated email from the ASF dual-hosted git repository.

sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 23f6985  BIGTOP-3313: Bump solr to 6.6.6 (#604)
23f6985 is described below

commit 23f698524ab4837b4043833a99e112a5e51a8378
Author: Jun <jun...@linaro.org>
AuthorDate: Fri Feb 21 13:59:16 2020 +0800

    BIGTOP-3313: Bump solr to 6.6.6 (#604)
    
    Bump solr to latest version of 6.x branch.
    Also updated maven repo to https access
    
    Change-Id: I7f09d72d51d6c89b172e796189261590b37444c4
    Signed-off-by: Jun He <jun...@arm.com>
---
 bigtop-packages/src/common/solr/do-component-build | 3 ++-
 bigtop.bom                                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bigtop-packages/src/common/solr/do-component-build 
b/bigtop-packages/src/common/solr/do-component-build
index e0c60b3..7facbc1 100755
--- a/bigtop-packages/src/common/solr/do-component-build
+++ b/bigtop-packages/src/common/solr/do-component-build
@@ -18,10 +18,11 @@ set -ex
 
 . `dirname $0`/bigtop.bom
 
-IVY_MIRROR_PROP=${IVY_MIRROR_PROP:-http://repo1.maven.org/maven2/}
+IVY_MIRROR_PROP=${IVY_MIRROR_PROP:-https://repo1.maven.org/maven2}
 BUILD_OPTS="-Dversion=${FULL_VERSION} -Dhadoop.version=${HADOOP_VERSION} \
             -Dslf4j.binding=slf4j-log4j12 -Dexclude.from.war=nothing   \
             -Divy.home=${HOME}/.ivy2 -Drepo.maven.org=$IVY_MIRROR_PROP \
+            -Divy_bootstrap_url1=$IVY_MIRROR_PROP \
             -Divy_install_path=${HOME}/.ant/lib -lib ${HOME}/.ant/lib  \
             -Dreactor.repo=file://${HOME}/.m2/repository"
 
diff --git a/bigtop.bom b/bigtop.bom
index c6790f2..a0088ce 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -255,7 +255,7 @@ bigtop {
     'solr' {
       name    = 'solr'
       relNotes = 'Apache Solr'
-      version { base = '6.6.0'; pkg = base; release = 1 }
+      version { base = '6.6.6'; pkg = base; release = 1 }
       tarball { destination = "$name-${version.base}-src.tgz"
                 source      = destination }
       url     { download_path = "lucene/$name/${version.base}"