From c756b50ae4324b5692b2956c7a5d484122ac3016 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 May 2019 17:06:00 +0200 Subject: [PATCH] LUCENE-8807: Change all download URLs in build files to HTTPS --- lucene/analysis/common/build.xml | 2 +- lucene/analysis/kuromoji/ivy.xml | 4 +-- lucene/benchmark/build.xml | 17 ++++++------ lucene/common-build.xml | 7 +++-- lucene/default-nested-ivy-settings.xml | 10 +++---- solr/build.xml | 36 -------------------------- solr/common-build.xml | 4 +-- solr/contrib/langid/build.xml | 4 +-- 8 files changed, 22 insertions(+), 62 deletions(-) diff --git a/lucene/analysis/common/build.xml b/lucene/analysis/common/build.xml index f752ecca6ce..b19a6f360fa 100644 --- a/lucene/analysis/common/build.xml +++ b/lucene/analysis/common/build.xml @@ -93,7 +93,7 @@ - + diff --git a/lucene/analysis/kuromoji/ivy.xml b/lucene/analysis/kuromoji/ivy.xml index eb085098be9..ee256b9aa45 100644 --- a/lucene/analysis/kuromoji/ivy.xml +++ b/lucene/analysis/kuromoji/ivy.xml @@ -27,10 +27,10 @@ - + - + diff --git a/lucene/benchmark/build.xml b/lucene/benchmark/build.xml index df871991788..2f53ff4d492 100644 --- a/lucene/benchmark/build.xml +++ b/lucene/benchmark/build.xml @@ -59,7 +59,7 @@ - @@ -74,10 +74,10 @@ - - @@ -87,12 +87,12 @@ - - + @@ -120,7 +120,8 @@ - + @@ -129,7 +130,7 @@ - @@ -140,7 +141,7 @@ + value="https://home.apache.org/~rmuir/wikipedia"/> - + @@ -397,9 +397,8 @@ - - - + + diff --git a/lucene/default-nested-ivy-settings.xml b/lucene/default-nested-ivy-settings.xml index 522fd29bf26..cfee7c4f2a6 100644 --- a/lucene/default-nested-ivy-settings.xml +++ b/lucene/default-nested-ivy-settings.xml @@ -33,11 +33,8 @@ - - - - - + + - + - diff --git a/solr/build.xml b/solr/build.xml index 40c8a2a5ffe..ef597603faa 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -32,7 +32,6 @@ - @@ -93,41 +92,6 @@ - - diff --git a/solr/common-build.xml b/solr/common-build.xml index d6a4827fe35..07000b1c973 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -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; diff --git a/solr/contrib/langid/build.xml b/solr/contrib/langid/build.xml index aca7aebb1cb..8c9a8adbc4c 100644 --- a/solr/contrib/langid/build.xml +++ b/solr/contrib/langid/build.xml @@ -26,7 +26,7 @@ - + @@ -53,7 +53,7 @@