From 3e0230acfbf4f5e1d8fdd610c754929cf87c0235 Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 09:06:37 +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 | 133 +++++++++++++++++- ...ols.mdsd.junit5utils.targetplatform.target | 23 ++- 3 files changed, 147 insertions(+), 16 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 2350ea9..e6ce298 100644 --- a/pom.xml +++ b/pom.xml @@ -3,20 +3,139 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - tools.mdsd - eclipse-parent-updatesite - 0.8.12 - tools.mdsd.library-junit5utils - parent + parent 1.0.0 pom + ${project.artifactId} + JUnit 5 extensions for standalone EMF tests. + http://mdsd.tools + - ${project.basedir}/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target + 4.0.13 + 21 + ${java.version} + ${java.version} + UTF-8 + ${project.build.sourceEncoding} + releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.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 + + + + + + + + bundles features diff --git a/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target b/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target index 234d19c..d829810 100644 --- a/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target +++ b/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target @@ -1,13 +1,30 @@ - + + + + + + + + + + + + + + + + - + - + From 3d8105fd4abd504a67b4ac5bf7499b5cfb6160d1 Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 09:06:37 +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 +++--- bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bundles/tools.mdsd.junit5utils/.settings/org.eclipse.jdt.core.prefs b/bundles/tools.mdsd.junit5utils/.settings/org.eclipse.jdt.core.prefs index c9545f0..23fa13b 100644 --- a/bundles/tools.mdsd.junit5utils/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/tools.mdsd.junit5utils/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +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=11 +org.eclipse.jdt.core.compiler.source=21 diff --git a/bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF b/bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF index a0f123b..4d3c359 100644 --- a/bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Automatic-Module-Name: tools.mdsd.junit5utils -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: tools.mdsd.library.standalone.initialization, com.google.guava;bundle-version="27.1.0" Bundle-ActivationPolicy: lazy diff --git a/tests/tools.mdsd.junit5utils.test/.settings/org.eclipse.jdt.core.prefs b/tests/tools.mdsd.junit5utils.test/.settings/org.eclipse.jdt.core.prefs index c9545f0..23fa13b 100644 --- a/tests/tools.mdsd.junit5utils.test/.settings/org.eclipse.jdt.core.prefs +++ b/tests/tools.mdsd.junit5utils.test/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +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=11 +org.eclipse.jdt.core.compiler.source=21 diff --git a/tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF b/tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF index 197db8d..b81c192 100644 --- a/tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF +++ b/tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: tools.mdsd.junit5utils.test Bundle-Version: 1.0.0 Fragment-Host: tools.mdsd.junit5utils;bundle-version="1.0.0" Automatic-Module-Name: tools.mdsd.junit5utils.test -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.junit;version="4.13.0", org.junit.jupiter.api;version="5.4.2" Bundle-Vendor: tools.mdsd From 90d75370ff322bc84f370837106c1eba80fb022c 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/main.yml | 6 +++--- bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF | 2 +- features/tools.mdsd.junit5utils.feature/feature.xml | 4 ++-- pom.xml | 2 +- .../tools.mdsd.junit5utils.targetplatform.target | 4 ++-- releng/tools.mdsd.junit5utils.updatesite/category.xml | 4 ++-- tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF | 2 +- tests/tools.mdsd.junit5utils.test/pom.xml | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02b6781..1ac5733 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,13 +4,13 @@ on: [push, pull_request, workflow_dispatch] jobs: Library-JUnit5Utils: - 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 - java-version: 17 + java-version: 21 runner-label: ubuntu-latest deploy-updatesite: 'releng/tools.mdsd.junit5utils.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.junit5utils/META-INF/MANIFEST.MF b/bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF index 4d3c359..690d6cb 100644 --- a/bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF +++ b/bundles/tools.mdsd.junit5utils/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: tools.mdsd.junit5utils;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/features/tools.mdsd.junit5utils.feature/feature.xml b/features/tools.mdsd.junit5utils.feature/feature.xml index 4135e68..c9c4b6d 100644 --- a/features/tools.mdsd.junit5utils.feature/feature.xml +++ b/features/tools.mdsd.junit5utils.feature/feature.xml @@ -2,9 +2,9 @@ + license-feature-version="1.1.0"> diff --git a/pom.xml b/pom.xml index e6ce298..4149ad0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 tools.mdsd.library-junit5utils parent - 1.0.0 + 1.1.0 pom ${project.artifactId} diff --git a/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target b/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target index d829810..0e83b8c 100644 --- a/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target +++ b/releng/tools.mdsd.junit5utils.targetplatform/tools.mdsd.junit5utils.targetplatform.target @@ -20,11 +20,11 @@ - + - + diff --git a/releng/tools.mdsd.junit5utils.updatesite/category.xml b/releng/tools.mdsd.junit5utils.updatesite/category.xml index 755bcf6..d7a6212 100644 --- a/releng/tools.mdsd.junit5utils.updatesite/category.xml +++ b/releng/tools.mdsd.junit5utils.updatesite/category.xml @@ -1,9 +1,9 @@ - + - + diff --git a/tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF b/tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF index b81c192..b7900fc 100644 --- a/tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF +++ b/tests/tools.mdsd.junit5utils.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EclipsePlugin Test Bundle-SymbolicName: tools.mdsd.junit5utils.test -Bundle-Version: 1.0.0 +Bundle-Version: 1.1.0 Fragment-Host: tools.mdsd.junit5utils;bundle-version="1.0.0" Automatic-Module-Name: tools.mdsd.junit5utils.test Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/tests/tools.mdsd.junit5utils.test/pom.xml b/tests/tools.mdsd.junit5utils.test/pom.xml index 8344527..50579e5 100644 --- a/tests/tools.mdsd.junit5utils.test/pom.xml +++ b/tests/tools.mdsd.junit5utils.test/pom.xml @@ -5,11 +5,11 @@ tools.mdsd.library-junit5utils tests - 1.0.0 + 1.1.0 ..\.polyglot.pom.tycho tools.mdsd.junit5utils.test - 1.0.0 + 1.1.0 eclipse-test-plugin