Skip to content

Commit

Permalink
Bug 578536 - Stop pointing to http://download.eclipse.org
Browse files Browse the repository at this point in the history
Use https instead

Change-Id: Ie781472c5823e5e668273a2ded56722c1a16edd6
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.build/+/190668
Tested-by: PDE Bot <[email protected]>
Reviewed-by: Alexander Kurtakov <[email protected]>
  • Loading branch information
akurtakov committed Feb 10, 2022
1 parent 40ad2da commit fa188e6
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions examples/adt.builder/buildADT.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<mkdir dir="${downloadFolder}/toTransform" />
<mkdir dir="${downloadFolder}/mylyn" />

<get usetimestamp="true" dest="${downloadFolder}/cdt.zip" src="http://download.eclipse.org/tools/cdt/releases/galileo/dist/cdt-master-6.0.0.zip" />
<get usetimestamp="true" dest="${downloadFolder}/mylyn.zip" src="http://download.eclipse.org/tools/mylyn/update-archive/3.2.0/v20090617-0100/mylyn-3.2.0.v20090617-0100-e3.4.zip"/>
<get usetimestamp="true" dest="${downloadFolder}/cvs.zip" src="http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/org.eclipse.cvs-p2repo-3.5.zip" />
<get usetimestamp="true" dest="${downloadFolder}/cdt.zip" src="https://download.eclipse.org/tools/cdt/releases/galileo/dist/cdt-master-6.0.0.zip" />
<get usetimestamp="true" dest="${downloadFolder}/mylyn.zip" src="https://download.eclipse.org/tools/mylyn/update-archive/3.2.0/v20090617-0100/mylyn-3.2.0.v20090617-0100-e3.4.zip"/>
<get usetimestamp="true" dest="${downloadFolder}/cvs.zip" src="https://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/org.eclipse.cvs-p2repo-3.5.zip" />

<!-- we will use the platform.zip as our base, so put it separately to be transformed -->
<get usetimestamp="true" dest="${downloadFolder}/toTransform/platform.zip" src="http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/org.eclipse.platform-p2repo-3.5.zip" />
<get usetimestamp="true" dest="${downloadFolder}/toTransform/platform.zip" src="https://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/org.eclipse.platform-p2repo-3.5.zip" />
</target>

<target name="publishMylyn">
Expand Down
8 changes: 4 additions & 4 deletions examples/adt.feature.builder/buildADT.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<mkdir dir="${downloadFolder}/toTransform" />
<mkdir dir="${downloadFolder}/mylyn" />

<get usetimestamp="true" dest="${downloadFolder}/cdt.zip" src="http://download.eclipse.org/tools/cdt/releases/galileo/dist/cdt-master-6.0.0.zip" />
<get usetimestamp="true" dest="${downloadFolder}/mylyn.zip" src="http://download.eclipse.org/tools/mylyn/update-archive/3.2.0/v20090617-0100/mylyn-3.2.0.v20090617-0100-e3.4.zip"/>
<get usetimestamp="true" dest="${downloadFolder}/cvs.zip" src="http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/org.eclipse.cvs-p2repo-3.5.zip" />
<get usetimestamp="true" dest="${downloadFolder}/cdt.zip" src="https://download.eclipse.org/tools/cdt/releases/galileo/dist/cdt-master-6.0.0.zip" />
<get usetimestamp="true" dest="${downloadFolder}/mylyn.zip" src="https://download.eclipse.org/tools/mylyn/update-archive/3.2.0/v20090617-0100/mylyn-3.2.0.v20090617-0100-e3.4.zip"/>
<get usetimestamp="true" dest="${downloadFolder}/cvs.zip" src="https://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/org.eclipse.cvs-p2repo-3.5.zip" />

<!-- we will use the platform.zip as our base, so put it separately to be transformed -->
<get usetimestamp="true" dest="${downloadFolder}/toTransform/platform.zip" src="http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/org.eclipse.platform-p2repo-3.5.zip" />
<get usetimestamp="true" dest="${downloadFolder}/toTransform/platform.zip" src="https://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/org.eclipse.platform-p2repo-3.5.zip" />
</target>

<target name="publishMylyn">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ forceContextQualifier=v${timestamp}
baseLocation=${base}/eclipse

# see customTargets.xml / getBaseComponents
eclipseURL=http://download.eclipse.org/eclipse/downloads/drops/R-3.4.1-200809111700
eclipseURL=https://download.eclipse.org/eclipse/downloads/drops/R-3.4.1-200809111700
eclipseRCPBinary=eclipse-RCP-3.4.1-win32.zip
eclipseDeltaPack=eclipse-3.4.1-delta-pack.zip

Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.pde.build.tests/resources/171869/directory.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[email protected],3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/com.ibm.icu.base_3.4.5.jar
[email protected],3.4.5=GET,https://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/com.ibm.icu.base_3.4.5.jar

[email protected],3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/com.ibm.icu.base_3.6.0.v20080530.jar
[email protected],3.6.0=GET,https://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/com.ibm.icu.base_3.6.0.v20080530.jar

[email protected],3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/com.ibm.icu.base_3.6.1.v20080530.jar
[email protected],3.6.1=GET,https://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/com.ibm.icu.base_3.6.1.v20080530.jar
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ public void testGetUnpack() throws Exception {

StringBuffer buffer = new StringBuffer();
buffer.append(
"[email protected],1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.xml.rpc_1.1.0.v200905122109.zip,unpack=true\n");
"[email protected],1.1.0=GET,https://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.xml.rpc_1.1.0.v200905122109.zip,unpack=true\n");
buffer.append(
"[email protected],3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite/plugins/com.ibm.icu.base_3.6.0.v20080530.jar,unpack=true,dest=${buildDirectory}/plugins/com.ibm.icu.base_3.6.0/.zip\n");
"[email protected],3.6.0=GET,https://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite/plugins/com.ibm.icu.base_3.6.0.v20080530.jar,unpack=true,dest=${buildDirectory}/plugins/com.ibm.icu.base_3.6.0/.zip\n");
buffer.append(
"[email protected],3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite/plugins/com.ibm.icu.base_3.6.1.v20080530.jar,unpack=true\n");
"[email protected],3.6.1=GET,https://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite/plugins/com.ibm.icu.base_3.6.1.v20080530.jar,unpack=true\n");
Utils.writeBuffer(buildFolder.getFile("directory.txt"), buffer);

Utils.generateFeature(buildFolder, "org.eclipse.pde.build.container.feature", null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ public void testBug338835_MissingLicenseSection() throws Exception {
buffer.append(" <description url=\"http://eclipse.org/ptp\">%description</description> \n");
buffer.append(" <copyright>%copyright</copyright> \n");
buffer.append(" <url> \n");
buffer.append(" <update label=\"%updateSiteName\" url=\"http://download.eclipse.org/updates\"/> \n");
buffer.append(" <update label=\"%updateSiteName\" url=\"https://download.eclipse.org/updates\"/> \n");
buffer.append(" </url> \n");
buffer.append("</feature> \n");
Utils.writeBuffer(featureFolder.getFile("feature.xml"), buffer);
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.pde.build.tests/test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<!--
In product tests, currentUpdateSite is provided by the testing infrastructure.
It should be similar to somethign like
http://download.eclipse.org/eclipse/updates/4.6-I-builds/I20160419-0800/
https://download.eclipse.org/eclipse/updates/4.6-I-builds/I20160419-0800/
-->

<fail
Expand Down

0 comments on commit fa188e6

Please sign in to comment.