Merge pull request #127 from CROSSINGTUD/feature/crysl-components

Add CrySL components to this repository and update version to Java 17
CROSSINGTUD · Nov 29, 2024 · 4b2c4ac · 4b2c4ac
2 parents 69e4490 + 1a53770
commit 4b2c4ac
Show file tree

Hide file tree

Showing 61 changed files with 4,227 additions and 969 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,7 +6,3 @@ updates:
     interval: weekly
     time: "04:00"
   open-pull-requests-limit: 10
-  # tycho 3 and tycho 4 requires Java version 17 to be built
-  ignore:
-    - dependency-name: "org.eclipse.tycho:tycho-maven-plugin"
-      versions: ["3.x.x", "4.x.x"]
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -4,32 +4,24 @@ 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'
-          java-version: '11'
+          java-version: '17'
           server-id: 'ossrh' # must match the serverId configured for the nexus-staging-maven-plugin
           server-username: OSSRH_USERNAME # Env var that holds your OSSRH user name
           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/[email protected]
-        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
@@ -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/[email protected]
-        with:
-          maven-version: 3.8.6
+          java-version: '17'
       # Restores Maven dependecies
       - name: Restore local Maven repository
         uses: actions/cache@v3

diff --git a/.github/workflows/style.yml 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
@@ -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/[email protected]
-        with:
-          maven-version: 3.6.3
+          java-version: '17'
       # 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 }}
+          git push origin ${{ steps.versioning.outputs.version }}
diff --git 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/CrySLParser/pom.xml b/CrySLParser/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>de.darmstadt.tu.crossing.CrySL</groupId>
+        <artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
+        <version>3.0.2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>CrySLParser</artifactId>
+
+    <name>CrySL-Parser</name>
+    <description>CrySL domain-specific language</description>
+    <url>https://github.com/CROSSINGTUD/CryptSL</url>
+
+    <licenses>
+        <license>
+            <name>Eclipse Public License - v2.0</name>
+            <url>https://www.eclipse.org/legal/epl-2.0/</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <id>CogniCrypt</id>
+            <name>CogniCrypt</name>
+            <email>[email protected]</email>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:[email protected]:CROSSINGTUD/CryptSL.git</connection>
+        <developerConnection>scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git</developerConnection>
+        <url>https://github.com/CROSSINGTUD/CryptSL</url>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>9.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>de.darmstadt.tu.crossing.CrySL</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.xtext</groupId>
+            <artifactId>org.eclipse.xtext</artifactId>
+            <version>${xtextVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.xtext</groupId>
+            <artifactId>org.eclipse.xtext.xbase</artifactId>
+            <version>${xtextVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.xtext</groupId>
+            <artifactId>org.eclipse.xtext.common.types</artifactId>
+            <version>${xtextVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.emf</groupId>
+            <artifactId>org.eclipse.emf.common</artifactId>
+            <version>${emfVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.emf</groupId>
+            <artifactId>org.eclipse.emf.ecore</artifactId>
+            <version>${emfVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.3.1-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>7.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.16</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.16</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>