diff options
34 files changed, 72 insertions, 72 deletions
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index f406d7c70..84f9fbecd 100644 --- a/cje-production/buildproperties.txt +++ b/cje-production/buildproperties.txt @@ -43,10 +43,10 @@ API_PREV_REF_LABEL="4.13" PREVIOUS_RELEASE_VER="4.13" PREVIOUS_RELEASE_ID="R-4.13-201909161045" BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/" -WEBTOOLS_REPO="http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/" +WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/" WEBTOOLS_VER="1.2.0.v201405010053" BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder" -ECLIPSE_RUN_REPO="http://download.eclipse.org/eclipse/updates/4.15-I-builds/" +ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.15-I-builds/" #Maven parameters MAVEN_OPTS="-Xmx4096m" diff --git a/cje-production/mbscripts/mb510_createApiToolsReports.sh b/cje-production/mbscripts/mb510_createApiToolsReports.sh index a95d85783..5d11d02bb 100755 --- a/cje-production/mbscripts/mb510_createApiToolsReports.sh +++ b/cje-production/mbscripts/mb510_createApiToolsReports.sh @@ -39,7 +39,7 @@ java -jar $LAUNCHER_JAR \ -DbuildId=$BUILD_ID \ -DbuildLabel=$BUILD_ID \ -DbuildWorkingArea=$CJE_ROOT/$AGG_DIR \ - -DpreviousBaseURL=http://$DOWNLOAD_HOST/eclipse/downloads/drops4/$PREVIOUS_RELEASE_ID/eclipse-SDK-$PREVIOUS_RELEASE_VER-win32-x86_64.zip \ + -DpreviousBaseURL=https://$DOWNLOAD_HOST/eclipse/downloads/drops4/$PREVIOUS_RELEASE_ID/eclipse-SDK-$PREVIOUS_RELEASE_VER-win32-x86_64.zip \ -DpreviousBaselineName=Eclipse-SDK-$PREVIOUS_RELEASE_VER \ -DpreviousBaselineFilename=eclipse-SDK-$PREVIOUS_RELEASE_VER-win32-x86_64.zip \ -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \ diff --git a/cje-production/scripts/checkComposites/checkComposites.sh b/cje-production/scripts/checkComposites/checkComposites.sh index b709d1035..f8bfa49af 100755 --- a/cje-production/scripts/checkComposites/checkComposites.sh +++ b/cje-production/scripts/checkComposites/checkComposites.sh @@ -22,7 +22,7 @@ # and then executed in "bash script" build step. dropsPath=/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4 -repoHttpAccess=http://download.eclipse.org +repoHttpAccess=https://download.eclipse.org repoAccess=${repoHttpAccess} # TODO: reduce this list soon repoList="\ diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 5b9236dd4..5ee55a98f 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -100,7 +100,7 @@ it). And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable. --> - <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/builds/release/2.20</emf-repo.url> + <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.20</emf-repo.url> <ecf-repo.url>https://download.eclipse.org/rt/ecf/3.14.6/site.p2/</ecf-repo.url> diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target index aebd76078..377a92dd7 100644 --- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target +++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target @@ -167,7 +167,7 @@ <unit id="org.eclipse.emf.edit" version="2.16.0.v20190920-0401"/> <unit id="org.eclipse.emf.databinding" version="1.5.0.v20180706-1146"/> <unit id="org.eclipse.emf.databinding.edit" version="1.6.0.v20190323-1031"/> - <repository location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.20"/> + <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20"/> </location> <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit"> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml index 85ead3fe4..4f0343ae4 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml @@ -103,7 +103,7 @@ <property name="platformURL" - value="http://${basedownloadHost}/eclipse/downloads/drops4/${eclipseBaseDir}" /> + value="https://${basedownloadHost}/eclipse/downloads/drops4/${eclipseBaseDir}" /> <!-- We used to use binary platform, since smaller, but moved to SDK, to be able to use API Tools. But then moved back to Platform, after having some cases where we need to pick up new fixes from @@ -119,7 +119,7 @@ --> <property name="eclipserun-repo" - value="http://download.eclipse.org/eclipse/updates/4.15-I-builds/" /> + value="https://download.eclipse.org/eclipse/updates/4.15-I-builds/" /> <echo message="eclipserun-repo: ${eclipserun-repo}" /> <property diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php index 2bbd9568e..8ede67e17 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/computeRepoURLs.php @@ -71,7 +71,7 @@ function computeSTREAM_REPO_NAME () { } function computeSTREAM_REPO_URL () { - $STREAM_REPO_URL="http://download.eclipse.org/eclipse/updates/".computeSTREAM_REPO_NAME ()."/"; + $STREAM_REPO_URL="https://download.eclipse.org/eclipse/updates/".computeSTREAM_REPO_NAME ()."/"; return $STREAM_REPO_URL; } @@ -93,7 +93,7 @@ function computeBUILD_REPO_NAME () { return $BUILD_REPO_NAME; } function computeBUILD_REPO_URL () { - $BUILD_REPO_URL="http://download.eclipse.org/eclipse/updates/".computeBUILD_REPO_NAME()."/"; + $BUILD_REPO_URL="https://download.eclipse.org/eclipse/updates/".computeBUILD_REPO_NAME()."/"; return $BUILD_REPO_URL; } diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html index a3434576f..60c4860a9 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html @@ -127,7 +127,7 @@ is included in Eclipse SDK. For those that do not need that support but need a smaller footprint for their own products, there is a subset of ICU4J, "com.ibm.icu.base" available from the <a - href="http://download.eclipse.org/tools/orbit/downloads/">Orbit + href="https://download.eclipse.org/tools/orbit/downloads/">Orbit Download Page</a>. </li> </ul></li> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php index 863849d27..7c17b9406 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php @@ -2,7 +2,7 @@ <head> <title>Eclipse Download Click Through</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link rel="stylesheet" href="http://download.eclipse/eclipse/default_style.css" type="text/css"> +<link rel="stylesheet" href="https://download.eclipse/eclipse/default_style.css" type="text/css"> <?php include("buildproperties.php"); @@ -89,9 +89,9 @@ if (array_key_exists("QUERY_STRING", $_SERVER)) { $mirror=true; if (strstr($servername,"eclipse.org")) { $mirror=false; - $eclipselink="http://www.eclipse.org/downloads/download.php?file="."$dlprefix/$buildLabel/$dropFile"; + $eclipselink="https://www.eclipse.org/downloads/download.php?file="."$dlprefix/$buildLabel/$dropFile"; } else { - $mirrorlink = "http://$servername$path/$dropFile"; + $mirrorlink = "https://$servername$path/$dropFile"; } $clickFile = "clickThroughs/"; diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/dropSectionUtils.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/dropSectionUtils.php index 0ea8f301d..19f3a5676 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/dropSectionUtils.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/dropSectionUtils.php @@ -59,6 +59,6 @@ function genLinks($zipfile) { // Also handy/needed when doing "local test builds". // Remember, md5 and sha1 are still in "checksum" directory, for at least initial Luna release, just not linked to. See bug // https://bugs.eclipse.org/bugs/show_bug.cgi?id=423714 - // echo "<td><a href=\"http://download.eclipse.org/eclipse/downloads/drops4/$BUILD_DIR_SEG/checksum/$zipfile.sha512\">[SHA512]</a></td>"; + // echo "<td><a href=\"https://download.eclipse.org/eclipse/downloads/drops4/$BUILD_DIR_SEG/checksum/$zipfile.sha512\">[SHA512]</a></td>"; } diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/staticDropFiles/build.php b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/staticDropFiles/build.php index 1d3892081..ed6e98bec 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/staticDropFiles/build.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/staticDropFiles/build.php @@ -22,8 +22,8 @@ function getDropSize($zipfile) { // TODO: change build index tool not to generate these "calls" at all. // In the mean time, we will just return empty string. function generateChecksumLinks($zipfile, $buildDir) { - //return "<td><a href=\"http://download.eclipse.org/equinox/drops/$buildDir/checksum/$zipfile.md5\"><img src=\"/equinox/images/md5.png\" alt=\"md5\"/></a><a href=\"http://download.eclipse.org/equinox/drops/$buildDir/checksum/$zipfile.sha1\"><img src=\"/equinox/images/sha1.png\" alt=\"sha1\"/></a></td>"; - //return "<td><a href=\"http://download.eclipse.org/equinox/drops/$buildDir/checksum/$zipfile.sha512\"><img src=\"/equinox/images/sha1.png\" alt=\"sha512\"/></a></td>"; + //return "<td><a href=\"https://download.eclipse.org/equinox/drops/$buildDir/checksum/$zipfile.md5\"><img src=\"/equinox/images/md5.png\" alt=\"md5\"/></a><a href=\"https://download.eclipse.org/equinox/drops/$buildDir/checksum/$zipfile.sha1\"><img src=\"/equinox/images/sha1.png\" alt=\"sha1\"/></a></td>"; + //return "<td><a href=\"https://download.eclipse.org/equinox/drops/$buildDir/checksum/$zipfile.sha512\"><img src=\"/equinox/images/sha1.png\" alt=\"sha512\"/></a></td>"; return ""; } ?> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/staticDropFiles/download.php b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/staticDropFiles/download.php index 03b8aae91..675b2480a 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/staticDropFiles/download.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/staticDropFiles/download.php @@ -2,7 +2,7 @@ <head> <title>Eclipse Download Click Through</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link rel="stylesheet" href="http://download.eclipse/eclipse/default_style.css" type="text/css"> +<link rel="stylesheet" href="https://download.eclipse/eclipse/default_style.css" type="text/css"> <?php $servername=$_SERVER['SERVER_NAME']; @@ -15,9 +15,9 @@ $qstring = $_SERVER['QUERY_STRING']; $dropFile=array_pop(split("=",$qstring,-1)); if ($qstring) { - $url = "http://$servername$script?$qstring"; + $url = "https://$servername$script?$qstring"; } else { - $url = "http://$servername$path$script"; + $url = "https://$servername$path$script"; } $dropdir = explode("/", getcwd()); @@ -32,9 +32,9 @@ $mirror=true; if (strstr($_SERVER['SERVER_NAME'],"eclipse.org")) { # if (strstr($_SERVER['SERVER_NAME'],"ibm.com")) { $mirror=false; - $eclipselink="http://www.eclipse.org/downloads/download.php?file=/equinox/drops/$buildDir/$dropFile"; + $eclipselink="https://www.eclipse.org/downloads/download.php?file=/equinox/drops/$buildDir/$dropFile"; } else { - $mirrorlink = "http://$servername$path/$dropFile"; + $mirrorlink = "https://$servername$path/$dropFile"; } $clickFile = "clickThroughs/"; diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/testResults.template.php b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/testResults.template.php index 4208ef35e..c599ee7fc 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/testResults.template.php +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/testResults.template.php @@ -23,7 +23,7 @@ ?> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link rel="stylesheet" title="default" href="http://download.eclipse/eclipse/default_style.css" type="text/css"> +<link rel="stylesheet" title="default" href="https://download.eclipse/eclipse/default_style.css" type="text/css"> </head> <body> <table width="77%" border="1"> diff --git a/production/build-functions.shsource b/production/build-functions.shsource index b4746362c..5b6e39b98 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -1181,7 +1181,7 @@ fn-summarize-apitooling () # Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports. FREEZE_PARAMS=" " # When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions. - #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610/eclipse-SDK-4.14-win32-x86_64.zip \ + #FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610/eclipse-SDK-4.14-win32-x86_64.zip \ # -DfreezeName=Eclipse-SDK-4.14 \ # -DfreezeFilename=eclipse-SDK-4.14-win32-x86_64.zip " # this API_PREV_REF_LABEL variable should be changed any time the version used diff --git a/production/createReports.sh b/production/createReports.sh index c71294c5c..0461fd78e 100755 --- a/production/createReports.sh +++ b/production/createReports.sh @@ -108,7 +108,7 @@ then mkdir -p ${output_dir} # This analyzersBuildId can (currently) be found by "drilling down" at - # http://download.eclipse.org/cbi/updates/analyzers/4.10/ + # https://download.eclipse.org/cbi/updates/analyzers/4.10/ # analyzersBuildId=I20161201-1633 # We use analyzer from hipp this way we have one less version to track tar_name=org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz diff --git a/production/master-build.sh b/production/master-build.sh index 18fa84bab..05bf8732e 100755 --- a/production/master-build.sh +++ b/production/master-build.sh @@ -184,7 +184,7 @@ fi # and build types, (e.g. M vs. I). For N builds, we still use "I". # 5/31013. We no longer do the post build comparator, but leaving it, just # in case we want an occasionally double check ... but, should never be routine. -#comparatorRepository=http://download.eclipse.org/eclipse/updates/4.4-I-builds +#comparatorRepository=https://download.eclipse.org/eclipse/updates/4.4-I-builds comparatorRepository=NOT_CURRENTLY_USED GET_AGGREGATOR_BUILD_LOG="${logsDirectory}/mb010_get-aggregator_output.txt" diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh index 664a5d3b4..5576ebbae 100755 --- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh +++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh @@ -25,7 +25,7 @@ baseEclipseAccessDir=/home/data/httpd/download.eclipse.org baseEclipseDirSegment=eclipse/downloads/drops4/R-4.14-201912100610 baseEclipse=eclipse-platform-4.14-linux-gtk-x86_64.tar.gz repoFileAccess=file:///home/data/httpd/download.eclipse.org/ -repoHttpAccess=http://download.eclipse.org +repoHttpAccess=https://download.eclipse.org repoAccess=${repoFileAccess} # TODO: reduce this list soon repoList="\ diff --git a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml index 83059d2e9..21f8969f6 100644 --- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml +++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml @@ -104,7 +104,7 @@ <property name="platformURL" - value="http://${basedownloadHost}/eclipse/downloads/drops4/${eclipseBaseDir}" /> + value="https://${basedownloadHost}/eclipse/downloads/drops4/${eclipseBaseDir}" /> <!-- We used to use binary platform, since smaller, but moved to SDK, to be able to use API Tools. But then moved back to Platform, after having some cases where we need to pick up new fixes from @@ -146,7 +146,7 @@ --> <property name="eclipserun-repo" - value="http://download.eclipse.org/eclipse/updates/4.15-I-builds/" /> + value="https://download.eclipse.org/eclipse/updates/4.15-I-builds/" /> <echo message="eclipserun-repo: ${eclipserun-repo}" /> <property diff --git a/production/miscToolsAndNotes/updaterepo/updateComposite42milestone.xml b/production/miscToolsAndNotes/updaterepo/updateComposite42milestone.xml index 62658da66..fcb3bdd80 100644 --- a/production/miscToolsAndNotes/updaterepo/updateComposite42milestone.xml +++ b/production/miscToolsAndNotes/updaterepo/updateComposite42milestone.xml @@ -8,8 +8,8 @@ name="The Eclipse Project milestone repository" /> <!-- <add> - <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.3.0/R-3.3.0-20110607160810/repository/"/> - <repository location='http://download.eclipse.org/libra/releases/R-0.1.0-201106071417/'/> + <repository location="https://download.eclipse.org/webtools/downloads/drops/R3.3.0/R-3.3.0-20110607160810/repository/"/> + <repository location='https://download.eclipse.org/libra/releases/R-0.1.0-201106071417/'/> </add> --> diff --git a/production/miscToolsAndNotes/updaterepo/updateComposite43N.xml b/production/miscToolsAndNotes/updaterepo/updateComposite43N.xml index ef464f29a..55bf05e4a 100644 --- a/production/miscToolsAndNotes/updaterepo/updateComposite43N.xml +++ b/production/miscToolsAndNotes/updaterepo/updateComposite43N.xml @@ -13,8 +13,8 @@ name="The Eclipse Project nightly repository" /> <!-- <add> - <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.3.0/R-3.3.0-20110607160810/repository/"/> - <repository location='http://download.eclipse.org/libra/releases/R-0.1.0-201106071417/'/> + <repository location="https://download.eclipse.org/webtools/downloads/drops/R3.3.0/R-3.3.0-20110607160810/repository/"/> + <repository location='https://download.eclipse.org/libra/releases/R-0.1.0-201106071417/'/> </add> --> diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml index 85308a9d2..878410620 100644 --- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml +++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml @@ -61,7 +61,7 @@ that is writeable. repoToPointTo can be any repo, but must be in "full form", such as - http://download.eclipse.org/eclipse/updates/${currentStream}milestones/ + https://download.eclipse.org/eclipse/updates/${currentStream}milestones/ --> <macrodef name="updatecomposite"> diff --git a/production/miscToolsAndNotes/utilityCronJobs/cleanup.sh b/production/miscToolsAndNotes/utilityCronJobs/cleanup.sh index c3b852f2d..35ed73139 100755 --- a/production/miscToolsAndNotes/utilityCronJobs/cleanup.sh +++ b/production/miscToolsAndNotes/utilityCronJobs/cleanup.sh @@ -104,7 +104,7 @@ clean() { #update website index and rsync the repo if [[ $project != "orion" ]]; then - wget -O index.txt http://download.eclipse.org/$urlFragment/$createIndex + wget -O index.txt https://download.eclipse.org/$urlFragment/$createIndex scp index.txt $user@build.eclipse.org:$remoteBase/$urlFragment/index.html rm index.txt fi diff --git a/production/sdk/promoteStableRelease/promoteImpl/addRepoProperties.sh b/production/sdk/promoteStableRelease/promoteImpl/addRepoProperties.sh index a83970949..78756babb 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/addRepoProperties.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/addRepoProperties.sh @@ -58,7 +58,7 @@ fi if [[ ! -z "${MIRRORURL}" ]] then # remember, the '&' should NOT be XML escaped here ... the p2 api (or underlying xml) will escape it. - MIRRORURL_ARG="http://www.eclipse.org/downloads/download.php?format=xml&file=${MIRRORURL}" + MIRRORURL_ARG="https://www.eclipse.org/downloads/download.php?format=xml&file=${MIRRORURL}" else MIRRORURL_ARG="" fi @@ -80,7 +80,7 @@ then STATS_TAG_FEATURE_LIST_ARG="-DstatsTrackedArtifacts=\"${STATS_TAG_FEATURE_LIST}\"" # no sense setting these others, if features not set # TODO: more error checking could be done, to warn, such if features list set, but other values not - STATS_TAG_VERSIONINDICATOR_ARG="-Dp2StatsURI=\"http://download.eclipse.org/stats${MIRRORURL}\"" + STATS_TAG_VERSIONINDICATOR_ARG="-Dp2StatsURI=\"https://download.eclipse.org/stats${MIRRORURL}\"" if [[ -n ${STATS_TAG_SUFFIX} ]] then STATS_TAG_SUFFIX_ARG="-DstatsArtifactsSuffix=\"${STATS_TAG_SUFFIX}\"" diff --git a/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh b/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh index 086e41999..5bafbcf82 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh @@ -60,7 +60,7 @@ fi if [[ ! -z "${MIRRORURL}" ]] then # remember, the '&' should NOT be XML escaped here ... the p2 api (or underlying xml) will escape it. - MIRRORURL_ARG="http://www.eclipse.org/downloads/download.php?format=xml&file=${MIRRORURL}" + MIRRORURL_ARG="https://www.eclipse.org/downloads/download.php?format=xml&file=${MIRRORURL}" else MIRRORURL_ARG="" fi @@ -82,7 +82,7 @@ then STATS_TAG_FEATURE_LIST_ARG="-DstatsTrackedArtifacts=${STATS_TAG_FEATURE_LIST}" # no sense setting these others, if features not set # TODO: more error checking could be done, to warn, such if features list set, but other values not - STATS_TAG_VERSIONINDICATOR_ARG="-Dp2StatsURI=http://download.eclipse.org/stats${MIRRORURL}" + STATS_TAG_VERSIONINDICATOR_ARG="-Dp2StatsURI=https://download.eclipse.org/stats${MIRRORURL}" if [[ -n ${STATS_TAG_SUFFIX} ]] then STATS_TAG_SUFFIX_ARG="-DstatsArtifactsSuffix=${STATS_TAG_SUFFIX}" diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteSitesCore.sh b/production/sdk/promoteStableRelease/promoteImpl/promoteSitesCore.sh index 50b19dc1e..c8f4bf67f 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteSitesCore.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteSitesCore.sh @@ -167,16 +167,16 @@ then printf "\n\t%20s%25s\n" "HIDE_SITE" "${HIDE_SITE}" >> "${CL_SITE}/checklist.txt" printf "\t%s\n" "Eclipse downloads:" >> "${CL_SITE}/checklist.txt" - printf "\t%s\n\n" "http://download.eclipse.org/eclipse/downloads/drops4/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt" + printf "\t%s\n\n" "https://download.eclipse.org/eclipse/downloads/drops4/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt" printf "\t%s\n" "Update existing (non-production) installs:" >> "${CL_SITE}/checklist.txt" - printf "\t%s\n\n" "http://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/" >> "${CL_SITE}/checklist.txt" + printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/" >> "${CL_SITE}/checklist.txt" printf "\t%s\n" "Specific repository good for building against:" >> "${CL_SITE}/checklist.txt" - printf "\t%s\n\n" "http://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt" + printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt" printf "\t%s\n" "Equinox specific downloads:" >> "${CL_SITE}/checklist.txt" - printf "\t%s\n\n" "http://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt" + printf "\t%s\n\n" "https://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt" # mail template @@ -186,16 +186,16 @@ then printf "\n%s\n\n" "${INITIAL_MAIL_LINES}" >> "${CL_SITE}/mailtemplate.txt" printf "\t%s\n" "Eclipse downloads:" >> "${CL_SITE}/mailtemplate.txt" - printf "\t%s\n\n" "http://download.eclipse.org/eclipse/downloads/drops4/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt" + printf "\t%s\n\n" "https://download.eclipse.org/eclipse/downloads/drops4/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt" printf "\t%s\n" "Update existing (non-production) installs:" >> "${CL_SITE}/mailtemplate.txt" - printf "\t%s\n\n" "http://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt" + printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt" printf "\t%s\n" "Specific repository good for building against:" >> "${CL_SITE}/mailtemplate.txt" - printf "\t%s\n\n" "http://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt" + printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt" printf "\t%s\n" "Equinox specific downloads:" >> "${CL_SITE}/mailtemplate.txt" - printf "\t%s\n\n" "http://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt" + printf "\t%s\n\n" "https://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt" printf "\n\n%s\n" "${CLOSING_MAIL_LINES}" >> "${CL_SITE}/mailtemplate.txt" diff --git a/production/sdk/promotion/syncDropLocation.sh b/production/sdk/promotion/syncDropLocation.sh index f83c14aa9..9474985eb 100755 --- a/production/sdk/promotion/syncDropLocation.sh +++ b/production/sdk/promotion/syncDropLocation.sh @@ -62,7 +62,7 @@ function sendPromoteMail () # Comparator differences from current build # /shared/eclipse/builds/4N/siteDir/eclipse/downloads/drops4/N20140705-1700 # compared to reference repo at - # http://download.eclipse.org/eclipse/updates/4.5-I-builds + # https://download.eclipse.org/eclipse/updates/4.5-I-builds # = = = = # So we'll set "250 bytes" as minimum which should both ignore all "minimum's", # and catch anything of substance. @@ -77,7 +77,7 @@ function sendPromoteMail () return 1 fi - downloadURL=http://${SITE_HOST}/${mainPath}/${buildId}/ + downloadURL=https://${SITE_HOST}/${mainPath}/${buildId}/ fsDownloadSitePath=${fsDocRoot}/${mainPath}/${buildId} comparatorLogPath=${fsDownloadSitePath}/${comparatorLogRelPath} logSize=0 @@ -147,14 +147,14 @@ function sendPromoteMail () # custom message if doing patch build if [[ "${buildType}" == "P" || "${buildType}" == "U" ]] then - link=$(linkURL http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}) + link=$(linkURL https://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}) message1="${message1}<p>Specific (simple) site repository: <br />\n ${link}</p>\n" - link=$(linkURL http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds) + link=$(linkURL https://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds) message1="${message1}<p>Remember: The patch must be confirmed before is it added to the composite: <br />\n ${link}</p>\n" else - link=$(linkURL http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds) + link=$(linkURL https://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds) message1="${message1}<p>Software site repository: <br />\n ${link}</p>\n" - link=$(linkURL http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}) + link=$(linkURL https://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}) message1="${message1}<p>Specific (simple) site repository: <br />\n ${link}</p>\n" fi fi @@ -162,7 +162,7 @@ function sendPromoteMail () # Do not include Equinox, if build failed, or if patch or experimental build if [[ -z "${BUILD_FAILED}" && ! "${buildType}" =~ [PYXU] ]] then - link=$(linkURL http://${SITE_HOST}/equinox/drops/${buildId}) + link=$(linkURL https://${SITE_HOST}/equinox/drops/${buildId}) message1="${message1}<p>Equinox downloads: <br />\n ${link}</p>\n" fi @@ -335,7 +335,7 @@ function syncRepoSite () dlSite=$( dropOnDLServer ${eclipseStream} ${buildId} ) mkdir -p ${dlSite}/${buildId} touch ${dlSite}/${buildId}/buildUnstable - echo "<p>This build has been marked unstable due to <a href='http://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>unanticipated comparator errors</a></p>">> ${dlSite}/${buildId}/buildUnstable + echo "<p>This build has been marked unstable due to <a href='https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>unanticipated comparator errors</a></p>">> ${dlSite}/${buildId}/buildUnstable RC=0 fi set +x diff --git a/production/sdk/promotion/updateDropLocation.sh b/production/sdk/promotion/updateDropLocation.sh index 79122d139..d925892ad 100755 --- a/production/sdk/promotion/updateDropLocation.sh +++ b/production/sdk/promotion/updateDropLocation.sh @@ -227,7 +227,7 @@ function sendTestResultsMail () return 1 fi - downloadURL="http://${SITE_HOST}/${mainPath}/${buildId}/" + downloadURL="https://${SITE_HOST}/${mainPath}/${buildId}/" fsDownloadSitePath="${fsDocRoot}/${mainPath}/${buildId}" export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} diff --git a/production/sdk/updateIndexFilesFunction.shsource b/production/sdk/updateIndexFilesFunction.shsource index d54aad863..94df776c2 100644 --- a/production/sdk/updateIndexFilesFunction.shsource +++ b/production/sdk/updateIndexFilesFunction.shsource @@ -33,7 +33,7 @@ function internalUpdateIndex () # remove previous vesrsions, if exists rm ${TEMP_INDEX_TXT} 2>/dev/null - wget --no-verbose -O ${TEMP_INDEX_TXT} http://${SITE_HOST}/eclipse/downloads/${PHP_PAGE} 2>&1 + wget --no-verbose -O ${TEMP_INDEX_TXT} https://${SITE_HOST}/eclipse/downloads/${PHP_PAGE} 2>&1 rccode=$? if [[ $rccode = 0 ]] then @@ -48,7 +48,7 @@ function internalUpdateIndex () rccode=$? if [[ $rccode = 0 ]] then - echo "INFO: Updated http://${SITE_HOST}/eclipse/downloads/${HTML_PAGE}" + echo "INFO: Updated https://${SITE_HOST}/eclipse/downloads/${HTML_PAGE}" # normal exit. Return out the bottom, to include 'remove' temp file. # return 0 else diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index 22fe1fb2a..debcc162b 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -541,7 +541,7 @@ unless="currentUpdateSite"> <property name="currentUpdateSite" - value="http://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" /> + value="https://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" /> </target> <target name="initStreamSpecificProperties" @@ -814,13 +814,13 @@ <property name="current.build.repo" - value="http://${DOWNLOAD_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}" /> + value="https://${DOWNLOAD_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}" /> <echo message="current.build.repo: ${current.build.repo}" /> <property name="last.release.build.repo" - value="http://${DOWNLOAD_HOST}/eclipse/updates/${previousReleaseVersionRepo}" /> + value="https://${DOWNLOAD_HOST}/eclipse/updates/${previousReleaseVersionRepo}" /> <echo message="last.release.build.repo: ${last.release.build.repo}" /> <!-- @@ -1759,7 +1759,7 @@ destdir="${results}/html" filenameparameter="filename"> <factory> - <feature name="http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions" value="true"/> + <feature name="https://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions" value="true"/> </factory> </xslt> </target> diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index 0d493c0b6..dc22cc44f 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -11,7 +11,7 @@ streamSpecificPropertiesTitle="Properties for 4.15.0 builds and tests" # stable version of Eclipse, that is used, for example, for it's p2 # director, etc., so that "running the tests" is not actually using # the "just built" versions. -previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610 +previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610 # version here is "build label" ... in general form, the "middle" of archive name, # such as "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz # Also used used in p2 testing? @@ -34,7 +34,7 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed # baselinePerf=true # are specified. The baselinePerf will often be the same as "previous release", but # not necessarily, so is not hard coded in assumptions. -baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610 +baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh baselinePerfVersion=R-4.14-201912100610 # TODO: could/should eventually "compute" label, from full version? diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml index e0b29582d..3aa3e3944 100644 --- a/production/testScripts/invokeTestsJSON.xml +++ b/production/testScripts/invokeTestsJSON.xml @@ -134,7 +134,7 @@ <property name="baseURL" - value="http://download.eclipse.org/eclipse/downloads/${dropsDirSegment}/${buildId}" /> + value="https://download.eclipse.org/eclipse/downloads/${dropsDirSegment}/${buildId}" /> --> <!-- Hudson jobs currently have four required parameters --> @@ -202,7 +202,7 @@ <property name="baseURL" - value="http://download.eclipse.org/eclipse/downloads/${dropsDirSegment}/${buildId}" /> + value="https://download.eclipse.org/eclipse/downloads/${dropsDirSegment}/${buildId}" /> --> <!-- Hudson jobs currently have four required parameters --> @@ -297,7 +297,7 @@ <property name="baseURL" - value="http://download.eclipse.org/eclipse/downloads/${dropsDirSegment}/${buildId}" /> + value="https://download.eclipse.org/eclipse/downloads/${dropsDirSegment}/${buildId}" /> --> <!-- Hudson jobs currently have 3 required parameters --> diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml index 40b585844..cdb9ae93a 100644 --- a/production/testScripts/runTests2.xml +++ b/production/testScripts/runTests2.xml @@ -28,7 +28,7 @@ </condition> <property name="buildURL" - value="http://${DOWNLOAD_HOST}/eclipse/downloads/${dropsDirSegment}/${buildId}" /> + value="https://${DOWNLOAD_HOST}/eclipse/downloads/${dropsDirSegment}/${buildId}" /> <!-- if 'baselinePerf' is specified, need to it for "buildId", plus adjust URL to it, not what we just built. Only "tests" always get buildURL --> @@ -629,7 +629,7 @@ unless="currentUpdateSite"> <property name="currentUpdateSite" - value="http://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" /> + value="https://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" /> </target> <target name="checkInstallDir" diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh index 05e3bed90..9d0982c91 100755 --- a/production/testScripts/test_runTests2.xml.sh +++ b/production/testScripts/test_runTests2.xml.sh @@ -96,8 +96,8 @@ echo "PWD: $PWD" # ? There are a number of test-<something> methods in test xml which, by convention, mean # to simply test the test script itself. The test-all target runs all of those tests. # MUST change the arch values here, then testing on other platforms! -ant -f "${WORKSPACE}/${ANTFILE}" -Dbasebuilderlocal=/shared/eclipse/buildtests -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true -#ant -f "${WORKSPACE}/${ANTFILE}" -Dbasebuilderlocal=/shared/eclipse/buildtests -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true +ant -f "${WORKSPACE}/${ANTFILE}" -Dbasebuilderlocal=/shared/eclipse/buildtests -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true +#ant -f "${WORKSPACE}/${ANTFILE}" -Dbasebuilderlocal=/shared/eclipse/buildtests -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true rc=$? if [[ $rc == 0 ]] then diff --git a/scripts/createdeltapack.xml b/scripts/createdeltapack.xml index 21bdf4480..20d6fcc52 100644 --- a/scripts/createdeltapack.xml +++ b/scripts/createdeltapack.xml @@ -49,7 +49,7 @@ <property name="buildRepo" - value="http://download.eclipse.org/eclipse/updates/I-builds" /> + value="https://download.eclipse.org/eclipse/updates/I-builds" /> <property name="projectDir" value="${basedir}" /> |