From b761161c3d78401c4fd3bc3a76819cd4ff1b585d Mon Sep 17 00:00:00 2001 From: larsk21 <57503246+larsk21@users.noreply.github.com> Date: Tue, 3 Dec 2024 09:59:53 +0100 Subject: [PATCH 1/5] update Eclipse JDT dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4827dbb5..592f0652 100644 --- a/pom.xml +++ b/pom.xml @@ -215,7 +215,7 @@ org.eclipse.jdt ecj - 3.39.0 + 3.40.0 org.eclipse.platform From 993f40d8164670d7e9c36f960f6ee8f661baef11 Mon Sep 17 00:00:00 2001 From: larsk21 <57503246+larsk21@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:35:08 +0100 Subject: [PATCH 2/5] switch to release version of Vitruv-Change --- pom.xml | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 592f0652..2d1f9ea3 100644 --- a/pom.xml +++ b/pom.xml @@ -76,19 +76,6 @@ - - - ossrh-snapshots - OSSRH Snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - false - - - emf-compare @@ -123,47 +110,47 @@ tools.vitruv tools.vitruv.change.atomic - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv tools.vitruv.change.correspondence - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv tools.vitruv.change.composite - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv tools.vitruv.change.interaction - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv tools.vitruv.change.propagation - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv tools.vitruv.change.testutils.integration - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv tools.vitruv.change.testutils.core - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv tools.vitruv.change.testutils.metamodels - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv tools.vitruv.change.utils - 3.1.0-SNAPSHOT + 3.1.0 From f0cd107617366630c97cc7bdb90d0f86570f338d Mon Sep 17 00:00:00 2001 From: larsk21 <57503246+larsk21@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:39:54 +0100 Subject: [PATCH 3/5] add release scripts --- .github/prepare-release | 24 ++++++++++++ .github/workflows/release.yml | 73 +++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100755 .github/prepare-release create mode 100644 .github/workflows/release.yml diff --git a/.github/prepare-release b/.github/prepare-release new file mode 100755 index 00000000..b2809391 --- /dev/null +++ b/.github/prepare-release @@ -0,0 +1,24 @@ +#!/bin/sh + +if [ $# -lt 2 ]; +then + echo "usage: $0 " >&2 + echo "" >&2 + echo "release-version : Version of the next release, e.g., 3.1.0" >&2 + echo "new-snapshot-version: Version of the upcoming nightly releases without the -SNAPSHOT suffix, e.g., 3.2.0" >&2 + return 1 +fi + +git switch -C prepare-release/$1 || exit 1 + +set_version_and_commit() { + ./mvnw versions:set -DnewVersion=$1 -DgenerateBackupPoms=false || return 1 + + git add pom.xml || return 1 + git add "**/pom.xml" 2> /dev/null + + git commit -m "$2" || return 1 +} + +set_version_and_commit "$1" "[Release] Version $1" +set_version_and_commit "$2-SNAPSHOT" "[Release] Update version to $2-SNAPSHOT" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..8b849d60 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,73 @@ +name: Release + +# workflow triggers +on: + # manually + workflow_dispatch: + # releases + release: + types: [published] + +jobs: + verify: + name: Verify build on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + os: [ubuntu-latest, windows-latest, macOS-latest] + + steps: + - name: Checkout repository + uses: actions/checkout@v4.2.2 + + - name: Setup Java and Maven cache + uses: actions/setup-java@v4.5.0 + with: + distribution: 'temurin' + java-version: '17' + check-latest: true + cache: 'maven' + + - name: Verify build + run: > + ./mvnw clean verify + --batch-mode + --update-snapshots + --no-transfer-progress + + release: + name: Release + runs-on: ubuntu-latest + needs: [verify] + strategy: + fail-fast: true + + steps: + - name: Checkout repository + uses: actions/checkout@v4.2.2 + + - name: Setup Java and Maven cache + uses: actions/setup-java@v4.5.0 + with: + distribution: 'temurin' + java-version: '17' + check-latest: true + cache: 'maven' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE + + - name: Deploy to staging and release + run: > + ./mvnw clean deploy -P release + -DskipTests + --batch-mode + --update-snapshots + --no-transfer-progress + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} From 081212128a760b4f9279b86818615fd68353f5c8 Mon Sep 17 00:00:00 2001 From: larsk21 <57503246+larsk21@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:40:09 +0100 Subject: [PATCH 4/5] [Release] Version 3.1.0 --- common/pom.xml | 2 +- commonalities/language/pom.xml | 2 +- commonalities/pom.xml | 2 +- commonalities/runtime.operators/pom.xml | 2 +- commonalities/runtime/pom.xml | 2 +- commonalities/testutils/pom.xml | 2 +- demo/familiespersons/pom.xml | 2 +- demo/insurancefamilies/pom.xml | 2 +- demo/insurancepersons/pom.xml | 2 +- demo/pom.xml | 2 +- demo/sdq-demo-metamodels-wrapper/pom.xml | 2 +- pom.xml | 2 +- reactions/language/pom.xml | 2 +- reactions/pom.xml | 2 +- reactions/runtime/pom.xml | 2 +- testutils/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 08379afe..ded6ce60 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.common diff --git a/commonalities/language/pom.xml b/commonalities/language/pom.xml index 63dc3e2f..1fa8fc93 100644 --- a/commonalities/language/pom.xml +++ b/commonalities/language/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.commonalities - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.commonalities.language diff --git a/commonalities/pom.xml b/commonalities/pom.xml index 40019827..38544823 100644 --- a/commonalities/pom.xml +++ b/commonalities/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.commonalities diff --git a/commonalities/runtime.operators/pom.xml b/commonalities/runtime.operators/pom.xml index ea6512dd..38375dfd 100644 --- a/commonalities/runtime.operators/pom.xml +++ b/commonalities/runtime.operators/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.commonalities - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.commonalities.runtime.operators diff --git a/commonalities/runtime/pom.xml b/commonalities/runtime/pom.xml index 320d26dc..530f549b 100644 --- a/commonalities/runtime/pom.xml +++ b/commonalities/runtime/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.commonalities - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.commonalities.runtime diff --git a/commonalities/testutils/pom.xml b/commonalities/testutils/pom.xml index 18866dbe..28a9f68f 100644 --- a/commonalities/testutils/pom.xml +++ b/commonalities/testutils/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.commonalities - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.commonalities.testutils diff --git a/demo/familiespersons/pom.xml b/demo/familiespersons/pom.xml index 77634977..9a0ca7ef 100644 --- a/demo/familiespersons/pom.xml +++ b/demo/familiespersons/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.demo - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.demo.familiespersons diff --git a/demo/insurancefamilies/pom.xml b/demo/insurancefamilies/pom.xml index de866335..821341b0 100644 --- a/demo/insurancefamilies/pom.xml +++ b/demo/insurancefamilies/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.demo - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.demo.insurancefamilies diff --git a/demo/insurancepersons/pom.xml b/demo/insurancepersons/pom.xml index 50ec1c19..56046a0b 100644 --- a/demo/insurancepersons/pom.xml +++ b/demo/insurancepersons/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.demo - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.demo.insurancepersons diff --git a/demo/pom.xml b/demo/pom.xml index 49c1f218..1f9b00d4 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.demo diff --git a/demo/sdq-demo-metamodels-wrapper/pom.xml b/demo/sdq-demo-metamodels-wrapper/pom.xml index 051549d1..edcc4bf5 100644 --- a/demo/sdq-demo-metamodels-wrapper/pom.xml +++ b/demo/sdq-demo-metamodels-wrapper/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.demo - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.demo.sdq-demo-metamodels-wrapper diff --git a/pom.xml b/pom.xml index 2d1f9ea3..6c805c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ tools.vitruv.dsls - 3.1.0-SNAPSHOT + 3.1.0 pom Vitruv Consistency DSLs diff --git a/reactions/language/pom.xml b/reactions/language/pom.xml index 581938d1..7bea5ee8 100644 --- a/reactions/language/pom.xml +++ b/reactions/language/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.reactions - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.reactions.language diff --git a/reactions/pom.xml b/reactions/pom.xml index 08ba57f8..88b65f18 100644 --- a/reactions/pom.xml +++ b/reactions/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.reactions diff --git a/reactions/runtime/pom.xml b/reactions/runtime/pom.xml index 41bec6cb..20fe1f46 100644 --- a/reactions/runtime/pom.xml +++ b/reactions/runtime/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.reactions - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.reactions.runtime diff --git a/testutils/pom.xml b/testutils/pom.xml index d7d586b1..08b986e9 100644 --- a/testutils/pom.xml +++ b/testutils/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0-SNAPSHOT + 3.1.0 tools.vitruv.dsls.testutils From 43bc481cc3b8e9fc6c05b0919430d1c88ac38068 Mon Sep 17 00:00:00 2001 From: larsk21 <57503246+larsk21@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:40:12 +0100 Subject: [PATCH 5/5] [Release] Update version to 3.2.0-SNAPSHOT --- common/pom.xml | 2 +- commonalities/language/pom.xml | 2 +- commonalities/pom.xml | 2 +- commonalities/runtime.operators/pom.xml | 2 +- commonalities/runtime/pom.xml | 2 +- commonalities/testutils/pom.xml | 2 +- demo/familiespersons/pom.xml | 2 +- demo/insurancefamilies/pom.xml | 2 +- demo/insurancepersons/pom.xml | 2 +- demo/pom.xml | 2 +- demo/sdq-demo-metamodels-wrapper/pom.xml | 2 +- pom.xml | 2 +- reactions/language/pom.xml | 2 +- reactions/pom.xml | 2 +- reactions/runtime/pom.xml | 2 +- testutils/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index ded6ce60..da846768 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.common diff --git a/commonalities/language/pom.xml b/commonalities/language/pom.xml index 1fa8fc93..4dbf1e31 100644 --- a/commonalities/language/pom.xml +++ b/commonalities/language/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.commonalities - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.commonalities.language diff --git a/commonalities/pom.xml b/commonalities/pom.xml index 38544823..a125b864 100644 --- a/commonalities/pom.xml +++ b/commonalities/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.commonalities diff --git a/commonalities/runtime.operators/pom.xml b/commonalities/runtime.operators/pom.xml index 38375dfd..32a93128 100644 --- a/commonalities/runtime.operators/pom.xml +++ b/commonalities/runtime.operators/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.commonalities - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.commonalities.runtime.operators diff --git a/commonalities/runtime/pom.xml b/commonalities/runtime/pom.xml index 530f549b..114ab9cf 100644 --- a/commonalities/runtime/pom.xml +++ b/commonalities/runtime/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.commonalities - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.commonalities.runtime diff --git a/commonalities/testutils/pom.xml b/commonalities/testutils/pom.xml index 28a9f68f..7709f2a6 100644 --- a/commonalities/testutils/pom.xml +++ b/commonalities/testutils/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.commonalities - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.commonalities.testutils diff --git a/demo/familiespersons/pom.xml b/demo/familiespersons/pom.xml index 9a0ca7ef..1479a05b 100644 --- a/demo/familiespersons/pom.xml +++ b/demo/familiespersons/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.demo - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.demo.familiespersons diff --git a/demo/insurancefamilies/pom.xml b/demo/insurancefamilies/pom.xml index 821341b0..f2951357 100644 --- a/demo/insurancefamilies/pom.xml +++ b/demo/insurancefamilies/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.demo - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.demo.insurancefamilies diff --git a/demo/insurancepersons/pom.xml b/demo/insurancepersons/pom.xml index 56046a0b..cecec680 100644 --- a/demo/insurancepersons/pom.xml +++ b/demo/insurancepersons/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.demo - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.demo.insurancepersons diff --git a/demo/pom.xml b/demo/pom.xml index 1f9b00d4..a77ee575 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.demo diff --git a/demo/sdq-demo-metamodels-wrapper/pom.xml b/demo/sdq-demo-metamodels-wrapper/pom.xml index edcc4bf5..a42d8963 100644 --- a/demo/sdq-demo-metamodels-wrapper/pom.xml +++ b/demo/sdq-demo-metamodels-wrapper/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.demo - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.demo.sdq-demo-metamodels-wrapper diff --git a/pom.xml b/pom.xml index 6c805c1e..6105c1b8 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ tools.vitruv.dsls - 3.1.0 + 3.2.0-SNAPSHOT pom Vitruv Consistency DSLs diff --git a/reactions/language/pom.xml b/reactions/language/pom.xml index 7bea5ee8..652af765 100644 --- a/reactions/language/pom.xml +++ b/reactions/language/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.reactions - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.reactions.language diff --git a/reactions/pom.xml b/reactions/pom.xml index 88b65f18..c4b723d6 100644 --- a/reactions/pom.xml +++ b/reactions/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.reactions diff --git a/reactions/runtime/pom.xml b/reactions/runtime/pom.xml index 20fe1f46..1b70ac7a 100644 --- a/reactions/runtime/pom.xml +++ b/reactions/runtime/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls.reactions - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.reactions.runtime diff --git a/testutils/pom.xml b/testutils/pom.xml index 08b986e9..8a79ee9b 100644 --- a/testutils/pom.xml +++ b/testutils/pom.xml @@ -8,7 +8,7 @@ tools.vitruv tools.vitruv.dsls - 3.1.0 + 3.2.0-SNAPSHOT tools.vitruv.dsls.testutils