From fb9e19479fb1bf96a8d51b5a5a1bfce9000580fb 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 | 4 +- pom.xml | 108 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 99 insertions(+), 13 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 9e4507e..3b91197 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 2.7.5 + 4.0.13 - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 0b30ee3..ecb8ee1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,109 @@ - + 4.0.0 - - tools.mdsd - eclipse-parent-updatesite-notp - 0.8.12 - tools.mdsd.license - parent + parent 1.0.0 pom - + + ${project.artifactId} + License features shared by all MDSD.tools update sites. + http://mdsd.tools + + + 4.0.13 + UTF-8 + ${project.build.sourceEncoding} + + + + + + eclipse + p2 + https://download.eclipse.org/releases/2024-06/202406121000/ + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + 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} + + + feature-source + + feature-source + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + + attached-p2-metadata + package + + p2-metadata + + + + + + + features releng - - - + From ba2b72d40042d8de1db209813ee335ae442baa08 Mon Sep 17 00:00:00 2001 From: Nicolas Boltz Date: Tue, 11 Aug 2026 09:59:49 +0200 Subject: [PATCH 2/3] Update build workflow to use specific branch and Java version --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa2186f..175ebb8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,11 +4,11 @@ on: [push, pull_request, workflow_dispatch] jobs: Build-LicenseFeature: - 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.license.updatesite/target/repository' release-version: 1.0.0 secrets: From e9a426f1fdd3bd53ae45df34ec79f30e5fb2d07a Mon Sep 17 00:00:00 2001 From: Nicolas-Boltz Date: Tue, 11 Aug 2026 10:11:23 +0200 Subject: [PATCH 3/3] Increment version number and change codeowners --- .github/CODEOWNERS | 5 +---- .github/workflows/build.yml | 2 +- Jenkinsfile | 4 ---- features/tools.mdsd.license.apache2/feature.xml | 2 +- features/tools.mdsd.license.epl2/feature.xml | 2 +- pom.xml | 2 +- 6 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 Jenkinsfile diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d64c3e1..b9b993b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,6 +1,3 @@ # These owners will be the default owners for everything in this repertoire. # Unless a later match takes precedence, they will be requested for review when someone opens a pull request. -* @YvesKirschner - -# These owners are the default owners for all build and deployment workflows. -.github/workflows/* @Nicolas-Boltz @larissaschmid +* @Nicolas-Boltz diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 175ebb8..07b13fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runner-label: ubuntu-latest java-version: 21 deploy-updatesite: 'releng/tools.mdsd.license.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/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 2466a3b..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,4 +0,0 @@ -MDSDToolsPipeline { - deployUpdatesite 'releng/tools.mdsd.license.updatesite/target/repository' - skipQualityMetrics true -} \ No newline at end of file diff --git a/features/tools.mdsd.license.apache2/feature.xml b/features/tools.mdsd.license.apache2/feature.xml index e633ecf..543979a 100644 --- a/features/tools.mdsd.license.apache2/feature.xml +++ b/features/tools.mdsd.license.apache2/feature.xml @@ -1,7 +1,7 @@ diff --git a/features/tools.mdsd.license.epl2/feature.xml b/features/tools.mdsd.license.epl2/feature.xml index 6105d3b..bd42e4e 100644 --- a/features/tools.mdsd.license.epl2/feature.xml +++ b/features/tools.mdsd.license.epl2/feature.xml @@ -1,7 +1,7 @@ diff --git a/pom.xml b/pom.xml index ecb8ee1..e9367a9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 tools.mdsd.license parent - 1.0.0 + 1.1.0 pom ${project.artifactId}