Clean up files and apply formatting

.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/[email protected]
-        with:
-          maven-version: 3.6.3
       - name: Build & Deploy CrySL
         run: mvn -B -U clean deploy -Pdeployment
         env:

.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
       # Restores Maven dependecies
       - name: Restore local Maven repository
         uses: actions/cache@v3

.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

.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
       # 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 }}

.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

de.darmstadt.tu.crossing.CrySL.feature/pom.xml

@@ -1,34 +1,34 @@
-<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>
-	<artifactId>de.darmstadt.tu.crossing.CrySL.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<parent>
-		<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
-		<artifactId>de.darmstadt.tu.crossing.CrySL.parent</artifactId>
-		<version>3.0.2</version>
-	</parent>
+<?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>
+    </parent>
+    <artifactId>de.darmstadt.tu.crossing.CrySL.feature</artifactId>
+    <packaging>eclipse-feature</packaging>
 
-	<name>CrySL-Feature</name>
-	<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>
-	<description>CrySL domain-specific language</description>
-	<url>https://github.com/CROSSINGTUD/CryptSL</url>
-</project>
+    <name>CrySL-Feature</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:git@github.com:CROSSINGTUD/CryptSL.git</connection>
+        <developerConnection>scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git</developerConnection>
+        <url>https://github.com/CROSSINGTUD/CryptSL</url>
+    </scm>
+</project>

de.darmstadt.tu.crossing.CrySL.ide/pom.xml

@@ -1,73 +1,75 @@
-<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>
-	</parent>
-	<artifactId>de.darmstadt.tu.crossing.CrySL.ide</artifactId>
-	<packaging>eclipse-plugin</packaging>
+<?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>
+    </parent>
+    <artifactId>de.darmstadt.tu.crossing.CrySL.ide</artifactId>
+    <packaging>eclipse-plugin</packaging>
 
-	<name>CrySL-IDE</name>
-	<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>
-	<description>CrySL domain-specific language</description>
-	<url>https://github.com/CROSSINGTUD/CryptSL</url>
+    <name>CrySL-IDE</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:git@github.com:CROSSINGTUD/CryptSL.git</connection>
+        <developerConnection>scm:git:ssh://github.com:CROSSINGTUD/CryptSL.git</developerConnection>
+        <url>https://github.com/CROSSINGTUD/CryptSL</url>
+    </scm>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.4.0</version>
-				<executions>
-					<execution>
-						<id>gen-clean</id>
-						<phase>clean</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>xtend-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- bind to the packaging phase -->
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-					<outputDirectory>build</outputDirectory>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.4.0</version>
+                <executions>
+                    <execution>
+                        <id>gen-clean</id>
+                        <phase>clean</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.xtend</groupId>
+                <artifactId>xtend-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <outputDirectory>build</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <!-- bind to the packaging phase -->
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <!-- this is used for inheritance merges -->
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>