Repository: bigtop Updated Branches: refs/heads/master 8d8c40208 -> c52214e64
BIGTOP-1354. bump version of Solr to 4.9.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c52214e6 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c52214e6 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c52214e6 Branch: refs/heads/master Commit: c52214e640890065134f718e373030613ca9a0d5 Parents: 8d8c402 Author: Roman Shaposhnik <[email protected]> Authored: Sat Jun 28 16:48:25 2014 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Sat Jun 28 16:48:25 2014 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/solr/do-component-build | 2 ++ bigtop-packages/src/common/solr/install_solr.sh | 5 ++++- bigtop.mk | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/c52214e6/bigtop-packages/src/common/solr/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/solr/do-component-build b/bigtop-packages/src/common/solr/do-component-build index 624f9ca..a8fd66c 100755 --- a/bigtop-packages/src/common/solr/do-component-build +++ b/bigtop-packages/src/common/solr/do-component-build @@ -27,6 +27,8 @@ BUILD_OPTS="-Dversion=${FULL_VERSION} -Dhadoop.version=${HADOOP_VERSION} \ # FIXME: the following really needs to be made flexible at the product level sed -i -e '/ENTITY.*hadoop.version/s#"[^"]*"#"'${HADOOP_VERSION}'"#' ./solr/test-framework/ivy.xml ./solr/core/ivy.xml +sed -i -e '/<dependency org="org.mortbay.jetty" name="jetty"/s#/ *>#>#' solr/core/ivy.xml +sed -i -e '/<dependency org="org.mortbay.jetty" name="jetty"/a<artifact name="jetty" ext="jar"/></dependency>' solr/core/ivy.xml # FIXME: this needs to be fixed at the product level ant $BUILD_OPTS ivy-bootstrap http://git-wip-us.apache.org/repos/asf/bigtop/blob/c52214e6/bigtop-packages/src/common/solr/install_solr.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/solr/install_solr.sh b/bigtop-packages/src/common/solr/install_solr.sh index 7ac3a17..34e2c9f 100644 --- a/bigtop-packages/src/common/solr/install_solr.sh +++ b/bigtop-packages/src/common/solr/install_solr.sh @@ -117,6 +117,9 @@ cp -fa $DISTRO_DIR/schema.xml $PREFIX/$LIB_DIR/coreconfig-template install -d -m 0755 $PREFIX/$LIB_DIR/contrib cp -ra ${BUILD_DIR}/contrib/velocity $PREFIX/$LIB_DIR/contrib +cp -ra ${BUILD_DIR}/contrib/map-reduce $PREFIX/$LIB_DIR/contrib +cp -ra ${BUILD_DIR}/example/scripts/map-reduce $PREFIX/$LIB_DIR/contrib +cp -ra ${BUILD_DIR}/contrib/morphlines* $PREFIX/$LIB_DIR/contrib install -d -m 0755 $PREFIX/$LIB_DIR/server/webapps/solr (cd $PREFIX/$LIB_DIR/server/webapps/solr ; jar xf ../../../*.war) @@ -142,7 +145,7 @@ cp -ra ${BUILD_DIR}/dist/*.*ar $PREFIX/$LIB_DIR cp -ra ${BUILD_DIR}/dist/solrj-lib $PREFIX/$LIB_DIR/lib install -d -m 0755 $PREFIX/$LIB_DIR/bin -cp -a ${BUILD_DIR}/example/cloud-scripts/*.sh $PREFIX/$LIB_DIR/bin +cp -a ${BUILD_DIR}/example/scripts/cloud-scripts/*.sh $PREFIX/$LIB_DIR/bin sed -i -e 's#/../solr-webapp/webapp/WEB-INF/lib/#/../webapps/solr/WEB-INF/lib/#' $PREFIX/$LIB_DIR/bin/zkcli.sh chmod 755 $PREFIX/$LIB_DIR/bin/* http://git-wip-us.apache.org/repos/asf/bigtop/blob/c52214e6/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 356276d..862e7de 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -200,7 +200,7 @@ $(eval $(call PACKAGE,datafu,DATAFU)) SOLR_NAME=solr SOLR_RELNOTES_NAME=Search engine server SOLR_PKG_NAME=solr -SOLR_BASE_VERSION=4.6.0 +SOLR_BASE_VERSION=4.9.0 SOLR_PKG_VERSION=$(SOLR_BASE_VERSION) SOLR_RELEASE_VERSION=1 SOLR_TARBALL_DST=solr-$(SOLR_BASE_VERSION)-src.tgz
