Fix some CVE warnings in tests
Output like "!MESSAGE Using unsafe http transport to retrieve
http://eclipse.org/equinox/foobar/abcdefg, see CVE-2021-41033. Consider
using https instead." just pollutes the log. Use https:// despite the
fact it's testing non-existing content.
Change-Id: Id221aed3864b3a909f00b264573b8f1757b12609
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.p2/+/188667
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
index 004b5db..94bdec5 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
@@ -14,7 +14,9 @@
package org.eclipse.equinox.p2.tests.mirror;
import java.io.File;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
@@ -516,7 +518,7 @@
public void testMetadataMirrorToInvalid() {
URI invalidDestRepository;
try {
- invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
+ invalidDestRepository = new URI("https://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("14.1", sourceRepoLocation.toURL(), invalidDestRepository.toURL(), true);
//we expect an illegal state exception to be thrown and should never get here
fail("14.0 IllegalStateExpection not thrown");
@@ -535,7 +537,7 @@
delete(invalidRepository);
try {
- URI invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
+ URI invalidDestRepository = new URI("https://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("15.1", invalidRepository.toURL(), invalidDestRepository.toURL(), true);
//we expect a provisioning exception to be thrown and should never get here
fail("15.0 ProvisionExpection not thrown");
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
index 173bb4c..4d8c2ac 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
@@ -14,8 +14,12 @@
package org.eclipse.equinox.p2.tests.mirror;
import java.io.File;
-import java.net.*;
-import java.util.*;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
import org.eclipse.equinox.internal.simpleconfigurator.utils.URIUtil;
import org.eclipse.equinox.p2.core.ProvisionException;
@@ -551,7 +555,7 @@
public void testMetadataMirrorToInvalid() {
URI invalidDestRepository = null;
try {
- invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
+ invalidDestRepository = new URI("https://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("14.1", sourceRepoLocation.toURL(), invalidDestRepository.toURL(), true);
//we expect an illegal state exception to be thrown and should never get here
fail("14.0 IllegalStateExpection not thrown");
@@ -574,7 +578,7 @@
delete(invalidRepository);
try {
- URI invalidDestRepository = new URI("http://eclipse.org/equinox/foobar/abcdefg");
+ URI invalidDestRepository = new URI("https://eclipse.org/equinox/foobar/abcdefg");
basicRunMirrorApplication("15.1", invalidRepository.toURL(), invalidDestRepository.toURL(), true);
//we expect a provisioning exception to be thrown and should never get here
fail("15.0 ProvisionExpection not thrown");
