Feature/key

.circleci/config.yml

@@ -0,0 +1,88 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/reference/configuration-reference
+version: 2.1
+
+orbs:
+  gradle: circleci/gradle@3.0.0
+
+# Define reusable executors for different OS and JDK combinations
+executors:
+  ubuntu-jdk21:
+    docker:
+      - image: cimg/openjdk:21.0
+    resource_class: large
+  ubuntu-jdk25:
+    docker:
+      - image: cimg/openjdk:25.0
+    resource_class: large
+
+# Define a job for running tests
+# See: https://circleci.com/docs/guides/orchestrate/jobs-steps/#jobs-overview & https://circleci.com/docs/reference/configuration-reference/#jobs
+jobs:
+  gradle_test:
+    resource_class: large
+    parameters:
+      executor_name:
+        type: string
+      jdk_version:
+        type: string
+    executor: << parameters.executor_name >>
+    environment:
+      JDK: << parameters.jdk_version >>
+    steps:
+      # Checkout the code as the first step.
+      - checkout
+
+      # Cache Gradle dependencies between builds
+      - restore_cache:
+          keys:
+            - gradle-cache-{{ checksum "build.gradle.kts" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+            - gradle-cache-
+
+      - run:
+          name: Download dependencies
+          command: ./gradlew dependencies --no-daemon
+
+      - save_cache:
+          paths:
+            - ~/.gradle/wrapper
+            - ~/.gradle/caches
+          key: gradle-cache-{{ checksum "build.gradle.kts" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+
+
+      # Echo exact java version being used
+      - run:
+          name: "Echo exact java version"
+          command: java -version
+
+      # Actually perform the tests with Gradle
+      - run:
+          name: "Test with Gradle"
+          command: |
+            chmod +x ./gradlew
+            ./gradlew --continue --parallel --no-daemon test
+
+      - run:
+          name: Save test results
+          command: |
+            mkdir -p ~/test-results/junit/
+            find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
+          when: always
+      - store_test_results:
+          path: ~/test-results
+
+      # Store test artifacts for reporting
+      - store_artifacts:
+          path: "**/build/reports/tests/*"
+          destination: test-report
+
+# Orchestrate jobs using workflows
+# See: https://circleci.com/docs/guides/orchestrate/workflows/ & https://circleci.com/docs/reference/configuration-reference/#workflows
+workflows:
+  gradle_tests_workflow:
+    jobs:
+      # Ubuntu runners
+      - gradle_test:
+          name: "test-ubuntu-jdk21"
+          executor_name: ubuntu-jdk21
+          jdk_version: "21"

.github/dependabot.yml

@@ -1,18 +1,18 @@
 version: 2
 updates:
-  - package-ecosystem: "maven"
+  - package-ecosystem: "gradle"
     directory: "/"
     schedule:
       interval: "weekly"
     groups:
-      maven-deps:
+      deps:
         patterns:
           - "*"      
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     groups:
-      gh-actions:
+      deps:
         patterns:
           - "*"

.github/workflows/formatting_check.yml

@@ -30,36 +30,44 @@ jobs:
     name: Validate checkstyle
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout latest code
-        uses: actions/checkout@v6.0.2
+      - &checkout
+        name: Checkout latest code
+        uses: actions/checkout@v7
         with:
           fetch-depth: "0"
-      - name: Set up JDK 21
+      - &setupjava
+        name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'zulu'
-          cache: 'maven'
+          cache: 'gradle'
       - name: Validate Project Checkstyle
-        run: ./mvnw -B checkstyle:check
+        run: ./gradlew checkstyleMain
+
+  spotless_check_on_merge:
+    name: Spotless check (after merge)
+    runs-on: ubuntu-latest
+    steps:
+      - *checkout
+      - *setupjava
+      - &codegen
+        name: Generate code and format
+        run: |
+          ./gradlew :jmlparser-core-metamodel-generator:run
+          ./gradlew :jmlparser-core-generators:run
+          ./gradlew spotlessCheck
+          git diff --exit-code
+
 
-  spotless_check:
-    name: Spotless check
+  spotless_check_on_branch:
+    name: Spotless check (on this branch only)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest code
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v7
         with:
           fetch-depth: "0"
-      - name: Set up JDK 21
-        uses: actions/setup-java@v5
-        with:
-          java-version: '21'
-          distribution: 'zulu'
-          cache: 'maven'
-      - name: Generate code and format
-        run: |
-          ./run_core_metamodel_generator.sh
-          # ./run_core_generators.sh automatically runs ./mvnw spotless:apply
-          ./run_core_generators.sh
-          git diff --exit-code
+          ref: ${{github.event.pull_request.head.sha}}
+      - *setupjava
+      - *codegen

.github/workflows/maven_tests.yml → .github/workflows/gradle_tests.yml

@@ -1,7 +1,5 @@
 name: Tests
 
-#on: [push, pull_request]
-#on: [pull_request]
 on:
   # Trigger the workflow on push to master (ignoring .md only changes)
   push:
@@ -15,6 +13,8 @@ on:
   pull_request:
     paths-ignore:
       - '**.md'
+      - doc
+      - dev-files
 
   # Enable manual triggering (important for contributors to enable a check on their fork)
   workflow_dispatch:
@@ -26,18 +26,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  maven_test:
+  gradle_test_on_merge:
     strategy:
       ## Optionally cancel all other combinations if one fails
       fail-fast: false
       matrix:
-        ## Different OSs have different default line-endings -- test on all combinations.
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-        ## Different JDK versions have different implementations etc. -- test on all combinations (ideally 8 to latest).
-        ### exclude pre-8 (min development version jdk8)
+        os: [ ubuntu-latest ] #, macos-latest, windows-latest ]
         jdk: [ 21 ]
 
-
     env:
       OS: ${{ matrix.os }}
       JDK: ${{ matrix.jdk }}
@@ -46,49 +42,71 @@ jobs:
 
     steps:
       ## Checkout the current version of the code from the repo.
-      - name: Checkout latest code
-        uses: actions/checkout@v6.0.2
+      - &checkout
+        name: Checkout latest code
+        uses: actions/checkout@v7
         with:
           fetch-depth: "0"
 
       ## Setup the specified version of Java (includes maven/gradle).
-      - name: Set up JDK ${{ matrix.jdk }}
+      - &setupjava
+        name: Set up JDK ${{ matrix.jdk }}
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'              # v2 requires explicitly stating the distribution - `zulu` and `adopt` supported at time of writing
           java-version: ${{ matrix.jdk }}   # Use matrix to select which JDK level to use
           java-package: jdk                 # optional (jdk or jre) - defaults to jdk
-          cache: 'maven'
+          cache: 'gradle'
 
-      ## Given that the build matrix only specifies the major version (configurable), output the precise version used.
-      - name: Echo exact java version being used
+      - &checkjava
+        name: Echo exact java version being used
         run: java -version
-
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v5
+      - &sonarcache
+        name: Cache SonarCloud packages
+        uses: actions/cache@v6
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-
-
-      ## Actually perform the tests. Unsuccessful tests will indicate a failed build.
-      ### -e, --errors : show traces where any errors occur
-      ### -B,--batch-mode : Run in non-interactive (batch) mode (disables output color)
-      ### clean : run the maven lifecycle stage `clean`
-      ### test : run the maven lifecycle stage `test`
-      ### -P,--activate-profiles : Comma-delimited list of profiles to activate
-      ### AlsoSlowTests : by default, only quick tests are run - the profile `AlsoSlowTests` runs the full test suite
-      - name: Test with Maven (incl. slow tests)
+      - &gradletest
+        name: Test with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: "./mvnw --fail-at-end -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --activate-profiles AlsoSlowTests  -B --errors clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=wadoon_jmlparser"
+        run: |
+          ./gradlew --continue --parallel test
 
-      - name: Test reporting
-        uses: dorny/test-reporter@v2
+      - &report
+        name: Test reporting
+        uses: dorny/test-reporter@v3
         if: success() || failure()
         with:
           name: Test Report
-          path: "**/target/surefire-reports/*.xml"
+          path: "*/build/test-results/test/*.xml"
           reporter: java-junit
+
+  gradle_test_on_branch:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest ] #, macos-latest, windows-latest ]
+        jdk: [ 21 ]
+
+    env:
+      OS: ${{ matrix.os }}
+      JDK: ${{ matrix.jdk }}
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - &checkout
+        name: Checkout latest code
+        uses: actions/checkout@v7
+        with:
+          fetch-depth: "0"
+          ref: ${{github.event.pull_request.head.sha}}
+      - *setupjava
+      - *checkjava
+      - *sonarcache
+      - *gradletest
+      - *report

.gitignore

@@ -22,6 +22,7 @@ hs_err_pid*
 *.ipr
 *.iws
 build-*
+!build-logic
 *.asc
 build
 out