Merge pull request #116 from OPUS4/downloadSolr115

Use faster download URL for Solr

Vagrantfile

@@ -42,9 +42,9 @@ mkdir -p "downloads"
 cd downloads
 SOLR_TAR="solr-$SOLR_VERSION.tgz"
 if test ! -f "$SOLR_TAR"; then
-  SOLR_URL="https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/$SOLR_TAR"
+  SOLR_URL="https://www.apache.org/dyn/closer.lua/solr/solr/$SOLR_VERSION/$SOLR_TAR?action=download"
   echo "Getting: $SOLR_URL"
-  wget -q --show-progress --progress=bar:force $SOLR_URL
+  wget -q --show-progress --progress=bar:force $SOLR_URL -O $SOLR_TAR
 fi
 tar xfz "$SOLR_TAR" -C /home/vagrant
 cd /home/vagrant/solr-$SOLR_VERSION

bin/install_solr_docker.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 SOLR_VERSION="9.4.0"
-wget -q "https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" -O - | tar -xz
+wget -q "https://www.apache.org/dyn/closer.lua/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz?action=download" -O - | tar -xz
 cd solr-$SOLR_VERSION
 ./bin/solr start -force
 ./bin/solr create -c opus4 -force

build.xml

@@ -2,7 +2,7 @@
 <project name="opus4search">
 
     <property environment="env" />
-    <property name="solrVersion" value="7.7.1" />
+    <property name="solrVersion" value="9.4.0" />
     <property name="downloadDir" value="${basedir}/downloads" />
 
     <!-- Properties for configuration files (tests/config.ini) used for testing. -->
@@ -60,7 +60,7 @@
 
     <target name="download-solr">
         <mkdir dir="${downloadDir}" />
-        <get src="https://archive.apache.org/dist/lucene/solr/${solrVersion}/solr-${solrVersion}.tgz"
+        <get src="https://www.apache.org/dyn/closer.lua/solr/solr/${solrVersion}/solr-${solrVersion}.tgz?action=download"
              dest="${downloadDir}/solr-${solrVersion}.tgz"
              skipexisting="true" />
         <exec executable="tar" dir="${downloadDir}">