From 8986a7ace20d73cba27350432099d8b101e65142 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 | 11 +- pom.xml | 135 ++++++++++++++++-- .../tools.mdsd.mocore.targetplatform.target | 22 ++- 3 files changed, 150 insertions(+), 18 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 2499cd7..3b91197 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,13 +1,8 @@ - org.eclipse.tycho.extras - tycho-pomless - 2.7.5 - - - org.palladiosimulator - tycho-tp-refresh-maven-plugin - 0.2.6 + org.eclipse.tycho + tycho-build + 4.0.13 diff --git a/pom.xml b/pom.xml index 7555e46..aa4d013 100644 --- a/pom.xml +++ b/pom.xml @@ -1,24 +1,141 @@ - + 4.0.0 - - - tools.mdsd - eclipse-parent-updatesite - 0.8.9 - - tools.mdsd.mocore parent 5.1.0-SNAPSHOT pom + ${project.artifactId} + Framework for model composition and refinement. + http://mdsd.tools - ${project.basedir}/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target + 4.0.13 + 21 + ${java.version} + ${java.version} + UTF-8 + ${project.build.sourceEncoding} + releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.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.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + + **/*Test.java + **/*Tests.java + + false + + + + org.apache.maven.plugins + maven-clean-plugin + 3.2.0 + + true + + + ${project.basedir} + + target/** + xtend-gen/** + + + */.gitkeep + + + + + + + + releng bundles diff --git a/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target b/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target index 1a27818..54eac88 100644 --- a/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target +++ b/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target @@ -1,6 +1,26 @@ - + + + + + + + + + + + + + + + + + + + From 8ae58b721f65b3ddb65a88c90c7f78d51cbc8a91 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. --- bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF | 2 +- tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF b/bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF index 42a607a..6f1489d 100644 --- a/bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: tools.mdsd.mocore.framework;singleton:=true Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: tools.mdsd.mocore.framework Bundle-Vendor: mdsd.tools -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: tools.mdsd.mocore.framework.discovery, tools.mdsd.mocore.framework.orchestration, diff --git a/tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF b/tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF index dce10fc..704f314 100644 --- a/tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF +++ b/tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: tools.mdsd.mocore.framework.test;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: mdsd.tools Automatic-Module-Name: tools.mdsd.mocore.framework.test -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: tools.mdsd.mocore.framework.processor, tools.mdsd.mocore.framework.surrogate, From 0a08af7b270d020b335156f2915ccdbf2a09f3cf Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 10:57:50 +0200 Subject: [PATCH 3/3] Build with Java 21 and the FixTagCreationLogic pipeline This repository keeps its own 5.x version line and stays out of the 1.1.0 release round; only the build is aligned with the other repositories. java-version was never declared here, so it is now set explicitly. The license feature comes from its 1.1.0 release site. --- .github/workflows/build.yml | 3 ++- .../tools.mdsd.mocore.targetplatform.target | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9fc6f3..c18c8de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,10 +4,11 @@ on: [push, pull_request, workflow_dispatch] jobs: Library-ModelCompositionRefinement: - uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@v3.4 + uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@FixTagCreationLogic with: use-display-output: true runner-label: ubuntu-latest + java-version: 21 deploy-updatesite: 'releng/tools.mdsd.mocore.updatesite/target/repository' secrets: SERVER_SSH_KEY: ${{ secrets.DEPLOYMENT_SERVER_SSH_KEY }} diff --git a/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target b/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target index 54eac88..a796bb1 100644 --- a/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target +++ b/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target @@ -19,7 +19,7 @@ - +