From 39346da275c03f85083fb62f64810998d21cd87a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 06:41:56 +0000 Subject: [PATCH 1/6] Bump org.eclipse.platform:org.eclipse.core.runtime Bumps [org.eclipse.platform:org.eclipse.core.runtime](https://github.com/eclipse-platform/eclipse.platform) from 3.31.100 to 3.32.0. - [Commits](https://github.com/eclipse-platform/eclipse.platform/commits) --- updated-dependencies: - dependency-name: org.eclipse.platform:org.eclipse.core.runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 346fd77636..7eaef884f3 100644 --- a/pom.xml +++ b/pom.xml @@ -284,7 +284,7 @@ org.eclipse.platform org.eclipse.core.runtime - 3.31.100 + 3.32.0 org.eclipse.platform From 089fe720a4b7fce75520458e18abc085cc0a5bc0 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: Thu, 5 Dec 2024 09:21:33 +0200 Subject: [PATCH 2/6] Bump org.eclipse.equinox.common to 3.19.200 Split packages must be jarsigned with same signatures. --- tycho-apitools-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml index c1c8420b3d..d05389fdcf 100644 --- a/tycho-apitools-plugin/pom.xml +++ b/tycho-apitools-plugin/pom.xml @@ -62,7 +62,7 @@ org.eclipse.platform org.eclipse.equinox.common - 3.19.100 + 3.19.200 org.eclipse.jdt From e57f0564c67795198e4d6179dda9f14336f0a681 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: Thu, 5 Dec 2024 11:25:19 +0200 Subject: [PATCH 3/6] Do not exclude pde.api.tools deps When excluded this leads to mismatching signer problem --- tycho-apitools-plugin/pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml index d05389fdcf..69b5e7a194 100644 --- a/tycho-apitools-plugin/pom.xml +++ b/tycho-apitools-plugin/pom.xml @@ -38,14 +38,8 @@ org.eclipse.pde org.eclipse.pde.api.tools - 1.3.500 + 1.3.600 jar - - - * - * - - org.eclipse.pde From f1536679521a2c6c1bf753ff49f5673e6740d14f 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: Thu, 5 Dec 2024 11:53:08 +0200 Subject: [PATCH 4/6] Update ECLIPSE_LATEST to 2024-12 --- tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4a396fc16a..4595fac7a6 100644 --- a/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java +++ b/tycho-api/src/main/java/org/eclipse/tycho/TychoConstants.java @@ -23,7 +23,7 @@ public interface TychoConstants { File USER_MAVEN_CONFIGURATION_HOME = new File(USER_HOME, ".m2"); File DEFAULT_USER_LOCALREPOSITORY = new File(USER_MAVEN_CONFIGURATION_HOME, "repository"); - public static final String ECLIPSE_LATEST = "https://download.eclipse.org/releases/2024-09/"; + public static final String ECLIPSE_LATEST = "https://download.eclipse.org/releases/2024-12/"; public static final String TYCHO_NOT_CONFIGURED = "Tycho build extension not configured for "; From 8350b01d57ba72a0c559977f5cad90bbd8d74864 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: Thu, 5 Dec 2024 11:58:42 +0200 Subject: [PATCH 5/6] Bump jface to 3.35.100 --- tycho-its/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml index baaf54b744..59fafd3d8a 100644 --- a/tycho-its/pom.xml +++ b/tycho-its/pom.xml @@ -187,7 +187,7 @@ org.eclipse.platform org.eclipse.jface - 3.35.0 + 3.35.100 test From 7f27bc7f62afb0d7c39251eb1def194e5cc57950 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: Thu, 5 Dec 2024 13:58:47 +0200 Subject: [PATCH 6/6] Fix running tests against 2024-12 --- .../java/org/eclipse/tycho/extras/pde/TestListDependencies.java | 2 +- .../tycho/test/surefire/ExplodedTestDependenciesTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pde/TestListDependencies.java b/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pde/TestListDependencies.java index a65b1d45cf..7e50f1c5aa 100644 --- a/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pde/TestListDependencies.java +++ b/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pde/TestListDependencies.java @@ -46,7 +46,7 @@ public void testDependencyWithNestedJar() throws Exception { try (BufferedReader reader = Files.newBufferedReader(file.toPath())) { File dependency = new File(reader.readLine()); assertTrue(dependency.exists()); - assertEquals("org.junit-4.13.2.v20230809-1000.jar", dependency.getName()); + assertEquals("org.junit-4.13.2.v20240929-1000.jar", dependency.getName()); } } } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExplodedTestDependenciesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExplodedTestDependenciesTest.java index f5c69ca9cf..02196a436f 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExplodedTestDependenciesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExplodedTestDependenciesTest.java @@ -31,7 +31,7 @@ public void testLocalMavenRepository() throws Exception { // TODO this is only an indirect test; it should test that the bundles nested // jars are accessible as file URLs File antHome = new File(v01.getBasedir(), - "tycho340.test/target/work/plugins/org.apache.ant_1.10.14.v20230922-1200"); + "tycho340.test/target/work/plugins/org.apache.ant_1.10.15.v20240901-1000"); Assert.assertTrue(antHome.isDirectory()); }