LUCENE-8807: Change all download URLs in build files to HTTPS

This commit is contained in:
Uwe Schindler 2019-05-21 17:06:00 +02:00
parent 4640a527a4
commit c756b50ae4
8 changed files with 22 additions and 62 deletions

View File

@ -93,7 +93,7 @@
<fixcrlf file="${unicode-props-file}" encoding="UTF-8"/>
</target>
<property name="tld.zones" value="http://www.internic.net/zones/root.zone"/>
<property name="tld.zones" value="https://www.internic.net/zones/root.zone"/>
<property name="tld.output" location="src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro"/>
<target name="gen-tlds" depends="compile-tools">

View File

@ -27,10 +27,10 @@
<dependencies>
<dependency org="mecab" name="mecab-ipadic" rev="${/mecab/mecab-ipadic}" conf="ipadic">
<artifact name="ipadic" type=".tar.gz" url="http://jaist.dl.sourceforge.net/project/mecab/mecab-ipadic/2.7.0-20070801/mecab-ipadic-2.7.0-20070801.tar.gz"/>
<artifact name="ipadic" type=".tar.gz" url="https://jaist.dl.sourceforge.net/project/mecab/mecab-ipadic/2.7.0-20070801/mecab-ipadic-2.7.0-20070801.tar.gz"/>
</dependency>
<dependency org="mecab" name="mecab-naist-jdic" rev="${/mecab/mecab-naist-jdic}" conf="naist">
<artifact name="mecab-naist-jdic" type=".tar.gz" url="http://sourceforge.jp/frs/redir.php?m=iij&amp;f=/naist-jdic/53500/mecab-naist-jdic-0.6.3b-20111013.tar.gz"/>
<artifact name="mecab-naist-jdic" type=".tar.gz" url=" https://rwthaachen.dl.osdn.jp/naist-jdic/53500/mecab-naist-jdic-0.6.3b-20111013.tar.gz"/>
</dependency>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>

View File

@ -59,7 +59,7 @@
</target>
<target name="get-enwiki" unless="enwiki.exists">
<get src="http://home.apache.org/~dsmiley/data/enwiki-20070527-pages-articles.xml.bz2"
<get src="https://home.apache.org/~dsmiley/data/enwiki-20070527-pages-articles.xml.bz2"
dest="temp/enwiki-20070527-pages-articles.xml.bz2"/>
</target>
@ -74,10 +74,10 @@
</target>
<target name="get-geonames" unless="geonames.exists">
<!-- note: latest data is at: http://download.geonames.org/export/dump/allCountries.zip
<!-- note: latest data is at: https://download.geonames.org/export/dump/allCountries.zip
and then randomize with: gsort -R -S 1500M file.txt > file_random.txt
and then compress with: bzip2 -9 -k file_random.txt -->
<get src="http://home.apache.org/~dsmiley/data/geonames_20130921_randomOrder_allCountries.txt.bz2"
<get src="https://home.apache.org/~dsmiley/data/geonames_20130921_randomOrder_allCountries.txt.bz2"
dest="temp/allCountries.txt.bz2"/>
</target>
@ -87,12 +87,12 @@
</target>
<target name="get-news-20" unless="20news-18828.exists">
<get src="http://www-2.cs.cmu.edu/afs/cs.cmu.edu/project/theo-20/www/data/news20.tar.gz"
<get src="https://www-2.cs.cmu.edu/afs/cs.cmu.edu/project/theo-20/www/data/news20.tar.gz"
dest="temp/news20.tar.gz"/>
</target>
<target name="get-reuters" unless="reuters.exists">
<!-- Please note: there is no HTTPS url. As this is only test data, we don't care: -->
<get src="http://www.daviddlewis.com/resources/testcollections/reuters21578/reuters21578.tar.gz"
dest="temp/reuters21578.tar.gz"/>
</target>
@ -120,7 +120,8 @@
</java>
</target>
<target name="get-20news-18828" unless="20news-18828.exists">
<get src="http://people.csail.mit.edu/u/j/jrennie/public_html/20Newsgroups/20news-18828.tar.gz"
<!-- TODO: URL no longer works (404 Not found): -->
<get src="https://people.csail.mit.edu/u/j/jrennie/public_html/20Newsgroups/20news-18828.tar.gz"
dest="temp/20news-18828.tar.gz"/>
</target>
@ -129,7 +130,7 @@
<untar src="temp/20news-18828.tar" dest="${working.dir}"/>
</target>
<target name="get-mini-news" unless="mini.exists">
<get src="http://kdd.ics.uci.edu/databases/20newsgroups/mini_newsgroups.tar.gz"
<get src="https://kdd.ics.uci.edu/databases/20newsgroups/mini_newsgroups.tar.gz"
dest="temp/mini_newsgroups.tar.gz"/>
</target>
<target name="expand-mini-news" unless="mini.expanded">
@ -140,7 +141,7 @@
<property name="top.100k.words.archive.filename"
value="top.100k.words.de.en.fr.uk.wikipedia.2009-11.tar.bz2"/>
<property name="top.100k.words.archive.base.url"
value="http://home.apache.org/~rmuir/wikipedia"/>
value="https://home.apache.org/~rmuir/wikipedia"/>
<target name="get-top-100k-words-archive" unless="top.100k.words.archive.present">
<mkdir dir="temp"/>
<get src="${top.100k.words.archive.base.url}/${top.100k.words.archive.filename}"

