From 803c067eb3fa33d72f2700f63d682acf4ed64a63 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Sat, 9 Apr 2022 09:41:19 +0300 Subject: [PATCH] Ensure latest P2 repo for tests is set the same And in only one place. Currently we had a mix of 2020-03 and 2022-03. --- .../test/java/org/eclipse/tycho/test/util/ResourceUtil.java | 2 +- .../java/org/eclipse/tycho/test/util/EnvironmentUtil.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java b/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java index f8bf69081f..a6b71d44b1 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java @@ -22,7 +22,7 @@ public class ResourceUtil { public enum P2Repositories { ECLIPSE_342("e342"), ECLIPSE_352("e352"), ECLIPSE_OXYGEN("https:////download.eclipse.org/releases/oxygen/"), - ECLIPSE_LATEST("https:////download.eclipse.org/releases/2022-03/"); + ECLIPSE_LATEST(EnvironmentUtil.ECLIPSE_LATEST); private final String path; diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java index bbd237e88a..6a24deba54 100644 --- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java +++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java @@ -26,6 +26,8 @@ */ public class EnvironmentUtil { + public static final String ECLIPSE_LATEST = "https:////download.eclipse.org/releases/2022-03/"; + private static final Properties props; static { @@ -73,7 +75,7 @@ public static boolean isMac() { } public static String getTargetPlatform() { - return "https:////download.eclipse.org/releases/2020-03/"; + return ECLIPSE_LATEST; } public static String getTestSettings() {