From dc8771a8e85270f730cba4da8a3b5a8d9966f775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Mon, 18 Mar 2024 06:50:41 +0100 Subject: [PATCH 1/2] Update latest release to 2024-03 Adjust test for bumped o.e.osgi minor version (cherry picked from commit 8ceab84f83d6f070530ec0821d1489b2ffe4a421) --- tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java | 2 +- .../bundle02/Eclipse35Test.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java b/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java index 2a1a5c793f..9b85b76be2 100644 --- a/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java +++ b/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java @@ -18,7 +18,7 @@ public interface TychoConstants { - public static final String ECLIPSE_LATEST = "https://download.eclipse.org/releases/2023-12/"; + public static final String ECLIPSE_LATEST = "https://download.eclipse.org/releases/2024-03/"; public static final String TYCHO_NOT_CONFIGURED = "Tycho build extension not configured for "; diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/src/TYCHO0367localRepositoryCrosstalk/bundle02/Eclipse35Test.java b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/src/TYCHO0367localRepositoryCrosstalk/bundle02/Eclipse35Test.java index 6cf486b159..02bbbbd66f 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/src/TYCHO0367localRepositoryCrosstalk/bundle02/Eclipse35Test.java +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/src/TYCHO0367localRepositoryCrosstalk/bundle02/Eclipse35Test.java @@ -25,7 +25,7 @@ public void test() throws Exception { Bundle equinox = getBundle("org.eclipse.osgi"); assertEquals(3, equinox.getVersion().getMajor()); - assertEquals(18, equinox.getVersion().getMinor()); + assertEquals(19, equinox.getVersion().getMinor()); } public Bundle getBundle(String id) { From 66cff832d2a55bd5e2529cc4a4ca71409089bb7f 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: Mon, 25 Mar 2024 08:34:28 +0200 Subject: [PATCH 2/2] Check that the 34 test is seeing an older version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Exact version check complicates things as it has to be updated for every minor bump of equinox. Co-authored-by: Christoph Läubrich --- .../bundle02/Eclipse35Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/src/TYCHO0367localRepositoryCrosstalk/bundle02/Eclipse35Test.java b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/src/TYCHO0367localRepositoryCrosstalk/bundle02/Eclipse35Test.java index 02bbbbd66f..d24251faf1 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/src/TYCHO0367localRepositoryCrosstalk/bundle02/Eclipse35Test.java +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/src/TYCHO0367localRepositoryCrosstalk/bundle02/Eclipse35Test.java @@ -25,7 +25,7 @@ public void test() throws Exception { Bundle equinox = getBundle("org.eclipse.osgi"); assertEquals(3, equinox.getVersion().getMajor()); - assertEquals(19, equinox.getVersion().getMinor()); + assertTrue(equinox.getVersion().getMinor() > 13); } public Bundle getBundle(String id) {