Fix p2 tests to not use http://download.eclipse.orgI20211017-1800I20211016-1800I20211015-1800I20211014-1800I20211013-1800

Fixes many warnings printed during running p2 tests about unsecure p2
site location.

Change-Id: I5488712fd23044a9af992c8751a687f7c42e3c43
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.p2/+/186419
Tested-by: Equinox Bot <equinox-bot@eclipse.org>

20 files changed, 146 insertions, 95 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestLicenseConsistency.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestLicenseConsistency.java
index e0c3f74e3..44cb6f077 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestLicenseConsistency.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestLicenseConsistency.java
@@ -27,13 +27,14 @@ import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 
 /**
- * Tests that licenses in the indigo repository are consistent with the platform feature license.
- * Note this test isn't intended to be included in automated tests. It produces a report
- * on stdout that can be used to identify features with inconsistent feature licenses.
+ * Tests that licenses in the latest release repository are consistent with the
+ * platform feature license. Note this test isn't intended to be included in
+ * automated tests. It produces a report on stdout that can be used to identify
+ * features with inconsistent feature licenses.
  */
 public class TestLicenseConsistency extends AbstractProvisioningTest {
 	public void testLicenses() throws URISyntaxException, ProvisionException, OperationCanceledException {
-		URI repoLocation = new URI("http://download.eclipse.org/releases/indigo/201103180900");
+		URI repoLocation = new URI("https://download.eclipse.org/releases/latest");
 		IMetadataRepository repo = getMetadataRepositoryManager().loadRepository(repoLocation, null);
 		IQueryResult<IInstallableUnit> allFeatures = repo.query(QueryUtil.createIUGroupQuery(), null);
 		IQueryResult<IInstallableUnit> platform = allFeatures.query(QueryUtil.createIUQuery("org.eclipse.platform.feature.group"), null);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/MirrorSelectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/MirrorSelectorTest.java
index 527fbc098..154400956 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/MirrorSelectorTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/MirrorSelectorTest.java
@@ -38,223 +38,223 @@ public class MirrorSelectorTest {
 		originals = new ArrayList<>();
 		MirrorInfo mi = null;
 
-		mi = new MirrorInfo("http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/", 3);
+		mi = new MirrorInfo("https://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/", 3);
 		mi.setBytesPerSecond(224906);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/", 1);
+		mi = new MirrorInfo("https://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/", 1);
 		mi.setBytesPerSecond(125868);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirror.netcologne.de/eclipse//", 0);
+		mi = new MirrorInfo("https://mirror.netcologne.de/eclipse//", 0);
 		mi.setBytesPerSecond(199719);
 		mi.incrementFailureCount();
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 2;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirror.selfnet.de/eclipse/", 5);
+		mi = new MirrorInfo("https://mirror.selfnet.de/eclipse/", 5);
 		mi.setBytesPerSecond(132379);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirror.switch.ch/eclipse/", 7);
+		mi = new MirrorInfo("https://mirror.switch.ch/eclipse/", 7);
 		mi.setBytesPerSecond(137107);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://www.rcp-vision.com/eclipse/eclipseMirror/", 8);
+		mi = new MirrorInfo("https://www.rcp-vision.com/eclipse/eclipseMirror/", 8);
 		mi.setBytesPerSecond(128472);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://eclipse.mirror.garr.it/mirrors/eclipse//", 10);
+		mi = new MirrorInfo("https://eclipse.mirror.garr.it/mirrors/eclipse//", 10);
 		mi.setBytesPerSecond(129359);
 		mi.incrementFailureCount();
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 2;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.roedu.net/pub/mirrors/eclipse.org/", 6);
+		mi = new MirrorInfo("https://ftp.roedu.net/pub/mirrors/eclipse.org/", 6);
 		mi.setBytesPerSecond(59587);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://giano.com.dist.unige.it/eclipse/", 9);
+		mi = new MirrorInfo("https://giano.com.dist.unige.it/eclipse/", 9);
 		mi.setBytesPerSecond(85624);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.roedu.net/mirrors/eclipse.org//", 19);
+		mi = new MirrorInfo("https://ftp.roedu.net/mirrors/eclipse.org//", 19);
 		mi.setBytesPerSecond(149572);
 		mi.incrementFailureCount();
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 2;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.ing.umu.se/mirror/eclipse/", 18);
+		mi = new MirrorInfo("https://ftp.ing.umu.se/mirror/eclipse/", 18);
 		mi.setBytesPerSecond(105858);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirrors.fe.up.pt/pub/eclipse//", 15);
+		mi = new MirrorInfo("https://mirrors.fe.up.pt/pub/eclipse//", 15);
 		mi.setBytesPerSecond(67202);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.heanet.ie/pub/eclipse//", 17);
+		mi = new MirrorInfo("https://ftp.heanet.ie/pub/eclipse//", 17);
 		mi.setBytesPerSecond(68067);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.sh.cvut.cz/MIRRORS/eclipse/", 21);
+		mi = new MirrorInfo("https://ftp.sh.cvut.cz/MIRRORS/eclipse/", 21);
 		mi.setBytesPerSecond(73659);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.man.poznan.pl/eclipse/", 22);
+		mi = new MirrorInfo("https://ftp.man.poznan.pl/eclipse/", 22);
 		mi.setBytesPerSecond(73446);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://eclipse.dcc.fc.up.pt/", 16);
+		mi = new MirrorInfo("https://eclipse.dcc.fc.up.pt/", 16);
 		mi.setBytesPerSecond(45175);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://eclipse.nordnet.fi/eclipse/", 23);
+		mi = new MirrorInfo("https://eclipse.nordnet.fi/eclipse/", 23);
 		mi.setBytesPerSecond(61443);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://www.gtlib.gatech.edu/pub/eclipse/", 26);
+		mi = new MirrorInfo("https://www.gtlib.gatech.edu/pub/eclipse/", 26);
 		mi.setBytesPerSecond(57637);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.osuosl.org/pub/eclipse//", 28);
+		mi = new MirrorInfo("https://ftp.osuosl.org/pub/eclipse//", 28);
 		mi.setBytesPerSecond(35928);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirrors.med.harvard.edu/eclipse//", 32);
+		mi = new MirrorInfo("https://mirrors.med.harvard.edu/eclipse//", 32);
 		mi.setBytesPerSecond(40683);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirrors.ibiblio.org/pub/mirrors/eclipse/", 31);
+		mi = new MirrorInfo("https://mirrors.ibiblio.org/pub/mirrors/eclipse/", 31);
 		mi.setBytesPerSecond(34207);
 		mi.incrementFailureCount();
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 2;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.ussg.iu.edu/eclipse/", 33);
+		mi = new MirrorInfo("https://ftp.ussg.iu.edu/eclipse/", 33);
 		mi.setBytesPerSecond(31402);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirrors.xmission.com/eclipse/", 29);
+		mi = new MirrorInfo("https://mirrors.xmission.com/eclipse/", 29);
 		mi.setBytesPerSecond(24147);
 		mi.incrementFailureCount();
 		//mi.totalFailureCount = 1;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.osuosl.org/pub/eclipse/", 34);
+		mi = new MirrorInfo("https://ftp.osuosl.org/pub/eclipse/", 34);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://www.ftp.saix.net/Eclipse//", 40);
+		mi = new MirrorInfo("https://www.ftp.saix.net/Eclipse//", 40);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.daum.net/eclipse/", 41);
+		mi = new MirrorInfo("https://ftp.daum.net/eclipse/", 41);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://eclipse.stu.edu.tw/", 43);
+		mi = new MirrorInfo("https://eclipse.stu.edu.tw/", 43);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://eclipse.stu.edu.tw/", 44);
+		mi = new MirrorInfo("https://eclipse.stu.edu.tw/", 44);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.kaist.ac.kr/eclipse/", 45);
+		mi = new MirrorInfo("https://ftp.kaist.ac.kr/eclipse/", 45);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://eclipse.stu.edu.tw//", 46);
+		mi = new MirrorInfo("https://eclipse.stu.edu.tw//", 46);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.tsukuba.wide.ad.jp/software/eclipse//", 47);
+		mi = new MirrorInfo("https://ftp.tsukuba.wide.ad.jp/software/eclipse//", 47);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirror.neu.edu.cn/eclipse/", 50);
+		mi = new MirrorInfo("https://mirror.neu.edu.cn/eclipse/", 50);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://mirror.bit.edu.cn/eclipse/", 51);
+		mi = new MirrorInfo("https://mirror.bit.edu.cn/eclipse/", 51);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.cs.pu.edu.tw/pub/eclipse/", 52);
+		mi = new MirrorInfo("https://ftp.cs.pu.edu.tw/pub/eclipse/", 52);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://ftp.neu.edu.cn/mirrors/eclipse/", 53);
+		mi = new MirrorInfo("https://ftp.neu.edu.cn/mirrors/eclipse/", 53);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://download.actuatechina.com/eclipse/", 54);
+		mi = new MirrorInfo("https://download.actuatechina.com/eclipse/", 54);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://linorg.usp.br/eclipse/", 57);
+		mi = new MirrorInfo("https://linorg.usp.br/eclipse/", 57);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://eclipse.c3sl.ufpr.br/", 59);
+		mi = new MirrorInfo("https://eclipse.c3sl.ufpr.br/", 59);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
 
-		mi = new MirrorInfo("http://download.eclipse.org/", 61);
+		mi = new MirrorInfo("https://download.eclipse.org/", 61);
 		mi.setBytesPerSecond(-1);
 		//mi.totalFailureCount = 0;
 		originals.add(mi);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ProvisioningAgentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ProvisioningAgentTest.java
index fd4e953e9..268b42d5f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ProvisioningAgentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ProvisioningAgentTest.java
@@ -35,7 +35,7 @@ public class ProvisioningAgentTest extends AbstractProvisioningTest {
 	 * @throws URISyntaxException
 	 */
 	public void testMultipleAgents() throws ProvisionException, URISyntaxException {
-		URI repoLocation = new URI("http://download.eclipse.org/eclipse/updates/3.6");
+		URI repoLocation = new URI("https://download.eclipse.org/eclipse/updates/latest");
 		URI p2location = getTempFolder().toURI();
 		String PROFILE_ID = "testMultipleAgents";
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java
index 310665dfe..0cc4d9152 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java
@@ -243,7 +243,6 @@ public class PhaseSetTest extends AbstractProvisioningTest {
 
 	@Test
 	public void testPauseAndResumeMoreThanOnce() throws ProvisionException, InterruptedException {
-		//		URI repoLoc = URI.create("http://download.eclipse.org/releases/indigo");
 		URI repoLoc = getTestData("Load test data.", "/testData/pausefeature").toURI();
 		final PhaseSet phaseSet = (PhaseSet) PhaseSetFactory.createDefaultPhaseSet();
 		final int threhold = 3;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java
index 409e64309..f94358f9c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java
@@ -16,14 +16,28 @@ package org.eclipse.equinox.p2.tests.engine;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.eclipse.core.internal.registry.ExtensionRegistry;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.spi.RegistryContributor;
 import org.eclipse.equinox.internal.p2.artifact.repository.MirrorEvent;
-import org.eclipse.equinox.internal.p2.engine.*;
+import org.eclipse.equinox.internal.p2.engine.CollectEvent;
+import org.eclipse.equinox.internal.p2.engine.CommitOperationEvent;
+import org.eclipse.equinox.internal.p2.engine.InstallableUnitEvent;
+import org.eclipse.equinox.internal.p2.engine.PhaseEvent;
+import org.eclipse.equinox.internal.p2.engine.RollbackOperationEvent;
 import org.eclipse.equinox.internal.p2.metadata.TouchpointData;
 import org.eclipse.equinox.internal.p2.metadata.TouchpointInstruction;
 import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
@@ -31,9 +45,18 @@ import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstant
 import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.RemoveRepositoryAction;
 import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener;
 import org.eclipse.equinox.p2.core.ProvisionException;
-import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.engine.IEngine;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.IProvisioningPlan;
+import org.eclipse.equinox.p2.engine.PhaseSetFactory;
+import org.eclipse.equinox.p2.engine.ProvisioningContext;
 import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
-import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IRequirement;
+import org.eclipse.equinox.p2.metadata.ITouchpointInstruction;
+import org.eclipse.equinox.p2.metadata.ITouchpointType;
+import org.eclipse.equinox.p2.metadata.MetadataFactory;
+import org.eclipse.equinox.p2.metadata.Version;
 import org.eclipse.equinox.p2.query.IQueryResult;
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.p2.repository.IRepository;
@@ -41,7 +64,9 @@ import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRequest;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.eclipse.equinox.p2.tests.TestActivator;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class ProvisioningEventTest extends AbstractProvisioningTest {
 	private IEngine engine;
@@ -203,7 +228,7 @@ public class ProvisioningEventTest extends AbstractProvisioningTest {
 			IProfile profile = createProfile("testConfigureEvent");
 			IProvisioningPlan plan = engine.createPlan(profile, null);
 
-			final String testLocation = "http://download.eclipse.org/releases/juno";
+			final String testLocation = "https://download.eclipse.org/releases/2021-09";
 			// remove the existing location in case it has
 			Map<String, Object> args = new HashMap<>();
 			args.put(ActionConstants.PARM_AGENT, getAgent());
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest35.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest35.java
index 76148ba98..4725ca6a9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest35.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest35.java
@@ -59,7 +59,7 @@ public class End2EndTest35 extends AbstractEnd2EndTest {
 
 	@Override
 	protected URI getRepositoryLocation() {
-		return URI.create("http://download.eclipse.org/eclipse/updates/3.5");
+		return URI.create("https://download.eclipse.org/eclipse/updates/3.5");
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest36.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest36.java
index ec819c5d9..fe33e7936 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest36.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest36.java
@@ -17,7 +17,10 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
+import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin;
+import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdminRuntimeException;
+import org.eclipse.equinox.internal.provisional.frameworkadmin.LauncherData;
+import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
 import org.eclipse.equinox.p2.metadata.VersionedId;
 
 /**
@@ -59,7 +62,7 @@ public class End2EndTest36 extends AbstractEnd2EndTest {
 
 	@Override
 	protected URI getRepositoryLocation() {
-		return URI.create("http://download.eclipse.org/eclipse/updates/3.6");
+		return URI.create("https://download.eclipse.org/eclipse/updates/3.6");
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest37.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest37.java
index b5f3cb394..6ea361ebf 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest37.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest37.java
@@ -59,7 +59,7 @@ public class End2EndTest37 extends AbstractEnd2EndTest {
 
 	@Override
 	protected URI getRepositoryLocation() {
-		return URI.create("http://download.eclipse.org/eclipse/updates/3.7");
+		return URI.create("https://download.eclipse.org/eclipse/updates/3.7");
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
index 0f6b422d7..3af32252c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
@@ -505,9 +505,9 @@ public class MetadataRepositoryManagerTest extends AbstractProvisioningTest {
 			getEventBus().removeListener(referenceCollector);
 		}
 		assertEquals("1.0", 4, references.size());
-		assertTrue("1.1", references.contains(new URI("http://download.eclipse.org/url/with/spaces/a%20b")));
+		assertTrue("1.1", references.contains(new URI("https://download.eclipse.org/url/with/spaces/a%20b")));
 		assertTrue("1.2", references.contains(new URI("file:/c:/tmp/url%20with%20spaces/")));
-		assertTrue("1.3", references.contains(new URI("http://download.eclipse.org/uri/with/spaces/a%20b")));
+		assertTrue("1.3", references.contains(new URI("https://download.eclipse.org/uri/with/spaces/a%20b")));
 		assertTrue("1.4", references.contains(new URI("file:/c:/tmp/uri%20with%20spaces/")));
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/ResumeDownloadTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/ResumeDownloadTest.java
index 7c8dc873c..10ac9590f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/ResumeDownloadTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/ResumeDownloadTest.java
@@ -19,7 +19,7 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 
 public class ResumeDownloadTest extends AbstractProvisioningTest {
-	private static String UPDATE_SITE = "http://download.eclipse.org/eclipse/updates/3.4";
+	private static String UPDATE_SITE = "https://download.eclipse.org/eclipse/updates/4.21";
 	private IMetadataRepositoryManager mgr;
 	private URI repoLoc;
 	private String originalResumeProp;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug309717.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug309717.java
index 5e3dad312..faedba0c8 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug309717.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug309717.java
@@ -32,7 +32,8 @@ public class Bug309717 extends AbstractProvisioningTest {
 	public void testUpdate() throws ProvisionException, OperationCanceledException, URISyntaxException {
 		IProvisioningAgent agent = getAgentProvider().createAgent(getTestData("test data bug309717", "testData/bug309717/p2").toURI());
 
-		IMetadataRepository repo1 = agent.getService(IMetadataRepositoryManager.class).loadRepository(new URI("http://download.eclipse.org/releases/helios"), null);
+		IMetadataRepository repo1 = agent.getService(IMetadataRepositoryManager.class)
+				.loadRepository(new URI("https://download.eclipse.org/releases/2021-09"), null);
 		// assertFalse(repo1.query(QueryUtil.createIUQuery("org.eclipse.rap.jface.databinding"), new NullProgressMonitor()).isEmpty());
 		assertNotNull(repo1);
 
@@ -42,21 +43,13 @@ public class Bug309717 extends AbstractProvisioningTest {
 		URI jdojo = getTestData("repo for bug309717", "testData/bug309717/repo/jdojo").toURI();
 		IMetadataRepository repo3 = agent.getService(IMetadataRepositoryManager.class).loadRepository(jdojo, null);
 		assertNotNull(repo3);
-		IMetadataRepository repo4 = agent.getService(IMetadataRepositoryManager.class).loadRepository(new URI("http://download.eclipse.org/eclipse/updates/3.6"), null);
+		IMetadataRepository repo4 = agent.getService(IMetadataRepositoryManager.class)
+				.loadRepository(new URI("https://download.eclipse.org/eclipse/updates/4.21"), null);
 		// assertFalse(repo1.query(QueryUtil.createIUQuery("org.eclipse.rap.jface.databinding"), new NullProgressMonitor()).isEmpty());
 		assertNotNull(repo4);
 		IPlanner planner = getPlanner(agent);
 		IProfile profile = agent.getService(IProfileRegistry.class).getProfile("PlatformProfile");
 		IProfileChangeRequest request = planner.createChangeRequest(profile);
 		assertNotNull(request);
-		//		Set<IInstallableUnit> ius = repo2.query(QueryUtil.createIUQuery("org.eclipse.riena.toolbox.feature.feature.group", Version.create("2.0.0.201003181312")), new NullProgressMonitor()).toUnmodifiableSet();
-		//		request.addAll(ius);
-		//		ProvisioningContext ctx = new ProvisioningContext(getAgent());
-		//		ctx.setMetadataRepositories(new URI[] {new URI("http://download.eclipse.org/releases/helios"), rienaRepo});
-		//		IProvisioningPlan plan = planner.getProvisioningPlan(request, ctx, new NullProgressMonitor());
-		//
-		//		assertOK("resolution failed", plan.getStatus());
-		//		assertEquals(0, plan.getAdditions().query(QueryUtil.createIUQuery("org.eclipse.rap.jface.databinding"), new NullProgressMonitor()).toUnmodifiableSet().size());
-		//		System.out.println(plan);
 	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java
index 0e3a5fe7b..08701b299 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/TychoUsage.java
@@ -1,15 +1,28 @@
 package org.eclipse.equinox.p2.tests.planner;
 
 import java.net.URISyntaxException;
-import java.util.*;
-import org.eclipse.core.runtime.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.equinox.internal.p2.director.Projector;
 import org.eclipse.equinox.internal.p2.director.Slicer;
 import org.eclipse.equinox.p2.core.ProvisionException;
 import org.eclipse.equinox.p2.engine.IProfile;
-import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IProvidedCapability;
+import org.eclipse.equinox.p2.metadata.IRequirement;
+import org.eclipse.equinox.p2.metadata.MetadataFactory;
+import org.eclipse.equinox.p2.metadata.Version;
+import org.eclipse.equinox.p2.metadata.VersionRange;
 import org.eclipse.equinox.p2.planner.IProfileChangeRequest;
-import org.eclipse.equinox.p2.query.*;
+import org.eclipse.equinox.p2.query.Collector;
+import org.eclipse.equinox.p2.query.IQueryable;
+import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 
@@ -20,7 +33,9 @@ public class TychoUsage extends AbstractProvisioningTest {
 
 	private void setupTopLevelIU() {
 		IRequirement[] reqPlatform1 = new IRequirement[1];
-		reqPlatform1[0] = MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.emf.sdk.feature.group", new VersionRange("[2.7.2.v20120130-0943, 2.7.2.v20120130-0943]"), null, false, false, true);
+		reqPlatform1[0] = MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID,
+				"org.eclipse.emf.sdk.feature.group", new VersionRange("[2.27.0.v20210816-1137, 2.27.0.v20210816-1137]"),
+				null, false, false, true);
 		Map<String, String> p = new HashMap<>();
 		topLevelIU = createIU("topLevelIU", Version.create("1.0.0"), null, reqPlatform1, new IProvidedCapability[0], p, null, null, true);
 	}
@@ -32,7 +47,7 @@ public class TychoUsage extends AbstractProvisioningTest {
 	}
 
 	public void testEquivalentP2Call() throws ProvisionException, URISyntaxException {
-		loadMetadataRepository(URIUtil.fromString("http://download.eclipse.org/releases/indigo"));
+		loadMetadataRepository(URIUtil.fromString("https://download.eclipse.org/releases/2021-09"));
 		profile = createProfile("TestProfile." + getName());
 		IProfileChangeRequest pcr = getPlanner(getAgent()).createChangeRequest(profile);
 		pcr.add(topLevelIU);
@@ -42,8 +57,11 @@ public class TychoUsage extends AbstractProvisioningTest {
 	}
 
 	public void testTychoUsage() throws ProvisionException, URISyntaxException {
-		IMetadataRepository repo = loadMetadataRepository(URIUtil.fromString("http://download.eclipse.org/releases/indigo"));
-		IInstallableUnit newRoot1 = repo.query(QueryUtil.createIUQuery("org.eclipse.emf.sdk.feature.group", Version.create("2.7.2.v20120130-0943")), new NullProgressMonitor()).iterator().next();
+		IMetadataRepository repo = loadMetadataRepository(
+				URIUtil.fromString("https://download.eclipse.org/releases/2021-09"));
+		IInstallableUnit newRoot1 = repo.query(
+				QueryUtil.createIUQuery("org.eclipse.emf.sdk.feature.group", Version.create("2.27.0.v20210816-1137")),
+				new NullProgressMonitor()).iterator().next();
 		Collection<IInstallableUnit> newRoots = new ArrayList<>();
 		newRoots.add(newRoot1);
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java
index 2f070abf5..e0fb19b41 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java
@@ -394,7 +394,7 @@ public class PerformanceTest extends AbstractProvisioningTest {
 		IInstallableUnit envIU = InstallableUnit.contextIU(env);
 
 		CompositeMetadataRepository compositeMetadataRepository = CompositeMetadataRepository.createMemoryComposite(getMetadataRepositoryManager().getAgent());
-		compositeMetadataRepository.addChild(new URI("http://download.eclipse.org/releases/galileo"));
+		compositeMetadataRepository.addChild(new URI("https://download.eclipse.org/releases/galileo"));
 		IMetadataRepository repo = compositeMetadataRepository;
 		IQueryResult<IInstallableUnit> r = repo.query(QueryUtil.createIUQuery("org.eclipse.sdk.ide"), new NullProgressMonitor());
 		IInstallableUnit[] roots = r.toArray(IInstallableUnit.class);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileReaderTest2.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileReaderTest2.java
index ea51e6291..a07f73ad8 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileReaderTest2.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileReaderTest2.java
@@ -201,7 +201,7 @@ public class FileReaderTest2 extends AbstractProvisioningTest {
 	}
 
 	private void doFileReaderTest(final PauseJob pauseJob, IProgressMonitor monitor) throws IOException, CoreException {
-		final String testRemoteFileURL = "http://download.eclipse.org/releases/photon/201806271001/content.jar";
+		final String testRemoteFileURL = "https://download.eclipse.org/releases/2021-09/202109151000/content.jar";
 		File tmpFolder = getTempFolder();
 		File tmpFile = new File(tmpFolder, "testDownloadPauseResume.zip");
 		File tmpFile1 = new File(tmpFolder, "testDownloadWithoutPause.zip");
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java
index c75a95bb9..05cfb29a8 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java
@@ -16,20 +16,31 @@ package org.eclipse.equinox.p2.tests.updatesite;
 import java.io.File;
 import java.io.PrintStream;
 import java.net.URI;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.equinox.internal.p2.updatesite.SiteXMLAction;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.IProvidedCapability;
-import org.eclipse.equinox.p2.publisher.*;
+import org.eclipse.equinox.p2.publisher.IPublisherAction;
+import org.eclipse.equinox.p2.publisher.IPublisherResult;
+import org.eclipse.equinox.p2.publisher.PublisherInfo;
+import org.eclipse.equinox.p2.publisher.PublisherResult;
 import org.eclipse.equinox.p2.publisher.actions.MergeResultsAction;
 import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.p2.publisher.eclipse.FeaturesAction;
-import org.eclipse.equinox.p2.query.*;
+import org.eclipse.equinox.p2.query.IQuery;
+import org.eclipse.equinox.p2.query.IQueryResult;
+import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.p2.repository.IRepository;
 import org.eclipse.equinox.p2.repository.IRepositoryReference;
-import org.eclipse.equinox.p2.tests.*;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.tests.StringBufferStream;
+import org.eclipse.equinox.p2.tests.TestData;
+import org.eclipse.equinox.p2.tests.TestMetadataRepository;
 
 /**
  * Tests for {@link org.eclipse.equinox.internal.p2.updatesite.SiteXMLAction}.
@@ -88,7 +99,7 @@ public class SiteXMLActionTest extends AbstractProvisioningTest {
 		assertEquals("1.0", 2, references.size());
 		boolean metadataFound = false, artifactFound = false;
 		for (IRepositoryReference ref : references) {
-			assertEquals("1.1", "http://download.eclipse.org/eclipse/updates/3.5", ref.getLocation().toString());
+			assertEquals("1.1", "https://download.eclipse.org/eclipse/updates/4.21", ref.getLocation().toString());
 			assertEquals("1.2", IRepository.ENABLED, ref.getOptions());
 			assertEquals("1.3", "Eclipse Project Update Site", ref.getNickname());
 
@@ -103,7 +114,8 @@ public class SiteXMLActionTest extends AbstractProvisioningTest {
 
 	public void testMirrorsURL() {
 		String mirrorsURL = metadataRepository.getProperties().get(IRepository.PROP_MIRRORS_URL);
-		assertEquals("1.0", "http://www.eclipse.org/downloads/download.php?file=/eclipse/updates/3.4&format=xml", mirrorsURL);
+		assertEquals("1.0", "https://www.eclipse.org/downloads/download.php?file=/eclipse/updates/4.21&format=xml",
+				mirrorsURL);
 	}
 
 	public void testBundleInCategory() {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
index 1635e8a59..67dde3c36 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
@@ -711,8 +711,8 @@ public class UpdateSiteTest extends AbstractProvisioningTest {
 	public void _testFeatureSiteReferences() throws ProvisionException, URISyntaxException {
 		File site = getTestData("0.1", "/testData/updatesite/siteFeatureReferences");
 		URI siteURI = site.toURI();
-		URI testUpdateSite = new URI("http://download.eclipse.org/test/updatesite/");
-		URI testDiscoverySite = new URI("http://download.eclipse.org/test/discoverysite");
+		URI testUpdateSite = new URI("https://download.eclipse.org/test/updatesite/");
+		URI testDiscoverySite = new URI("https://download.eclipse.org/test/discoverysite");
 
 		IMetadataRepositoryManager manager = getAgent().getService(IMetadataRepositoryManager.class);
 		assertNotNull(manager);
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/metadataRepo/unencodedreporeferences/content.xml b/bundles/org.eclipse.equinox.p2.tests/testData/metadataRepo/unencodedreporeferences/content.xml
index 3d6cd6174..814936f0c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/metadataRepo/unencodedreporeferences/content.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/metadataRepo/unencodedreporeferences/content.xml
@@ -2,9 +2,9 @@
 <?metadataRepository class='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'?>
 <repository name='update site: file:/C:/1target/provmiddle/org.eclipse.equinox.p2.tests/testData/updatesite/site' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
   <references size='4'>
-    <repository url='http://download.eclipse.org/url/with/spaces/a b' type='0' options='0'/>
+    <repository url='https://download.eclipse.org/url/with/spaces/a b' type='0' options='0'/>
     <repository url='file:/c:/tmp/url with spaces/' type='1' options='0'/>
-    <repository uri='http://download.eclipse.org/uri/with/spaces/a%20b' type='0' options='0'/>
+    <repository uri='https://download.eclipse.org/uri/with/spaces/a%20b' type='0' options='0'/>
     <repository uri='file:/c:/tmp/uri%20with%20spaces/' type='1' options='0'/>
   </references>
   <properties size='3'>
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/updatesite/SiteXMLActionTest/associateSites.xml b/bundles/org.eclipse.equinox.p2.tests/testData/updatesite/SiteXMLActionTest/associateSites.xml
index 1238ec316..fb00b10b3 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/updatesite/SiteXMLActionTest/associateSites.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/updatesite/SiteXMLActionTest/associateSites.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <associateSites>
-<associateSite url="http://download.eclipse.org/eclipse/updates/3.5" label="Eclipse Project Update Site"/>
+<associateSite url="https://download.eclipse.org/eclipse/updates/4.21" label="Eclipse Project Update Site"/>
 <associateSite url="This is a bogus URI" label="broken"/>
 </associateSites>
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/updatesite/SiteXMLActionTest/site.xml b/bundles/org.eclipse.equinox.p2.tests/testData/updatesite/SiteXMLActionTest/site.xml
index 3e0b2f175..63668e601 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/updatesite/SiteXMLActionTest/site.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/updatesite/SiteXMLActionTest/site.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<site associateSitesURL="associateSites.xml" mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/eclipse/updates/3.4&amp;format=xml">
+<site associateSitesURL="associateSites.xml" mirrorsURL="https://www.eclipse.org/downloads/download.php?file=/eclipse/updates/4.21&amp;format=xml">
    <feature url="features/test.feature_1.0.0.jar" id="test.feature" version="1.0.0">
      <category name="Test Category"/>
    </feature>
diff --git a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java
index b96c5afd3..31e6cffda 100644
--- a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java
@@ -45,9 +45,9 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer<Http
 	private AlwaysFailContext alwaysFail;
 	private FlipFlopFailContext flipFlop;
 
-	private static final String SITE = "http://download.eclipse.org/eclipse/updates/3.4"; //$NON-NLS-1$
-	private static final String SITE2 = "http://www.eclipse.org/equinox/p2/testing/updateSite"; //$NON-NLS-1$
-	private static final String SITE3 = "http://download.eclipse.org/eclipse/updates/3.5-I-builds/"; //$NON-NLS-1$
+	private static final String SITE = "https://download.eclipse.org/eclipse/updates/3.4"; //$NON-NLS-1$
+	private static final String SITE2 = "https://www.eclipse.org/equinox/p2/testing/updateSite"; //$NON-NLS-1$
+	private static final String SITE3 = "https://download.eclipse.org/eclipse/updates/3.5-I-builds/"; //$NON-NLS-1$
 
 	@Override
 	public void start(BundleContext aContext) throws Exception {