diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d814cf7..5b39098 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
on:
push:
- branches: [master]
- create:
- tags:
+ branches: [main]
+ release:
+ types: [created]
pull_request:
schedule:
- cron: '35 2 * * *' # run nightly at 2:35 am
@@ -14,17 +14,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
- path: ~/.m2
+ path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml', '**/MANIFEST.MF') }}
restore-keys: ${{ runner.os }}-m2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
with:
- java-version: 11
+ distribution: 'temurin'
+ java-version: 17
- name: Build and Verify
run: ./mvnw -B clean verify
-Dstyle.color=always
@@ -34,7 +35,7 @@ jobs:
env:
MAVEN_OPTS: -Djansi.force=true
- name: Publish Nightly Update Site
- if: github.ref == 'refs/heads/master' && github.repository_owner == 'kit-sdq'
+ if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'kit-sdq'
uses: peaceiris/actions-gh-pages@v3
with:
deploy_key: ${{ secrets.UPDATE_SITE_DEPLOY_KEY }}
@@ -42,19 +43,13 @@ jobs:
destination_dir: nightly/metamodels/demo
publish_dir: releng/edu.kit.ipd.sdq.metamodels.demo.updatesite/target/repository
publish_branch: master
- - name: Determine Release Version
- if: startsWith(github.ref, 'refs/tags/releases/') && github.repository_owner == 'kit-sdq'
- id: releaseVersion
- uses: little-core-labs/get-git-tag@v3.0.2
- with:
- tagRegex: "releases/(.*)"
- name: Publish Release Update Site
- if: startsWith(github.ref, 'refs/tags/releases/') && github.repository_owner == 'kit-sdq'
+ if: github.event_name == 'release' && github.repository_owner == 'kit-sdq'
uses: peaceiris/actions-gh-pages@v3
with:
deploy_key: ${{ secrets.UPDATE_SITE_DEPLOY_KEY }}
external_repository: kit-sdq/updatesite
- destination_dir: release/metamodels/demo/${{ steps.releaseVersion.outputs.tag }}
+ destination_dir: release/metamodels/demo/${{ github.event.release.tag_name }}
publish_dir: releng/edu.kit.ipd.sdq.metamodels.demo.updatesite/target/repository
publish_branch: master
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index f998810..f5bf8dd 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,8 +1,8 @@
- org.eclipse.tycho.extras
- tycho-pomless
- 2.5.0
+ org.eclipse.tycho
+ tycho-build
+ 3.0.1
\ No newline at end of file
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 598fb34..dc3affc 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.addresses.edit/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.addresses.edit/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.addresses.edit/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.addresses.edit/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.addresses.edit/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.addresses.edit/META-INF/MANIFEST.MF
index fe9fabc..2da4802 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.addresses.edit/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.addresses.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.addresses.provider.AddressesEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.addresses.provider
Require-Bundle: org.eclipse.core.runtime,
edu.kit.ipd.sdq.metamodels.addresses;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.addresses.editor/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.addresses.editor/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.addresses.editor/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.addresses.editor/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.addresses.editor/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.addresses.editor/META-INF/MANIFEST.MF
index e956f9c..09ff9bc 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.addresses.editor/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.addresses.editor/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.addresses.presentation.AddressesEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.addresses.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.addresses/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.addresses/.classpath
index 5c68515..6d62667 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.addresses/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.addresses/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.addresses/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.addresses/META-INF/MANIFEST.MF
index db04664..7079ebd 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.addresses/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.addresses/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.addresses,
edu.kit.ipd.sdq.metamodels.addresses.impl,
edu.kit.ipd.sdq.metamodels.addresses.util
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.families.edit/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.families.edit/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.families.edit/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.families.edit/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.families.edit/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.families.edit/META-INF/MANIFEST.MF
index 1c539a4..cf1138c 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.families.edit/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.families.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.families.provider.FamiliesEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.families.provider
Require-Bundle: org.eclipse.core.runtime,
edu.kit.ipd.sdq.metamodels.families;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.families.editor/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.families.editor/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.families.editor/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.families.editor/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.families.editor/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.families.editor/META-INF/MANIFEST.MF
index a69cda0..ab7ce73 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.families.editor/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.families.editor/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.families.presentation.FamiliesEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.families.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.families/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.families/.classpath
index e3e8234..3fb0665 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.families/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.families/.classpath
@@ -3,7 +3,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.families/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.families/META-INF/MANIFEST.MF
index b3f296f..55b504c 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.families/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.families/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.families,
edu.kit.ipd.sdq.metamodels.families.impl,
edu.kit.ipd.sdq.metamodels.families.util
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.insurance.edit/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.insurance.edit/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.insurance.edit/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.insurance.edit/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.insurance.edit/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.insurance.edit/META-INF/MANIFEST.MF
index 9bdafc6..c64f344 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.insurance.edit/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.insurance.edit/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.insurance.provider.InsuranceEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.insurance.provider
Require-Bundle: org.eclipse.core.runtime,
edu.kit.ipd.sdq.metamodels.insurance;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.insurance.editor/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.insurance.editor/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.insurance.editor/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.insurance.editor/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.insurance.editor/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.insurance.editor/META-INF/MANIFEST.MF
index e527bbc..35d66f1 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.insurance.editor/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.insurance.editor/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.insurance.presentation.InsuranceEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.insurance.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.insurance/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.insurance/.classpath
index e3e8234..3fb0665 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.insurance/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.insurance/.classpath
@@ -3,7 +3,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.insurance/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.insurance/META-INF/MANIFEST.MF
index e913748..f7ff2cb 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.insurance/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.insurance/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.insurance,
edu.kit.ipd.sdq.metamodels.insurance.impl,
edu.kit.ipd.sdq.metamodels.insurance.util
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.persons.edit/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.persons.edit/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.persons.edit/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.persons.edit/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.persons.edit/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.persons.edit/META-INF/MANIFEST.MF
index 79a9655..9e7df18 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.persons.edit/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.persons.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.persons.provider.PersonsEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.persons.provider
Require-Bundle: org.eclipse.core.runtime,
edu.kit.ipd.sdq.metamodels.persons;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.persons.editor/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.persons.editor/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.persons.editor/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.persons.editor/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.persons.editor/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.persons.editor/META-INF/MANIFEST.MF
index 5388a27..a99d18d 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.persons.editor/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.persons.editor/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.persons.presentation.PersonsEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.persons.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.persons/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.persons/.classpath
index e3e8234..3fb0665 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.persons/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.persons/.classpath
@@ -3,7 +3,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.persons/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.persons/META-INF/MANIFEST.MF
index 4199d5a..b54bf96 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.persons/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.persons/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.persons,
edu.kit.ipd.sdq.metamodels.persons.impl,
edu.kit.ipd.sdq.metamodels.persons.util
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.recipients.edit/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.recipients.edit/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.recipients.edit/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.recipients.edit/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.recipients.edit/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.recipients.edit/META-INF/MANIFEST.MF
index 94ad6b4..b3e5210 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.recipients.edit/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.recipients.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.recipients.provider.RecipientsEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.recipients.provider
Require-Bundle: org.eclipse.core.runtime,
edu.kit.ipd.sdq.metamodels.recipients;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.recipients.editor/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.recipients.editor/.classpath
index 19e7b34..095fc6f 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.recipients.editor/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.recipients.editor/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.recipients.editor/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.recipients.editor/META-INF/MANIFEST.MF
index 98f2d55..6cb600e 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.recipients.editor/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.recipients.editor/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: edu.kit.ipd.sdq.metamodels.recipients.presentation.RecipientsEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.recipients.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.recipients/.classpath b/bundles/edu.kit.ipd.sdq.metamodels.recipients/.classpath
index 5c68515..6d62667 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.recipients/.classpath
+++ b/bundles/edu.kit.ipd.sdq.metamodels.recipients/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/bundles/edu.kit.ipd.sdq.metamodels.recipients/META-INF/MANIFEST.MF b/bundles/edu.kit.ipd.sdq.metamodels.recipients/META-INF/MANIFEST.MF
index bf23397..73b6162 100644
--- a/bundles/edu.kit.ipd.sdq.metamodels.recipients/META-INF/MANIFEST.MF
+++ b/bundles/edu.kit.ipd.sdq.metamodels.recipients/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: edu.kit.ipd.sdq.metamodels.recipients,
edu.kit.ipd.sdq.metamodels.recipients.impl,
edu.kit.ipd.sdq.metamodels.recipients.util
diff --git a/mvnw b/mvnw
index 41c0f0c..b7f0646 100755
--- a/mvnw
+++ b/mvnw
@@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
+# Apache Maven Wrapper startup batch script, version 3.1.1
#
# Required ENV vars:
# ------------------
@@ -27,7 +27,6 @@
#
# Optional ENV vars
# -----------------
-# M2_HOME - location of maven2's installed home dir
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -36,6 +35,10 @@
if [ -z "$MAVEN_SKIP_RC" ] ; then
+ if [ -f /usr/local/etc/mavenrc ] ; then
+ . /usr/local/etc/mavenrc
+ fi
+
if [ -f /etc/mavenrc ] ; then
. /etc/mavenrc
fi
@@ -58,9 +61,9 @@ case "`uname`" in
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
if [ -z "$JAVA_HOME" ]; then
if [ -x "/usr/libexec/java_home" ]; then
- export JAVA_HOME="`/usr/libexec/java_home`"
+ JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME
else
- export JAVA_HOME="/Library/Java/Home"
+ JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
fi
fi
;;
@@ -72,36 +75,8 @@ if [ -z "$JAVA_HOME" ] ; then
fi
fi
-if [ -z "$M2_HOME" ] ; then
- ## resolve links - $0 may be a link to maven's home
- PRG="$0"
-
- # need this for relative symlinks
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
- done
-
- saveddir=`pwd`
-
- M2_HOME=`dirname "$PRG"`/..
-
- # make it fully qualified
- M2_HOME=`cd "$M2_HOME" && pwd`
-
- cd "$saveddir"
- # echo Using m2 at $M2_HOME
-fi
-
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --unix "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
@@ -110,8 +85,6 @@ fi
# For Mingw, ensure paths are in UNIX format before anything is touched
if $mingw ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME="`(cd "$M2_HOME"; pwd)`"
[ -n "$JAVA_HOME" ] &&
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
fi
@@ -145,7 +118,7 @@ if [ -z "$JAVACMD" ] ; then
JAVACMD="$JAVA_HOME/bin/java"
fi
else
- JAVACMD="`which java`"
+ JAVACMD="`\\unset -f command; \\command -v java`"
fi
fi
@@ -159,12 +132,9 @@ if [ -z "$JAVA_HOME" ] ; then
echo "Warning: JAVA_HOME environment variable is not set."
fi
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
-
if [ -z "$1" ]
then
echo "Path not specified to find_maven_basedir"
@@ -184,7 +154,7 @@ find_maven_basedir() {
fi
# end of workaround
done
- echo "${basedir}"
+ printf '%s' "$(cd "$basedir"; pwd)"
}
# concatenates all lines of a file
@@ -194,11 +164,16 @@ concat_lines() {
fi
}
-BASE_DIR=`find_maven_basedir "$(pwd)"`
+BASE_DIR=$(find_maven_basedir "$(dirname $0)")
if [ -z "$BASE_DIR" ]; then
exit 1;
fi
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+
##########################################################################################
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
# This allows using the maven wrapper in projects that prohibit checking in binary data.
@@ -212,16 +187,16 @@ else
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
fi
if [ -n "$MVNW_REPOURL" ]; then
- jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
else
- jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
fi
while IFS="=" read key value; do
- case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;;
esac
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
if [ "$MVNW_VERBOSE" = true ]; then
- echo "Downloading from: $jarUrl"
+ echo "Downloading from: $wrapperUrl"
fi
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
if $cygwin; then
@@ -229,42 +204,49 @@ else
fi
if command -v wget > /dev/null; then
+ QUIET="--quiet"
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found wget ... using wget"
+ QUIET=""
fi
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- wget "$jarUrl" -O "$wrapperJarPath"
+ wget $QUIET "$wrapperUrl" -O "$wrapperJarPath"
else
- wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath"
fi
+ [ $? -eq 0 ] || rm -f "$wrapperJarPath"
elif command -v curl > /dev/null; then
+ QUIET="--silent"
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found curl ... using curl"
+ QUIET=""
fi
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- curl -o "$wrapperJarPath" "$jarUrl" -f
+ curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L
else
- curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L
fi
-
+ [ $? -eq 0 ] || rm -f "$wrapperJarPath"
else
if [ "$MVNW_VERBOSE" = true ]; then
echo "Falling back to using Java to download"
fi
- javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class"
# For Cygwin, switch paths to Windows format before running javac
if $cygwin; then
+ javaSource=`cygpath --path --windows "$javaSource"`
javaClass=`cygpath --path --windows "$javaClass"`
fi
- if [ -e "$javaClass" ]; then
- if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ -e "$javaSource" ]; then
+ if [ ! -e "$javaClass" ]; then
if [ "$MVNW_VERBOSE" = true ]; then
echo " - Compiling MavenWrapperDownloader.java ..."
fi
# Compiling the Java class
- ("$JAVA_HOME/bin/javac" "$javaClass")
+ ("$JAVA_HOME/bin/javac" "$javaSource")
fi
- if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ -e "$javaClass" ]; then
# Running the downloader
if [ "$MVNW_VERBOSE" = true ]; then
echo " - Running MavenWrapperDownloader.java ..."
@@ -278,16 +260,10 @@ fi
# End of extension
##########################################################################################
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
- echo $MAVEN_PROJECTBASEDIR
-fi
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --path --windows "$M2_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
@@ -305,6 +281,7 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
exec "$JAVACMD" \
$MAVEN_OPTS \
+ $MAVEN_DEBUG_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
- "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
index 8611571..cba1f04 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -1,182 +1,187 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
- IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
- if "%MVNW_VERBOSE%" == "true" (
- echo Found %WRAPPER_JAR%
- )
-) else (
- if not "%MVNW_REPOURL%" == "" (
- SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
- )
- if "%MVNW_VERBOSE%" == "true" (
- echo Couldn't find %WRAPPER_JAR%, downloading it ...
- echo Downloading from: %DOWNLOAD_URL%
- )
-
- powershell -Command "&{"^
- "$webclient = new-object System.Net.WebClient;"^
- "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
- "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
- "}"^
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
- "}"
- if "%MVNW_VERBOSE%" == "true" (
- echo Finished downloading %WRAPPER_JAR%
- )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.1.1
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %WRAPPER_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+ %JVM_CONFIG_MAVEN_PROPS% ^
+ %MAVEN_OPTS% ^
+ %MAVEN_DEBUG_OPTS% ^
+ -classpath %WRAPPER_JAR% ^
+ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+ %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
diff --git a/releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml b/releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml
index c6a1e9c..8058d54 100644
--- a/releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml
+++ b/releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml
@@ -7,27 +7,29 @@
1.7.0-SNAPSHOT
pom
+ 2022-12
+ 1.6.0
+ 3.2.0
+ 3.0.1
+ 1.8.0
+ 2.14.0
+ 2.22.0
+ 2.32.0
+ 2.29.0
UTF-8
UTF-8
- 3.1.0
- 2.5.0
- 1.6.1
- 2.12.1
- 2.22.0
- 2.26.0
- 2.25.0
- Eclipse 2021-12
+ Eclipse
p2
- http://download.eclipse.org/releases/2021-12
+ http://download.eclipse.org/releases/${eclipse.version}
XAnnotations
p2
- https://kit-sdq.github.io/updatesite/release/xannotations/1.5.0/
+ https://kit-sdq.github.io/updatesite/release/xannotations/${sdq.xannotations.version}
@@ -112,6 +114,11 @@
cocoa
x86_64
+
+ macosx
+ cocoa
+ aarch64
+
diff --git a/releng/edu.kit.ipd.sdq.metamodels.workflow/.classpath b/releng/edu.kit.ipd.sdq.metamodels.workflow/.classpath
index cbd391f..c362d17 100644
--- a/releng/edu.kit.ipd.sdq.metamodels.workflow/.classpath
+++ b/releng/edu.kit.ipd.sdq.metamodels.workflow/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/releng/edu.kit.ipd.sdq.metamodels.workflow/META-INF/MANIFEST.MF b/releng/edu.kit.ipd.sdq.metamodels.workflow/META-INF/MANIFEST.MF
index be239ae..cb669e9 100644
--- a/releng/edu.kit.ipd.sdq.metamodels.workflow/META-INF/MANIFEST.MF
+++ b/releng/edu.kit.ipd.sdq.metamodels.workflow/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: edu.kit.ipd.sdq.metamodels.workflow
Bundle-Version: 1.7.0.qualifier
Bundle-Vendor: KIT SDQ
Automatic-Module-Name: edu.kit.ipd.sdq.metamodels.workflow
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17