Merge branch 'develop' into feature/learning-paths/refactor-instructo…

…r-view

.github/workflows/validate-pr-title.yml

@@ -0,0 +1,14 @@
+name: Validate PR Title
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review, edited]
+
+jobs:
+  validate-pr-title:
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    steps:
+      - uses: Slashgear/action-check-pr-title@v4.3.0
+        with:
+          regexp: '^`(Programming exercises|Integrated code lifecycle|Quiz exercises|Modeling exercises|Text exercises|File upload exercises|Exam mode|Grading|Assessment|Communication|Notifications|Team exercises|Lectures|Integrated markdown editor|Plagiarism checks|Learning analytics|Adaptive learning|Learning path|Tutorial groups|Iris|Scalability|Usability|Performance|Infrastructure|Mobile apps|Development|General)`:\s[A-Z].*$'

build.gradle

@@ -246,14 +246,15 @@ dependencies {
     implementation "org.gitlab4j:gitlab4j-api:6.0.0-rc.5"
 
     implementation "de.jplag:jplag:${jplag_version}"
-    implementation "de.jplag:java:${jplag_version}"
-    implementation "de.jplag:kotlin:${jplag_version}"
+
     implementation "de.jplag:c:${jplag_version}"
-    implementation "de.jplag:swift:${jplag_version}"
     implementation "de.jplag:java:${jplag_version}"
+    implementation "de.jplag:javascript:${jplag_version}"
+    implementation "de.jplag:kotlin:${jplag_version}"
     implementation "de.jplag:python-3:${jplag_version}"
+    implementation "de.jplag:rlang:${jplag_version}"
     implementation "de.jplag:rust:${jplag_version}"
-    implementation "de.jplag:javascript:${jplag_version}"
+    implementation "de.jplag:swift:${jplag_version}"
     implementation "de.jplag:text:${jplag_version}"
 
     // those are transitive dependencies of JPlag Text --> Stanford NLP
@@ -534,7 +535,7 @@ dependencies {
     testImplementation "org.awaitility:awaitility:4.2.2"
     testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
     testImplementation "org.gradle:gradle-tooling-api:8.10.2"
-    testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.0"
+    testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.1"
     testImplementation "com.opencsv:opencsv:5.9"
     testImplementation("io.zonky.test:embedded-database-spring-test:2.5.1") {
         exclude group: "org.testcontainers", module: "mariadb"

docs/dev/guidelines/database.rst

@@ -295,7 +295,7 @@ Best Practices
         // IrisSubSettings.java
         @Column(name = "allowed_models")
         @Convert(converter = IrisModelListConverter.class)
-        private TreeSet<String> allowedModels = new TreeSet<>();
+        private TreeSet<String> allowedVariants = new TreeSet<>();
 
 
   * **Ordered Collection with duplicates**: When you want to order the collection of (potentially duplicated) objects of the relationship, then always use a ``List``. It is important to note here that there is no inherent order in a database table. One could argue that you can use the ``id`` field for the ordering, but there are edge cases where this can lead to problems. Therefore, for an ordered collection with duplicates, **always** annotate it with ``@OrderColumn``. An order column indicates to Hibernate that we want to order our collection based on a specific column of our data table. By default, the column name it expects is *tablenameS\_order*. For ordered collections, we also recommend that you annotate them with ``cascade = CascadeType.ALL`` and ``orphanRemoval = true``. E.g.:

docs/user/exercises/programming-exercise-features.inc

@@ -37,6 +37,8 @@ Instructors can still use those templates to generate programming exercises and
   +----------------------+----------+---------+
   | JavaScript           | yes      | yes     |
   +----------------------+----------+---------+
+  | R                    | yes      | yes     |
+  +----------------------+----------+---------+
 
 - Not all ``templates`` support the same feature set and supported features can also change depending on the continuous integration system setup.
   Depending on the feature set, some options might not be available during the creation of the programming exercise.
@@ -71,6 +73,8 @@ Instructors can still use those templates to generate programming exercises and
   +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
   | JavaScript           | no                   | no                   | yes                 | no           | n/a                                      | no                           | no                         | L: yes, J: no          |
   +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
+  | R                    | no                   | no                   | yes                 | no           | n/a                                      | no                           | no                         | L: yes, J: no          |
+  +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
 
   - *Sequential Test Runs*: ``Artemis`` can generate a build plan which first executes structural and then behavioral tests. This feature can help students to better concentrate on the immediate challenge at hand.
   - *Static Code Analysis*: ``Artemis`` can generate a build plan which additionally executes static code analysis tools.

gradle.properties

@@ -25,17 +25,17 @@ jplag_version=5.1.0
 # NOTE: we do not need to use the latest version 9.x here as long as Stanford CoreNLP does not reference it
 lucene_version=8.11.4
 slf4j_version=2.0.16
-sentry_version=7.14.0
+sentry_version=7.15.0
 liquibase_version=4.29.2
 docker_java_version=3.4.0
-logback_version=1.5.8
+logback_version=1.5.10
 java_parser_version=3.26.2
-byte_buddy_version=1.15.3
+byte_buddy_version=1.15.4
 
 # testing
 # make sure both versions are compatible
 junit_version=5.11.0
-junit_platform_version=1.11.1
+junit_platform_version=1.11.2
 mockito_version=5.14.1
 
 

jest.config.js

@@ -102,10 +102,10 @@ module.exports = {
     coverageThreshold: {
         global: {
             // TODO: in the future, the following values should increase to at least 90%
-            statements: 87.37,
-            branches: 73.68,
-            functions: 81.93,
-            lines: 87.42,
+            statements: 87.39,
+            branches: 73.60,
+            functions: 81.97,
+            lines: 87.45,
         },
     },
     coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],