From bd439d8634c41d326276a2f23b64f7b14cab60af Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 09:06:35 +0200 Subject: [PATCH 1/3] Build standalone without the shared parent POM The repository inherited from tools.mdsd:eclipse-parent-updatesite, which merged a target platform pinned to Eclipse 2023-03 into every build through tycho-tp-refresh-maven-plugin. That made the Eclipse baseline impossible to raise without releasing the parent and the shared target platform first, and it collided with newer releases: the merged base and the repository's own target contributed two different versions of org.eclipse.emf.mwe2.launcher. The root POM now carries the build configuration itself (Tycho 4.0.13), and the target definition declares the Eclipse 2024-06 base it needs instead of inheriting one. tycho-tp-refresh-maven-plugin is gone, including from .mvn/extensions.xml. --- .mvn/extensions.xml | 7 +- pom.xml | 125 ++++++++++++++++-- .../tp.target | 13 +- 3 files changed, 128 insertions(+), 17 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 1feaecb..3b91197 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,11 +3,6 @@ org.eclipse.tycho tycho-build - 2.7.5 - - - org.palladiosimulator - tycho-tp-refresh-maven-plugin - 0.2.6 + 4.0.13 diff --git a/pom.xml b/pom.xml index f087771..ca56eeb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,133 @@ - + 4.0.0 - - tools.mdsd - eclipse-parent-updatesite - 0.8.12 - tools.mdsd.library.emfeditutils - parent + parent 1.0.0 pom + ${project.artifactId} + Utilities for EMF.Edit item property descriptors. + http://mdsd.tools + - ${project.basedir}/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target + 4.0.13 + 21 + ${java.version} + ${java.version} + UTF-8 + ${project.build.sourceEncoding} + releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + ${maven.multiModuleProjectDirectory}/${targetPlatform.relativePath} + + + + linux + gtk + x86_64 + + + linux + gtk + aarch64 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86_64 + + + macosx + cocoa + aarch64 + + + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + plugin-source + + plugin-source + + + + feature-source + + feature-source + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + + attached-p2-metadata + package + + p2-metadata + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.2.0 + + true + + + ${project.basedir} + + target/** + xtend-gen/** + + + */.gitkeep + + + + + + + + bundles features releng - + diff --git a/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target b/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target index 924b34e..456691a 100644 --- a/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target +++ b/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target @@ -1,8 +1,17 @@ - + + - + + + + + + + From 22f5c778a7c3abfdba85136e4bcd2cf466fd899d Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 09:06:35 +0200 Subject: [PATCH 2/3] Raise the execution environment to Java 21 Bundle-RequiredExecutionEnvironment, the JDT compliance settings and the EMF genmodel compliance level are raised together. The genmodel matters: the generator workflow rewrites the manifests of generated bundles on every build, so a stale complianceLevel silently puts the old execution environment back. --- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/tools.mdsd.library.emfeditutils/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.emfeditutils/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.emfeditutils/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.emfeditutils/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF index 4595592..82da797 100644 --- a/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: EMF Edit Utils Bundle-SymbolicName: tools.mdsd.library.emfeditutils Bundle-Version: 1.0.0 Automatic-Module-Name: tools.mdsd.library.emfeditutils -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.emf.edit Export-Package: tools.mdsd.library.emfeditutils.itempropertydescriptor From 1c73ff7d1460703526d8e653d46fdaeaab36bb18 Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 10:57:49 +0200 Subject: [PATCH 3/3] Prepare the 1.1.0 release The version is raised in the POMs, the features, the bundle manifests and the update site category. The build workflow moves to Java 21 and, for now, to the FixTagCreationLogic branch of the pipeline. The target definition resolves the other mdsd.tools repositories from their 1.1.0 release sites again rather than from the nightly ones. --- .github/workflows/main.yml | 6 +++--- .../tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF | 2 +- .../tools.mdsd.library.emfeditutils.feature/feature.xml | 4 ++-- pom.xml | 2 +- .../tp.target | 2 +- .../tools.mdsd.library.emfeditutils.updatesite/category.xml | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b46e904..fc02a3f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,14 +4,14 @@ on: [push, pull_request, workflow_dispatch] jobs: Library-EMFEditUtils: - uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@master + uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@FixTagCreationLogic with: use-display-output: true no-caching: true - java-version: 17 + java-version: 21 runner-label: ubuntu-latest deploy-updatesite: 'releng/tools.mdsd.library.emfeditutils.updatesite/target/repository' - release-version: '1.0.0' + release-version: '1.1.0' secrets: SERVER_SSH_KEY: ${{ secrets.DEPLOYMENT_SERVER_SSH_KEY }} REMOTE_HOST: ${{ secrets.DEPLOYMENT_REMOTE_HOST }} diff --git a/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF index 82da797..7b46c9b 100644 --- a/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.emfeditutils/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EMF Edit Utils Bundle-SymbolicName: tools.mdsd.library.emfeditutils -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Automatic-Module-Name: tools.mdsd.library.emfeditutils Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.emf.edit diff --git a/features/tools.mdsd.library.emfeditutils.feature/feature.xml b/features/tools.mdsd.library.emfeditutils.feature/feature.xml index 1df1000..9e08c53 100644 --- a/features/tools.mdsd.library.emfeditutils.feature/feature.xml +++ b/features/tools.mdsd.library.emfeditutils.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> Tools that ease implementing providers and other framework utils for EMF edit plugins. diff --git a/pom.xml b/pom.xml index ca56eeb..3e14d5c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 tools.mdsd.library.emfeditutils parent - 1.0.0 + 1.1.0 pom ${project.artifactId} diff --git a/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target b/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target index 456691a..66c71be 100644 --- a/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target +++ b/releng/tools.mdsd.library.emfeditutils.targetplatform/tp.target @@ -11,7 +11,7 @@ - + diff --git a/releng/tools.mdsd.library.emfeditutils.updatesite/category.xml b/releng/tools.mdsd.library.emfeditutils.updatesite/category.xml index e3534f9..f379732 100644 --- a/releng/tools.mdsd.library.emfeditutils.updatesite/category.xml +++ b/releng/tools.mdsd.library.emfeditutils.updatesite/category.xml @@ -1,9 +1,9 @@ - + - +