View File

@ -172,7 +172,7 @@
<property name="javac.release" value="11"/>
<property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial"/>
<property name="javadoc.link" value="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
<property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
<property name="javadoc.link.junit" value="https://junit.org/junit4/javadoc/4.12/"/>
<property name="javadoc.packagelist.dir" location="${common.dir}/tools/javadoc"/>
<available file="${javadoc.packagelist.dir}/java11/package-list" property="javadoc.java11.packagelist.exists"/>
<property name="javadoc.access" value="protected"/>
@ -397,9 +397,8 @@
</target>
<property name="ivy_install_path" location="${user.home}/.ant/lib" />
<property name="ivy_bootstrap_url1" value="http://repo1.maven.org/maven2"/>
<!-- you might need to tweak this from china so it works -->
<property name="ivy_bootstrap_url2" value="http://uk.maven.org/maven2"/>
<property name="ivy_bootstrap_url1" value="https://repo1.maven.org/maven2"/>
<property name="ivy_bootstrap_url2" value="https://repo2.maven.org/maven2"/>
<property name="ivy_checksum_sha1" value="5abe4c24bbe992a9ac07ca563d5bd3e8d569e9ed"/>
<target name="ivy-availability-check" unless="ivy.available">

View File

@ -33,11 +33,8 @@
<resolvers>
<ibiblio name="sonatype-releases" root="https://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
<ibiblio name="maven.restlet.org" root="http://maven.restlet.org" m2compatible="true" />
<ibiblio name="releases.cloudera.com" root="http://repository.cloudera.com/content/repositories/releases" m2compatible="true" />
<!-- you might need to tweak this from china so it works -->
<ibiblio name="working-chinese-mirror" root="http://uk.maven.org/maven2" m2compatible="true" />
<ibiblio name="maven.restlet.com" root="https://maven.restlet.com" m2compatible="true" />
<ibiblio name="releases.cloudera.com" root="https://repository.cloudera.com/cloudera/libs-release-local" m2compatible="true" />
<filesystem name="local-maven-2" m2compatible="true" local="true">
<artifact
@ -50,10 +47,9 @@
<resolver ref="local"/>
<!-- <resolver ref="local-maven-2" /> -->
<resolver ref="main"/>
<resolver ref="maven.restlet.org" />
<resolver ref="maven.restlet.com" />
<resolver ref="sonatype-releases" />
<resolver ref="releases.cloudera.com"/>
<resolver ref="working-chinese-mirror" />
</chain>
</resolvers>

