From d7ac55b09c8af717fafd36a9edc8dc32bfe3346e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 20 Dec 2024 15:57:33 +0200 Subject: [PATCH] Stop using simrel 2021-06 in tests It's archived and frequent usage leads to broken builds with: "org.eclipse.equinox.p2.core.ProvisionException: No repository found at https://download.eclipse.org/technology/epp/packages/2021-06/202106121200." as archives are not mirrored and this leads to heavy load (and DoS) of archive.eclipse.org. --- .../projects/target.restriction.filter/META-INF/MANIFEST.MF | 2 +- tycho-its/projects/target.restriction.filter/pom.xml | 4 ++-- .../projects/target.restriction.filter/src/test/Test.java | 2 +- .../test/target/TargetPlatformFilteringIntegrationTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tycho-its/projects/target.restriction.filter/META-INF/MANIFEST.MF b/tycho-its/projects/target.restriction.filter/META-INF/MANIFEST.MF index 62adcce8fe..f199b9f735 100644 --- a/tycho-its/projects/target.restriction.filter/META-INF/MANIFEST.MF +++ b/tycho-its/projects/target.restriction.filter/META-INF/MANIFEST.MF @@ -8,4 +8,4 @@ Require-Bundle: org.eclipse.osgi, org.junit Bundle-Activator: test.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/target.restriction.filter/pom.xml b/tycho-its/projects/target.restriction.filter/pom.xml index b53eb55475..e282612e18 100644 --- a/tycho-its/projects/target.restriction.filter/pom.xml +++ b/tycho-its/projects/target.restriction.filter/pom.xml @@ -39,7 +39,7 @@ target-platform-configuration ${tycho-version} - JavaSE-11 + JavaSE-17 @@ -47,7 +47,7 @@ org.eclipse.osgi - [3.16,3.17) + [3.21,3.22) diff --git a/tycho-its/projects/target.restriction.filter/src/test/Test.java b/tycho-its/projects/target.restriction.filter/src/test/Test.java index 1d6563e8ec..dd3b3b0752 100644 --- a/tycho-its/projects/target.restriction.filter/src/test/Test.java +++ b/tycho-its/projects/target.restriction.filter/src/test/Test.java @@ -20,7 +20,7 @@ public class Test extends TestCase { public void test() { Version version = new Version((String) Activator.context.getBundle(0).getHeaders().get("Bundle-Version")); - assertTrue(version.compareTo(new Version("3.17")) < 0); + assertTrue(version.compareTo(new Version("3.22")) < 0); } } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java index 16c15c502d..38889f00f8 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java @@ -22,7 +22,7 @@ public class TargetPlatformFilteringIntegrationTest extends AbstractTychoIntegra @Test public void test() throws Exception { Verifier verifier = getVerifier("target.restriction.filter", false); - verifier.addCliOption("-De342-repo=" + "https:////download.eclipse.org/releases/2021-06/"); + verifier.addCliOption("-De342-repo=" + "https:////download.eclipse.org/releases/2024-09/"); verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_LATEST.toString().replace("/", "//")); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog();