Updated dependencies and improved robustness

.github/dependabot.yml

@@ -1,11 +1,11 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "maven" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/codeql-analysis.yml

@@ -1,66 +1,66 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master, master-branch-protection ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '27 19 * * 4'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
-
-    steps:
-    - name: Clone repository with submodules
-      uses: actions/checkout@v4
-      with:
-        #ssh-key: ${{ secrets.SECPL_PULL_KEY }}
-        submodules: 'recursive'
-        fetch-depth: 0
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Only compile to be faster
-    - name: Setup Maven Action
-      uses: s4u/setup-maven-action@v1.9.0
-    - name: Build
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: mvn -DskipTests=true package
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master, master-branch-protection ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '27 19 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Clone repository with submodules
+      uses: actions/checkout@v4
+      with:
+        #ssh-key: ${{ secrets.SECPL_PULL_KEY }}
+        submodules: 'recursive'
+        fetch-depth: 0
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Only compile to be faster
+    - name: Setup Maven Action
+      uses: s4u/setup-maven-action@v1.9.0
+    - name: Build
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: mvn -DskipTests=true package
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

.github/workflows/maven.yml

@@ -1,56 +1,79 @@
-name: Java CI
-
-on:
-  push:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Clone repository with submodules
-      uses: actions/checkout@v4
-      with: 
-#        ssh-key: ${{ secrets.SECPL_PULL_KEY }}
-        submodules: 'recursive'
-        fetch-depth: 0
-#    - name: Set up JDK
-#      uses: actions/setup-java@v2
-#      with:
-#        distribution: 'temurin'
-#        java-version: '17'
-#        cache: 'maven'  
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
-#    - name: Build with Maven
-    - name: Setup Maven Action
-      uses: s4u/setup-maven-action@v1.10.0
-    - name: Run headless test   
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      run: xvfb-run mvn verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Declipse.p2.mirrors=false
-    - name: Publisch Pre-Release
-      if: ${{ github.ref == 'refs/heads/master' }}
-      uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "latest"
-        prerelease: true
-        title: "Development Build"
-        files: |
-          build/org.gravity.updatesite/target/site.zip
-          build/org.gravity.headless.product/target/products/*.zip
-    - name: Publisch Release
-      if: ${{ github.ref_type == 'tag' }}
-      uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        prerelease: false
-        files: |
-          build/org.gravity.updatesite/target/site.zip
-          build/org.gravity.headless.product/target/products/*.zip
+name: Java CI
+
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout full repo + submodules with history
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0   # disable shallow clone for main repo
+          fetch-tags: true # include tags for Sonar + versioning
+
+      # Ensure submodules are not shallow
+      - name: Unshallow submodules
+        run: git submodule foreach 'git fetch --unshallow || true'
+
+      # Setup Java + Maven cache
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: maven
+
+      # Build + Test + Sonar (only for trusted contexts)
+      - name: Build & Test with SonarCloud
+        if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          xvfb-run mvn \
+            -Declipse.p2.mirrors=false \
+            verify \
+            org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+
+      # Build + Test (no Sonar for forks)
+      - name: Build & Test (no Sonar for forks)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+        run: |
+          xvfb-run mvn \
+            -Declipse.p2.mirrors=false \
+            verify
+
+      # Pre-release on master branch
+      - name: Publish Pre-Release
+        if: github.ref == 'refs/heads/master'
+        uses: crowbarmaster/GH-Automatic-Releases@v1.6.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          automatic_release_tag: latest
+          prerelease: true
+          title: Development Build
+          files: |
+            build/org.gravity.updatesite/target/site.zip
+            build/org.gravity.headless.product/target/products/*.zip
+
+      # Release on tag push
+      - name: Publish Release
+        if: github.ref_type == 'tag'
+        uses: crowbarmaster/GH-Automatic-Releases@v1.6.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          prerelease: false
+          files: |
+            build/org.gravity.updatesite/target/site.zip
+            build/org.gravity.headless.product/target/products/*.zip
+
+
+

.gitignore

@@ -1,5 +1,5 @@
-target/
-*.class
-*.png
-.antlr-generator-3.2.0-patch.jar
-.tycho-consumer-pom.xml
+target/
+*.class
+*.png
+.antlr-generator-3.2.0-patch.jar
+.tycho-consumer-pom.xml

.gitmodules

@@ -1,15 +1,15 @@
-[submodule "build"]
-	path = build
-	url = https://github.com/GRaViTY-Tool/gravity-build.git
-	branch = master
-[submodule "evaluation"]
-	path = evaluation
-	url = https://github.com/GRaViTY-Tool/gravity-evaluation.git
-	branch = master
-[submodule "implementation/org.gravity.secdfd"]
-	path = implementation/org.gravity.secdfd
-	url = git@github.com:SvenPeldszus/GRaViTY-SecDFD-Mapping.git
-[submodule "implementation/org.gravity.umlsecrt"]
-	path = implementation/org.gravity.umlsecrt
-	url = git@github.com:CARiSMA-Tool/umlsecrt.git
-
+[submodule "build"]
+	path = build
+	url = https://github.com/GRaViTY-Tool/gravity-build.git
+	branch = master
+[submodule "evaluation"]
+	path = evaluation
+	url = https://github.com/GRaViTY-Tool/gravity-evaluation.git
+	branch = master
+[submodule "implementation/org.gravity.secdfd"]
+	path = implementation/org.gravity.secdfd
+	url = git@github.com:SvenPeldszus/GRaViTY-SecDFD-Mapping.git
+[submodule "implementation/org.gravity.umlsecrt"]
+	path = implementation/org.gravity.umlsecrt
+	url = git@github.com:CARiSMA-Tool/umlsecrt.git
+