View File

@ -32,7 +32,6 @@
<echo message="Use 'ant documentation' to build documentation." />
<echo message="Use 'ant generate-maven-artifacts' to generate maven artifacts." />
<echo message="Use 'ant package' to generate zip, tgz for distribution." />
<!--<echo message="Use 'ant luke' to start luke. see: http://luke.googlecode.com" />-->
<echo message="Use 'ant test' to run unit tests." />
</target>
@ -93,41 +92,6 @@
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.user}" proxypassword="${proxy.password}"/>
</target>
<!--LUCENE-3286: Luke is incompatible with new XML QP location and target is not flexible
when it comes to incompatible changes. Update when Luke has updated.
<target name="compile-xml-query-parser">
<ant dir="${common.dir}/queryparser" target="compile-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
</target>
<property name="luke.version" value="1.0.1"/>
<available file="luke/luke-${luke.version}.jar" property="luke.jar.exists" />
<target name="luke-download" unless="luke.jar.exists" depends="proxy.setup,compile-xml-query-parser">
<mkdir dir="luke"/>
<get src="http://luke.googlecode.com/files/luke-${luke.version}.jar"
dest="luke/luke-${luke.version}.jar"/>
</target>
<path id="luke.classpath">
<pathelement location="${common.dir}/build/core/classes/java" />
<pathelement location="${common.dir}/queryparser/build/classes/java" />
</path>
<target name="luke" depends="luke-download">
<java fork="true"
classname="org.getopt.luke.Luke"
logError="true"
failonerror="true">
<classpath>
<fileset dir="luke">
<include name="luke-${luke.version}.jar"/>
</fileset>
<path refid="classpath"/>
<path refid="luke.classpath"/>
<path refid="test.classpath"/>
</classpath>
</java>
</target>-->
<!-- ========================================================================= -->
<!-- ========================== BUILD/TEST TASKS ============================= -->
<!-- ========================================================================= -->

View File

@ -345,7 +345,7 @@
if (!(url =~ /\/$/)) url += '/';
} else {
version = version.replace('.', '_');
url = 'http://lucene.apache.org/core/' + version + '/';
url = 'https://lucene.apache.org/core/' + version + '/';
}
task.log('Using the following URL to refer to Lucene Javadocs: ' + url);
properties['lucene.javadoc.url'] = url;
@ -360,7 +360,7 @@
task.log('Disabled Solr Javadocs online URL for packaging (custom build / SNAPSHOT version).');
} else {
version = version.replace('.', '_');
url = 'http://lucene.apache.org/solr/' + version + '/';
url = 'https://lucene.apache.org/solr/' + version + '/';
task.log('Using the following URL to refer to Solr Javadocs: ' + url);
}
properties['solr.javadoc.url'] = url;

View File

@ -26,7 +26,7 @@
<import file="../contrib-build.xml"/>
<property name="test.model.dir" location="${tests.userdir}/langid/solr/collection1/conf"/>
<property name="test.leipzig.folder.link" value="http://pcai056.informatik.uni-leipzig.de/downloads/corpora"/>
<property name="test.leipzig.folder.link" value="http://pcai056.informatik.uni-leipzig.de/downloads/corpora"/><!-- URL broken? -->
<property name="test.build.models.dir" location="${build.dir}/build-test-models"/>
<property name="test.build.models.data.dir" location="${test.build.models.dir}/data"/>
<property name="test.build.models.sentences.dir" location="${test.build.models.dir}/train"/>
@ -53,7 +53,7 @@
<!--
Create test models using data for five languages from the Leipzig corpora.
See http://opennlp.apache.org/docs/1.8.3/manual/opennlp.html#tools.langdetect.training.leipzig
See https://opennlp.apache.org/docs/1.8.3/manual/opennlp.html#tools.langdetect.training.leipzig
-->
<target name="train-test-models" description="Train small test models for unit tests" depends="resolve">
<download-leipzig language.code="eng"/>