Repository: incubator-wave Updated Branches: refs/heads/master da1bdbe3d -> 33bca8fba
updated to solr 4.9.1 (4.9.0 is not available) Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/33bca8fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/33bca8fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/33bca8fb Branch: refs/heads/master Commit: 33bca8fba301af053cbd5122d9925c264f825773 Parents: da1bdbe Author: vjrj <[email protected]> Authored: Sat Mar 14 19:25:17 2015 +0100 Committer: vjrj <[email protected]> Committed: Sat Mar 14 19:25:17 2015 +0100 ---------------------------------------------------------------------- README.md | 2 +- build.xml | 6 +++--- run-solr.bat | 6 +++--- run-solr.sh | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/33bca8fb/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 3b2ae8c..b227c16 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,7 @@ Or on Ubuntu Linux you can use the following command: To enable Solr: -- -In order to specify Solr in server.config as the search type - you need to install Solr according to instructions at: http://www.apache.org/dyn/closer.cgi/lucene/solr/4.9.0. +In order to specify Solr in server.config as the search type - you need to install Solr according to instructions at: http://www.apache.org/dyn/closer.cgi/lucene/solr/4.9.1. Or, you can use built in Ant script, i.e. run: ant get-third-party-solr-dep This will download and unzip the Solr distribution into third_party/solr folder. http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/33bca8fb/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index a6bd9c2..52000a0 100644 --- a/build.xml +++ b/build.xml @@ -1123,11 +1123,11 @@ <target name="get-third-party-solr-dep" depends="init" description="Download Solr third party dependencies."> <get dest="${lib.solr}" usetimestamp="true" skipexisting="true"> - <url url="http://apache.spd.co.il/lucene/solr/4.9.0/solr-4.9.0.zip"; /> + <url url="http://apache.spd.co.il/lucene/solr/4.9.1/solr-4.9.1.zip"; /> </get> - <unzip src="${lib.solr}/solr-4.9.0.zip" dest="${lib.solr}"> + <unzip src="${lib.solr}/solr-4.9.1.zip" dest="${lib.solr}"> <patternset> - <include name="solr-4.9.0/example/"/> + <include name="solr-4.9.1/example/"/> </patternset> </unzip> </target> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/33bca8fb/run-solr.bat ---------------------------------------------------------------------- diff --git a/run-solr.bat b/run-solr.bat index 2f31236..95d9a29 100644 --- a/run-solr.bat +++ b/run-solr.bat @@ -14,13 +14,13 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if not exist "third_party\solr\solr-4.9.0\example" ( +if not exist "third_party\solr\solr-4.9.1\example" ( echo "Please download Solr by running: ant get-third-party-solr-dep " - echo "Or download it manually from http://apache.spd.co.il/lucene/solr/4.9.0/ into third_party\solr and unzip there." + echo "Or download it manually from http://apache.spd.co.il/lucene/solr/4.9.1/ into third_party\solr and unzip there." pause exit 1 ) -cd third_party\solr\solr-4.9.0\example +cd third_party\solr\solr-4.9.1\example java -jar start.jar pause http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/33bca8fb/run-solr.sh ---------------------------------------------------------------------- diff --git a/run-solr.sh b/run-solr.sh index badf32a..4edc87f 100755 --- a/run-solr.sh +++ b/run-solr.sh @@ -19,12 +19,12 @@ # This script will start the Solr server. -# Make sure the third_party/solr/solr-4.9.0/example folder exists. -if [ ! -d third_party/solr/solr-4.9.0/example ]; then +# Make sure the third_party/solr/solr-4.9.1/example folder exists. +if [ ! -d third_party/solr/solr-4.9.1/example ]; then echo "Please download Solr by running: ant get-third-party-solr-dep " - echo "Or download it manually from http://apache.spd.co.il/lucene/solr/4.9.0/ into third_party/solr and unzip there." + echo "Or download it manually from http://apache.spd.co.il/lucene/solr/4.9.1/ into third_party/solr and unzip there." exit 1 fi -cd third_party/solr/solr-4.9.0/example +cd third_party/solr/solr-4.9.1/example exec java -jar start.jar
