From 67095af58311502d1f7c2a85da62f7eb3ec9bb23 Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 09:06:36 +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 | 129 ++++++++++++++++-- ...alone.initialization.targetplatform.target | 16 ++- 3 files changed, 132 insertions(+), 20 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 3af1102..e261136 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,133 @@ - + 4.0.0 - - tools.mdsd - eclipse-parent-updatesite - 0.8.12 - tools.mdsd.standalone.initializer - parent + parent 1.0.0 pom - + + ${project.artifactId} + Helpers for initializing EMF-based applications outside of an OSGi runtime. + http://mdsd.tools + - ${project.basedir}/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target + 4.0.13 + 21 + ${java.version} + ${java.version} + UTF-8 + ${project.build.sourceEncoding} + releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.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.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target b/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target index b2a0c3e..039bbec 100644 --- a/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target +++ b/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target @@ -1,8 +1,19 @@ - + + - + + + + + + + + + @@ -11,4 +22,3 @@ - From c2c1c50fb03f10d269a1a29df8ceb2c48aa868e4 Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 09:06:36 +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 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/.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.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF index c07568e..ac20b95 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Standalone Initialization EMFProfiles Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.emfprofiles Bundle-Version: 1.0.0 Automatic-Module-Name: tools.mdsd.library.standalone.initialization.emfprofiles -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: tools.mdsd.library.standalone.initialization, org.modelversioning.emfprofile.registry;bundle-version="1.0.0" Export-Package: tools.mdsd.library.standalone.initialization.emfprofiles diff --git a/bundles/tools.mdsd.library.standalone.initialization.log4j/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.standalone.initialization.log4j/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.log4j/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.standalone.initialization.log4j/.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.standalone.initialization.log4j/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF index 6cedf0b..4bc531c 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.log4j Bundle-Version: 1.0.0 Require-Bundle: org.eclipse.core.runtime, tools.mdsd.library.standalone.initialization -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: tools.mdsd.library.standalone.initialization.log4j Import-Package: org.apache.log4j;version="1.2.15" Export-Package: tools.mdsd.library.standalone.initialization.log4j diff --git a/bundles/tools.mdsd.library.standalone.initialization.ocl/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.standalone.initialization.ocl/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.ocl/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.standalone.initialization.ocl/.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.standalone.initialization.ocl/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF index d2ca081..48a93e5 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: Ecore OCL Standalone Initializer Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.ocl Bundle-Version: 1.0.0 Automatic-Module-Name: tools.mdsd.library.standalone.initialization.ocl -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.ocl.ecore;bundle-version="3.15.0", tools.mdsd.library.standalone.initialization diff --git a/bundles/tools.mdsd.library.standalone.initialization/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.library.standalone.initialization/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/bundles/tools.mdsd.library.standalone.initialization/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.library.standalone.initialization/.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.standalone.initialization/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF index 7a66ae9..0c105b7 100644 --- a/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: tools.mdsd.library.standalone.initialization Bundle-Version: 1.0.0 Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: tools.mdsd.library.standalone.initialization Export-Package: tools.mdsd.library.standalone.initialization, tools.mdsd.library.standalone.initialization.core From 1a8a43be18640bcbbc4523799e82ca7cc8889d17 Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 10:57:50 +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/build.yml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../feature.xml | 6 +++--- .../feature.xml | 8 ++++---- .../feature.xml | 8 ++++---- .../feature.xml | 8 ++++---- pom.xml | 2 +- ...andalone.initialization.targetplatform.target | 2 +- .../category.xml | 16 ++++++++-------- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1560bef..c0957d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,13 +4,13 @@ on: [push, pull_request, workflow_dispatch] jobs: Library-StandaloneInitialization: - 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 runner-label: ubuntu-latest - java-version: 17 + java-version: 21 deploy-updatesite: 'releng/tools.mdsd.library.standalone.initialization.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.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF index ac20b95..d724ab2 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.emfprofiles/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Standalone Initialization EMFProfiles Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.emfprofiles -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Automatic-Module-Name: tools.mdsd.library.standalone.initialization.emfprofiles Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: tools.mdsd.library.standalone.initialization, diff --git a/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF index 4bc531c..6006223 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.log4j/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Standalone Initialization Log4j Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.log4j -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Require-Bundle: org.eclipse.core.runtime, tools.mdsd.library.standalone.initialization Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF index 48a93e5..314e846 100644 --- a/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization.ocl/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ecore OCL Standalone Initializer Bundle-SymbolicName: tools.mdsd.library.standalone.initialization.ocl -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Automatic-Module-Name: tools.mdsd.library.standalone.initialization.ocl Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.ocl.ecore;bundle-version="3.15.0", diff --git a/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF b/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF index 0c105b7..2d1f607 100644 --- a/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.library.standalone.initialization/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Standalone Initialization Bundle-SymbolicName: tools.mdsd.library.standalone.initialization -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/features/tools.mdsd.library.standalone.initialization.core.feature/feature.xml b/features/tools.mdsd.library.standalone.initialization.core.feature/feature.xml index 0b71b5e..6be06c7 100644 --- a/features/tools.mdsd.library.standalone.initialization.core.feature/feature.xml +++ b/features/tools.mdsd.library.standalone.initialization.core.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> @@ -14,7 +14,7 @@ id="tools.mdsd.library.standalone.initialization" download-size="0" install-size="0" - version="1.0.0" + version="1.1.0" unpack="false"/> diff --git a/features/tools.mdsd.library.standalone.initialization.emfprofiles.feature/feature.xml b/features/tools.mdsd.library.standalone.initialization.emfprofiles.feature/feature.xml index 16680ba..0ee6bfe 100644 --- a/features/tools.mdsd.library.standalone.initialization.emfprofiles.feature/feature.xml +++ b/features/tools.mdsd.library.standalone.initialization.emfprofiles.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> @@ -13,13 +13,13 @@ + version="1.1.0"/> diff --git a/features/tools.mdsd.library.standalone.initialization.log4j.feature/feature.xml b/features/tools.mdsd.library.standalone.initialization.log4j.feature/feature.xml index b855e60..c161cc2 100644 --- a/features/tools.mdsd.library.standalone.initialization.log4j.feature/feature.xml +++ b/features/tools.mdsd.library.standalone.initialization.log4j.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> @@ -12,13 +12,13 @@ + version="1.1.0"/> diff --git a/features/tools.mdsd.library.standalone.initialization.ocl.feature/feature.xml b/features/tools.mdsd.library.standalone.initialization.ocl.feature/feature.xml index aad84e4..d308972 100644 --- a/features/tools.mdsd.library.standalone.initialization.ocl.feature/feature.xml +++ b/features/tools.mdsd.library.standalone.initialization.ocl.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> @@ -12,13 +12,13 @@ + version="1.1.0"/> diff --git a/pom.xml b/pom.xml index e261136..d3876ce 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 tools.mdsd.standalone.initializer parent - 1.0.0 + 1.1.0 pom ${project.artifactId} diff --git a/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target b/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target index 039bbec..5f34363 100644 --- a/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target +++ b/releng/tools.mdsd.library.standalone.initialization.targetplatform/tools.mdsd.library.standalone.initialization.targetplatform.target @@ -13,7 +13,7 @@ - + diff --git a/releng/tools.mdsd.library.standalone.initialization.updatesite/category.xml b/releng/tools.mdsd.library.standalone.initialization.updatesite/category.xml index 1d5fcee..e3e8261 100644 --- a/releng/tools.mdsd.library.standalone.initialization.updatesite/category.xml +++ b/releng/tools.mdsd.library.standalone.initialization.updatesite/category.xml @@ -1,27 +1,27 @@ - + - + - + - + - + - + - + - +