diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fceb7012..a470d022 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,18 +4,15 @@ on: [workflow_dispatch] jobs: deployment: - strategy: - matrix: - os: [ ubuntu-latest ] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest environment: Deploy - name: Deployment in ${{ matrix.os }} + name: Deploy CrySL steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Sets up Java version - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-package: 'jdk' @@ -25,11 +22,6 @@ jobs: server-password: OSSRH_PASSWORD # Env var that holds your OSSRH user pw gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Substituted with the value stored in the referenced secret gpg-passphrase: SIGN_KEY_PASS # Env var that holds the key's passphrase - # Sets up Maven version - - name: Set up Maven - uses: stCarolas/setup-maven@v4.5 - with: - maven-version: 3.6.3 - name: Build & Deploy CrySL run: mvn -B -U clean deploy -Pdeployment env: diff --git a/.github/workflows/main_build.yml b/.github/workflows/main_build.yml index d8c4d14f..0524ad40 100644 --- a/.github/workflows/main_build.yml +++ b/.github/workflows/main_build.yml @@ -1,6 +1,12 @@ name: CrySL build -on: [push, pull_request] +on: + push: + branches-ignore: + - master + - develop + pull_request: + types: [opened, reopened] jobs: # Builds the project in windows, ubuntu and macos @@ -12,19 +18,14 @@ jobs: name: Project build in ${{ matrix.os }} steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Sets up Java version - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-package: jdk java-version: '11' - # Sets up Maven version - - name: Set up Maven - uses: stCarolas/setup-maven@v4.5 - with: - maven-version: 3.8.6 # Restores Maven dependecies - name: Restore local Maven repository uses: actions/cache@v3 diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml new file mode 100644 index 00000000..894f1638 --- /dev/null +++ b/.github/workflows/style.yml @@ -0,0 +1,26 @@ +name: Spotless Style Check +description: Check the formatting. Use "mvn spotless:apply" to format the code. + +on: + push: + branches-ignore: + - master + - develop + +jobs: + check-formatting: + runs-on: ubuntu-latest + name: Check style + steps: + - name: Checkout source code + uses: actions/checkout@v4 + # Restores Maven dependecies + - name: Restore local Maven repository + uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Run spotless checks + run: mvn spotless:check diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index eff20001..631fc1c1 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -15,21 +15,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Sets up Java version - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-package: jdk java-version: '11' - # Sets up Maven version - - name: Set up Maven - uses: stCarolas/setup-maven@v4.5 - with: - maven-version: 3.6.3 # Semantic versioning - name: Semantic versioning id: versioning @@ -85,7 +80,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Semantic versioning @@ -107,4 +102,4 @@ jobs: git config --global user.email "${{ github.actor }}@users.noreply.github.com" git config --global user.name "${{ github.actor }}" git tag -a ${{ steps.versioning.outputs.version }} -m "CrySL version ${{ steps.versioning.outputs.version }}" - git push origin ${{ steps.versioning.outputs.version }} \ No newline at end of file + git push origin ${{ steps.versioning.outputs.version }} diff --git a/.gitignore b/.gitignore index c015d8e2..5066ea49 100644 --- a/.gitignore +++ b/.gitignore @@ -121,6 +121,7 @@ cmake-build-*/ # IntelliJ out/ +.idea/ # mpeltonen/sbt-idea plugin .idea_modules/ @@ -193,6 +194,8 @@ buildNumber.properties .mvn/timing.properties # https://github.com/takari/maven-wrapper#usage-without-binary-jar .mvn/wrapper/maven-wrapper.jar +.flattened-pom.xml +**.iml # Eclipse m2e generated files # Eclipse Core diff --git a/de.darmstadt.tu.crossing.CrySL.feature/pom.xml b/de.darmstadt.tu.crossing.CrySL.feature/pom.xml index 09f8392d..66b1db6f 100644 --- a/de.darmstadt.tu.crossing.CrySL.feature/pom.xml +++ b/de.darmstadt.tu.crossing.CrySL.feature/pom.xml @@ -1,34 +1,34 @@ - - 4.0.0 - de.darmstadt.tu.crossing.CrySL.feature - eclipse-feature - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.parent - 3.0.2 - + + + 4.0.0 + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.parent + 3.0.2 + + de.darmstadt.tu.crossing.CrySL.feature + eclipse-feature - CrySL-Feature - - - Eclipse Public License - v2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - - - CogniCrypt - CogniCrypt - cognicrypt@eim.upb.de - - - - scm:git:git@github.com:CROSSINGTUD/CryptSL.git - scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git - https://github.com/CROSSINGTUD/CryptSL - - CrySL domain-specific language - https://github.com/CROSSINGTUD/CryptSL - \ No newline at end of file + CrySL-Feature + CrySL domain-specific language + https://github.com/CROSSINGTUD/CryptSL + + + Eclipse Public License - v2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + CogniCrypt + CogniCrypt + cognicrypt@eim.upb.de + + + + scm:git:git@github.com:CROSSINGTUD/CryptSL.git + scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git + https://github.com/CROSSINGTUD/CryptSL + + diff --git a/de.darmstadt.tu.crossing.CrySL.ide/.classpath b/de.darmstadt.tu.crossing.CrySL.ide/.classpath deleted file mode 100644 index 0377d772..00000000 --- a/de.darmstadt.tu.crossing.CrySL.ide/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/de.darmstadt.tu.crossing.CrySL.ide/pom.xml b/de.darmstadt.tu.crossing.CrySL.ide/pom.xml index 31d1e3e9..601d2133 100644 --- a/de.darmstadt.tu.crossing.CrySL.ide/pom.xml +++ b/de.darmstadt.tu.crossing.CrySL.ide/pom.xml @@ -1,73 +1,75 @@ - - 4.0.0 - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.parent - 3.0.2 - - de.darmstadt.tu.crossing.CrySL.ide - eclipse-plugin + + + 4.0.0 + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.parent + 3.0.2 + + de.darmstadt.tu.crossing.CrySL.ide + eclipse-plugin - CrySL-IDE - - - Eclipse Public License - v2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - - - CogniCrypt - CogniCrypt - cognicrypt@eim.upb.de - - - - scm:git:git@github.com:CROSSINGTUD/CryptSL.git - scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git - https://github.com/CROSSINGTUD/CryptSL - - CrySL domain-specific language - https://github.com/CROSSINGTUD/CryptSL + CrySL-IDE + CrySL domain-specific language + https://github.com/CROSSINGTUD/CryptSL + + + Eclipse Public License - v2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + CogniCrypt + CogniCrypt + cognicrypt@eim.upb.de + + + + scm:git:git@github.com:CROSSINGTUD/CryptSL.git + scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git + https://github.com/CROSSINGTUD/CryptSL + - - - - org.apache.maven.plugins - maven-clean-plugin - 3.4.0 - - - gen-clean - clean - - - - - org.eclipse.xtend - xtend-maven-plugin - - - maven-assembly-plugin - - - make-assembly - package - - single - - - - - - jar-with-dependencies - - build - - - - + + + + org.apache.maven.plugins + maven-clean-plugin + 3.4.0 + + + gen-clean + clean + + + + + org.eclipse.xtend + xtend-maven-plugin + + + maven-assembly-plugin + + + jar-with-dependencies + + build + + + + make-assembly + + + single + + + package + + + + + diff --git a/de.darmstadt.tu.crossing.CrySL.repository/pom.xml b/de.darmstadt.tu.crossing.CrySL.repository/pom.xml index 52fbedc0..1798e27b 100644 --- a/de.darmstadt.tu.crossing.CrySL.repository/pom.xml +++ b/de.darmstadt.tu.crossing.CrySL.repository/pom.xml @@ -1,59 +1,59 @@ - - 4.0.0 - de.darmstadt.tu.crossing.CrySL.repository - eclipse-repository - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.parent - 3.0.2 - + + + 4.0.0 + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.parent + 3.0.2 + + de.darmstadt.tu.crossing.CrySL.repository + eclipse-repository - CrySL-Repository - - - Eclipse Public License - v2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - - - CogniCrypt - CogniCrypt - cognicrypt@eim.upb.de - - - - scm:git:git@github.com:CROSSINGTUD/CryptSL.git - scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git - https://github.com/CROSSINGTUD/CryptSL - - CrySL domain-specific language - https://github.com/CROSSINGTUD/CryptSL + CrySL-Repository + CrySL domain-specific language + https://github.com/CROSSINGTUD/CryptSL + + + Eclipse Public License - v2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + CogniCrypt + CogniCrypt + cognicrypt@eim.upb.de + + + + scm:git:git@github.com:CROSSINGTUD/CryptSL.git + scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git + https://github.com/CROSSINGTUD/CryptSL + - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho-version} - - true - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-source - - - - - - - \ No newline at end of file + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-source + + + + + + + diff --git a/de.darmstadt.tu.crossing.CrySL.target/pom.xml b/de.darmstadt.tu.crossing.CrySL.target/pom.xml index c666231c..faddeb41 100644 --- a/de.darmstadt.tu.crossing.CrySL.target/pom.xml +++ b/de.darmstadt.tu.crossing.CrySL.target/pom.xml @@ -1,34 +1,35 @@ + - 4.0.0 - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.parent - 3.0.2 - - de.darmstadt.tu.crossing.CrySL.target - eclipse-target-definition + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.parent + 3.0.2 + + de.darmstadt.tu.crossing.CrySL.target + eclipse-target-definition - CrySL-Target - - - Eclipse Public License - v2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - - - CogniCrypt - CogniCrypt - cognicrypt@eim.upb.de - - - - scm:git:git@github.com:CROSSINGTUD/CryptSL.git - scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git - https://github.com/CROSSINGTUD/CryptSL - - CrySL domain-specific language - https://github.com/CROSSINGTUD/CryptSL + CrySL-Target + CrySL domain-specific language + https://github.com/CROSSINGTUD/CryptSL + + + Eclipse Public License - v2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + CogniCrypt + CogniCrypt + cognicrypt@eim.upb.de + + + + scm:git:git@github.com:CROSSINGTUD/CryptSL.git + scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git + https://github.com/CROSSINGTUD/CryptSL + diff --git a/de.darmstadt.tu.crossing.CrySL.tests/.classpath b/de.darmstadt.tu.crossing.CrySL.tests/.classpath deleted file mode 100644 index 66bf086e..00000000 --- a/de.darmstadt.tu.crossing.CrySL.tests/.classpath +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/de.darmstadt.tu.crossing.CrySL.tests/pom.xml b/de.darmstadt.tu.crossing.CrySL.tests/pom.xml index 33e241e8..43db2c2a 100644 --- a/de.darmstadt.tu.crossing.CrySL.tests/pom.xml +++ b/de.darmstadt.tu.crossing.CrySL.tests/pom.xml @@ -1,51 +1,52 @@ + - 4.0.0 - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.parent - 3.0.2 - - de.darmstadt.tu.crossing.CrySL.tests - eclipse-test-plugin + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.parent + 3.0.2 + + de.darmstadt.tu.crossing.CrySL.tests + eclipse-test-plugin - CrySL-Tests - - - Eclipse Public License - v2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - - - CogniCrypt - CogniCrypt - cognicrypt@eim.upb.de - - - - scm:git:git@github.com:CROSSINGTUD/CryptSL.git - scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git - https://github.com/CROSSINGTUD/CryptSL - - CrySL domain-specific language - https://github.com/CROSSINGTUD/CryptSL + CrySL-Tests + CrySL domain-specific language + https://github.com/CROSSINGTUD/CryptSL + + + Eclipse Public License - v2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + CogniCrypt + CogniCrypt + cognicrypt@eim.upb.de + + + + scm:git:git@github.com:CROSSINGTUD/CryptSL.git + scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git + https://github.com/CROSSINGTUD/CryptSL + - - - - org.eclipse.xtend - xtend-maven-plugin - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - false - - - - + + + + org.eclipse.xtend + xtend-maven-plugin + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + false + + + + diff --git a/de.darmstadt.tu.crossing.CrySL.tests/src/de/darmstadt/tu/crossing/tests/CrySLParsingTest.xtend b/de.darmstadt.tu.crossing.CrySL.tests/src/de/darmstadt/tu/crossing/tests/CrySLParsingTest.xtend index 7474188b..6b31e09a 100644 --- a/de.darmstadt.tu.crossing.CrySL.tests/src/de/darmstadt/tu/crossing/tests/CrySLParsingTest.xtend +++ b/de.darmstadt.tu.crossing.CrySL.tests/src/de/darmstadt/tu/crossing/tests/CrySLParsingTest.xtend @@ -1,17 +1,5 @@ -/* - * generated by Xtext 2.10.0 - */ package de.darmstadt.tu.crossing.tests -import com.google.inject.Inject -import de.darmstadt.tu.crossing.crySL.Domainmodel -import org.eclipse.xtext.junit4.InjectWith -import org.eclipse.xtext.junit4.XtextRunner -import org.eclipse.xtext.junit4.util.ParseHelper -import org.junit.Assert -import org.junit.Test -import org.junit.runner.RunWith - /*@RunWith(XtextRunner) class CrySLParsingTest{ diff --git a/de.darmstadt.tu.crossing.CrySL.ui.tests/.classpath b/de.darmstadt.tu.crossing.CrySL.ui.tests/.classpath deleted file mode 100644 index 8d26fa59..00000000 --- a/de.darmstadt.tu.crossing.CrySL.ui.tests/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/de.darmstadt.tu.crossing.CrySL.ui/.classpath b/de.darmstadt.tu.crossing.CrySL.ui/.classpath deleted file mode 100644 index 0377d772..00000000 --- a/de.darmstadt.tu.crossing.CrySL.ui/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/de.darmstadt.tu.crossing.CrySL.ui/pom.xml b/de.darmstadt.tu.crossing.CrySL.ui/pom.xml index 33c91fc7..870a0ce4 100644 --- a/de.darmstadt.tu.crossing.CrySL.ui/pom.xml +++ b/de.darmstadt.tu.crossing.CrySL.ui/pom.xml @@ -1,62 +1,64 @@ - - 4.0.0 - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.parent - 3.0.2 - - de.darmstadt.tu.crossing.CrySL.ui - eclipse-plugin + + + 4.0.0 + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.parent + 3.0.2 + + de.darmstadt.tu.crossing.CrySL.ui + eclipse-plugin - CrySL-UI - - - Eclipse Public License - v2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - - - CogniCrypt - CogniCrypt - cognicrypt@eim.upb.de - - - - scm:git:git@github.com:CROSSINGTUD/CryptSL.git - scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git - https://github.com/CROSSINGTUD/CryptSL - - CrySL domain-specific language - https://github.com/CROSSINGTUD/CryptSL + CrySL-UI + CrySL domain-specific language + https://github.com/CROSSINGTUD/CryptSL + + + Eclipse Public License - v2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + CogniCrypt + CogniCrypt + cognicrypt@eim.upb.de + + + + scm:git:git@github.com:CROSSINGTUD/CryptSL.git + scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git + https://github.com/CROSSINGTUD/CryptSL + - - - - org.eclipse.xtend - xtend-maven-plugin - - - maven-assembly-plugin - - - make-assembly - package - - single - - - - - - jar-with-dependencies - - build - - - - + + + + org.eclipse.xtend + xtend-maven-plugin + + + maven-assembly-plugin + + + jar-with-dependencies + + build + + + + make-assembly + + + single + + + package + + + + + diff --git a/de.darmstadt.tu.crossing.CrySL/.classpath b/de.darmstadt.tu.crossing.CrySL/.classpath deleted file mode 100644 index 0377d772..00000000 --- a/de.darmstadt.tu.crossing.CrySL/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/de.darmstadt.tu.crossing.CrySL/pom.xml b/de.darmstadt.tu.crossing.CrySL/pom.xml index bb94a54b..80fae9b5 100644 --- a/de.darmstadt.tu.crossing.CrySL/pom.xml +++ b/de.darmstadt.tu.crossing.CrySL/pom.xml @@ -1,199 +1,180 @@ - - 4.0.0 - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.parent - 3.0.2 - - de.darmstadt.tu.crossing.CrySL - eclipse-plugin + + + 4.0.0 + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.parent + 3.0.2 + + de.darmstadt.tu.crossing.CrySL + eclipse-plugin - CrySL - - - Eclipse Public License - v2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - - - CogniCrypt - CogniCrypt - cognicrypt@eim.upb.de - - - - scm:git:git@github.com:CROSSINGTUD/CryptSL.git - scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git - https://github.com/CROSSINGTUD/CryptSL - - CrySL domain-specific language - https://github.com/CROSSINGTUD/CryptSL + CrySL + CrySL domain-specific language + https://github.com/CROSSINGTUD/CryptSL + + + Eclipse Public License - v2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + CogniCrypt + CogniCrypt + cognicrypt@eim.upb.de + + + + scm:git:git@github.com:CROSSINGTUD/CryptSL.git + scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git + https://github.com/CROSSINGTUD/CryptSL + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + exec-maven-plugin + [1.2.1,) + + java + + + + + + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.4.1 + + org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher + + /${project.basedir}/src/de/darmstadt/tu/crossing/GenerateCrySL.mwe2 + -p + rootPath=/${project.basedir}/.. + + compile + true + false + + + + + org.eclipse.emf + org.eclipse.emf.mwe2.launch + ${emfVersion} + + + org.eclipse.xtext + org.eclipse.xtext.xtext.generator + ${xtextVersion} + + + + org.eclipse.emf + org.eclipse.emf.mwe2.runtime + + + org.eclipse.platform + org.eclipse.equinox.common + + + org.eclipse.platform + org.eclipse.core.runtime + + + + + org.eclipse.xtext + org.eclipse.xtext.xbase + ${xtextVersion} + + + org.eclipse.emf + org.eclipse.emf.mwe2.runtime + ${emfVersion} + + + + + mwe2Launcher + + java + + generate-sources + + + + + org.eclipse.xtend + xtend-maven-plugin + + + maven-assembly-plugin + + + jar-with-dependencies + + build + + + + make-assembly + + + single + + + package + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.4.0 + + + + ${basedir}/src-gen/ + + ** + + + + ${basedir}/xtend-gen/ + + ** + + + + ${basedir}/model/generated/ + + + + + + - - - - org.codehaus.mojo - exec-maven-plugin - 3.4.1 - - - mwe2Launcher - generate-sources - - java - - - - - org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher - - /${project.basedir}/src/de/darmstadt/tu/crossing/GenerateCrySL.mwe2 - -p - rootPath=/${project.basedir}/.. - - compile - true - false - - - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - ${emfVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - - - org.eclipse.emf - org.eclipse.emf.mwe2.runtime - - - org.eclipse.platform - org.eclipse.equinox.common - - - org.eclipse.platform - org.eclipse.core.runtime - - - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - - - org.eclipse.emf - org.eclipse.emf.mwe2.runtime - ${emfVersion} - - - - - org.eclipse.xtend - xtend-maven-plugin - - - maven-assembly-plugin - - - make-assembly - package - - single - - - - - - jar-with-dependencies - - build - - - - org.apache.maven.plugins - maven-clean-plugin - 3.4.0 - - - - ${basedir}/../de.darmstadt.tu.crossing.CrySL/src-gen/ - - **/* - - - - ${basedir}/../de.darmstadt.tu.crossing.CrySL.tests/src-gen/ - - **/* - - - - ${basedir}/../de.darmstadt.tu.crossing.CrySL.ide/src-gen/ - - **/* - - - - ${basedir}/../de.darmstadt.tu.crossing.CrySL.ui/src-gen/ - - **/* - - - - ${basedir}/../de.darmstadt.tu.crossing.CrySL.ui.tests/src-gen/ - - **/* - - - - ${basedir}/model/generated/ - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.2.1,) - - - java - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index a245ca5e..1a76fa51 100644 --- a/pom.xml +++ b/pom.xml @@ -1,373 +1,423 @@ - - 4.0.0 - de.darmstadt.tu.crossing.CrySL - 3.0.2 - de.darmstadt.tu.crossing.CrySL.parent - pom - - CrySL-Parent - - - Eclipse Public License - v2.0 - https://www.eclipse.org/legal/epl-2.0/ - - - - - CogniCrypt - CogniCrypt - cognicrypt@eim.upb.de - - - - scm:git:git@github.com:CROSSINGTUD/CryptSL.git - scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git - https://github.com/CROSSINGTUD/CryptSL - - CrySL domain-specific language - https://github.com/CROSSINGTUD/CryptSL + + + 4.0.0 + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.parent + 3.0.2 + pom - - 2.7.5 - 2.35.0 - 2.19.0 - UTF-8 - 1.8 - 1.8 - + CrySL-Parent + CrySL domain-specific language + https://github.com/CROSSINGTUD/CryptSL + + + Eclipse Public License - v2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + + CogniCrypt + CogniCrypt + cognicrypt@eim.upb.de + + - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.ide - de.darmstadt.tu.crossing.CrySL.ui - de.darmstadt.tu.crossing.CrySL.target - de.darmstadt.tu.crossing.CrySL.feature - de.darmstadt.tu.crossing.CrySL.repository - de.darmstadt.tu.crossing.CrySL.tests - + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.ide + de.darmstadt.tu.crossing.CrySL.ui + de.darmstadt.tu.crossing.CrySL.target + de.darmstadt.tu.crossing.CrySL.feature + de.darmstadt.tu.crossing.CrySL.repository + de.darmstadt.tu.crossing.CrySL.tests + + + scm:git:git@github.com:CROSSINGTUD/CryptSL.git + scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git + https://github.com/CROSSINGTUD/CryptSL + - - - - deployment - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://s01.oss.sonatype.org - true - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.7 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - - - + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho-version} - true - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho-version} - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - - - de.darmstadt.tu.crossing.CrySL - de.darmstadt.tu.crossing.CrySL.target - ${project.version} - - - - - macosx - cocoa - x86_64 - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-source - - jar - - - - - - org.apache.maven.plugins - maven-release-plugin - 3.1.1 - - @{project.version} - - - + + 2.7.5 + 2.35.0 + 2.19.0 + UTF-8 + 1.8 + 1.8 + - - - - - org.eclipse.xtend - xtend-maven-plugin - ${xtextVersion} - - - - compile - xtend-install-debug-info - testCompile - xtend-test-install-debug-info - - - - - xtend-gen - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-resources-plugin - - - [2.4.3,) - - - resources - testResources - - - - - - - - - - org.codehaus.mojo - - - build-helper-maven-plugin - - - [1.9.1,) - - - add-resource - add-source - add-test-resource - add-test-source - - - - - - - - - - org.eclipse.tycho - - - tycho-compiler-plugin - - - [0.23.1,) - - - compile - - - - - - - - - - org.eclipse.tycho - - - tycho-packaging-plugin - - - [0.23.1,) - - - build - build-aggregator - validate-id - validate-version - - - - - - - - - - - - org.eclipse.jdt - org.eclipse.jdt.core - 3.39.0 - - - org.eclipse.platform - org.eclipse.equinox.common - - - org.eclipse.platform - org.eclipse.core.runtime - - - - - org.eclipse.jdt - org.eclipse.jdt.compiler.apt - 1.4.300 - - - org.eclipse.platform - org.eclipse.equinox.common - - - org.eclipse.platform - org.eclipse.core.runtime - - - - - org.eclipse.jdt - org.eclipse.jdt.compiler.tool - 1.3.200 - - - org.eclipse.platform - org.eclipse.equinox.common - - - org.eclipse.platform - org.eclipse.core.runtime - - - - - org.eclipse.emf - org.eclipse.emf.codegen - 2.24.0 - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - -err:-forbidden - - - - maven-assembly-plugin - - - make-assembly - package - - single - - - - - - jar-with-dependencies - - build - - - - - + + org.eclipse.xtend + xtend-maven-plugin + ${xtextVersion} + + xtend-gen + + + + + compile + xtend-install-debug-info + testCompile + xtend-test-install-debug-info + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-resources-plugin + [2.4.3,) + + resources + testResources + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + [1.9.1,) + + add-resource + add-source + add-test-resource + add-test-source + + + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + [0.23.1,) + + compile + + + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + [0.23.1,) + + build + build-aggregator + validate-id + validate-version + + + + + + + + + + + + org.eclipse.jdt + org.eclipse.jdt.core + 3.39.0 + + + org.eclipse.platform + org.eclipse.equinox.common + + + org.eclipse.platform + org.eclipse.core.runtime + + + + + org.eclipse.jdt + org.eclipse.jdt.compiler.apt + 1.4.300 + + + org.eclipse.platform + org.eclipse.equinox.common + + + org.eclipse.platform + org.eclipse.core.runtime + + + + + org.eclipse.jdt + org.eclipse.jdt.compiler.tool + 1.3.200 + + + org.eclipse.platform + org.eclipse.equinox.common + + + org.eclipse.platform + org.eclipse.core.runtime + + + + + org.eclipse.emf + org.eclipse.emf.codegen + 2.24.0 + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + -err:-forbidden + + + + maven-assembly-plugin + + + jar-with-dependencies + + build + + + + make-assembly + + + single + + + package + + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho-version} + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + de.darmstadt.tu.crossing.CrySL + de.darmstadt.tu.crossing.CrySL.target + ${project.version} + + + + + macosx + cocoa + x86_64 + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-source + + jar + + + + + + org.apache.maven.plugins + maven-release-plugin + 3.1.1 + + @{project.version} + + - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + org.codehaus.mojo + flatten-maven-plugin + 1.6.0 + + true + ossrh + + + + flatten + + flatten + + process-resources + + + flatten.clean + + clean + + clean + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.43.0 + + + + pom.xml + de.darmstadt.tu.crossing.CrySL.feature/pom.xml + de.darmstadt.tu.crossing.CrySL.ide/pom.xml + de.darmstadt.tu.crossing.CrySL.repository/pom.xml + de.darmstadt.tu.crossing.CrySL.tests/pom.xml + de.darmstadt.tu.crossing.CrySL.ui/pom.xml + de.darmstadt.tu.crossing.CrySL/pom.xml + + + UTF-8 + true + 4 + false + true + false + + + + + 1.24.0 + + + + + + + + + + + + + apply + + + + + + + + + + + deployment + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + true + + ossrh + https://s01.oss.sonatype.org + true + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.7 + + + sign-artifacts + + sign + + verify + + + --pinentry-mode + loopback + + + + + + + + +