Merge branch 'develop' into chore/development/increase-exam-domain-test-coverage

Author: SamuelRoettgermann

.gitignore

@@ -7,6 +7,7 @@
 /src/test/javascript/coverage/
 /src/test/javascript/PhantomJS*/
 /uploads
+/local
 /test-results.xml
 
 ######################
@@ -222,3 +223,4 @@ data-exports/
 ##############################
 /supporting_scripts/**/*.ini
 /legal
+/src/test/resources/config/application-local.yml

.husky/pre-commit

@@ -1 +1 @@
-lint-staged --shell
+lint-staged

.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml

@@ -43,7 +43,7 @@ Artemis brings interactive learning to life with instant, individual feedback on
    * **Multiple diagram types**: Artemis supports 7 UML diagram types (e.g. class diagrams) and 4 additional diagrams (e.g. flow charts)
    * **Easy to use**: Students can create models easily using drag and drop, they can explain the models using additional text.
    * **Integrated feedback**: Reviews can provide feedback and points directly next to the model elements.
-6. **[Text exercises](https://docs.artemis.cit.tum.de/user/exercises/textual/)** with manual, semi-automatic assessment based on supervised machine learning and natural language processing (NLP) using [Athena](https://github.com/ls1intum/Athena)
+6. **[Text exercises](https://docs.artemis.cit.tum.de/user/exercises/textual/)** with manual, semi-automatic assessment based on supervised machine learning and natural language processing (NLP) using [Athena](https://github.com/ls1intum/edutelligence/tree/main/athena)
    * **Integrated feedback**: Reviews can provide feedback and points directly next to the text segments.
    * **Language detection**: Artemis detects the language of the submission and shows the word and character count. 
 7. **[File upload exercises](https://docs.artemis.cit.tum.de/user/exercises/file-upload/)** allow full flexibility to instructors. Students can create any kind of file (e.g. PDF, PNG) and submit it to Artemis when they have completed their work. Artemis allows instructors and tutors to download the files and assess them manually based on structured grading criteria (see below in the section Assessment).
@@ -59,14 +59,25 @@ Artemis brings interactive learning to life with instant, individual feedback on
     * **[Adaptive learning](https://docs.artemis.cit.tum.de/user/adaptive-learning)**: Artemis allows instructors and students to define and track competencies. Students can monitor their progress towards these goals, while instructors can provide tailored feedback. This approach integrates lectures and exercises under overarching learning objectives. 
     * **[Learning analytics](https://docs.artemis.cit.tum.de/user/learning-analytics)**: Artemis integrated different statistics for students to compare themselves to the course average. It allows instructors to evaluate the average student performance based on exercises and competencies. 
     * **[Learning paths](https://docs.artemis.cit.tum.de/user/adaptive-learning/adaptive-learning-student.html#learning-paths)**: Based on the competency model and students' individual progress, Artemis creates learning paths that guide students through the course content.
-13. **[Iris](https://artemis.tum.de/about-iris)**: Artemis integrates Iris, a LLM based virtual assistant that supports students and instructors with common questions and tasks.
+13. **[Iris](https://github.com/ls1intum/edutelligence/tree/main/iris)**: Artemis integrates Iris, a LLM based virtual assistant that supports students and instructors with common questions and tasks.
     * **Questions**: Iris supports students with answering questions about exercises, lectures, and the learning performance instantly.
     * **Pro-active assistance**: Iris can pro-actively communicate with the students, help them with the next steps in their learning experience and motivate them to continue.
-14. **[Athena](https://github.com/ls1intum/Athena)**: Artemis integrates Athena, a machine learning-based tool that supports instructors with the assessment of text, modeling and programming exercises. Athena offers different modules including automatic feedback suggestions based on generate AI. 
+14. **[Athena](https://github.com/ls1intum/edutelligence/tree/main/athena)**: Artemis integrates Athena, a machine learning-based tool that supports instructors with the assessment of text, modeling and programming exercises. Athena offers different modules including automatic feedback suggestions based on generative AI. 
 15. **[Tutorial groups](https://docs.artemis.cit.tum.de/user/tutorialgroups/)**: Artemis supports the management of tutorial groups of a course. This includes planning the sessions, assigning responsible tutors, registering students and tracking the attendance.
 16. **[Plagiarism checks](https://docs.artemis.cit.tum.de/user/plagiarism-check/)**: Artemis integrates plagiarism checks for programming exercises (based on [JPlag](https://github.com/jplag/JPlag)), text exercises, and modeling exercises in courses and exams. It allows notifying students about identified plagiarism. Students can review and comment on the allegation.
 17. **[LTI](https://docs.artemis.cit.tum.de/user/lti)**: Artemis supports the Learning Tools Interoperability (LTI) standard to integrate Artemis into other learning management systems (LMS) such as Moodle and edX.
 
+## EduTelligence Integration
+
+Artemis integrates with the [EduTelligence suite](https://github.com/ls1intum/edutelligence), a comprehensive collection of AI-powered microservices designed to enhance educational technology platforms. EduTelligence provides:
+
+* **Iris** - AI Virtual Tutor powered by Pyris for intelligent student assistance
+* **Athena** - Automated assessment system for text, modeling, and programming exercises
+
+Additional services are available in the EduTelligence suite for advanced deployments. For detailed information about all available services, please refer to the [EduTelligence repository](https://github.com/ls1intum/edutelligence).
+
+**Compatibility**: EduTelligence maintains compatibility with different versions of Artemis. Please refer to the [compatibility matrix](https://github.com/ls1intum/edutelligence#-artemis-compatibility) to ensure you're using compatible versions for optimal integration and functionality.
+
 ## Additional features and aspects
 
 1. **[Integrated markdown editor](https://docs.artemis.cit.tum.de/user/markdown-support/)**: Markdown is used to format text content across the platform using an integrated markdown editor.
@@ -191,7 +202,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
 The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):
 
 ```shell
-./artemis-server-cli deploy [email protected] -w build/libs/Artemis-8.0.8.war
+./artemis-server-cli deploy [email protected] -w build/libs/Artemis-8.1.4.war
 ```
 
 ## Architecture

.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI__Iris_.xml

@@ -3,7 +3,7 @@ buildscript {
         classpath "com.diffplug.spotless:spotless-plugin-gradle:${spotless_plugin_version}"
         // This is required so that the latest version of the liquibase gradle plugin works
         classpath("org.liquibase:liquibase-core:${liquibase_version}") {
-            exclude group: 'com.opencsv', module: 'opencsv'
+            exclude group: "com.opencsv", module: "opencsv"
         }
     }
 }
@@ -28,7 +28,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "8.0.8"
+version = "8.1.4"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -147,6 +147,9 @@ configurations.configureEach {
     // JPlag depends on those, but they are not really needed
     exclude group: "org.jgrapht", module: "jgrapht-core"
     exclude group: "org.apfloat", module: "apfloat"
+    exclude group: "xom", module: "xom"
+
+    exclude group: "commons-configuration", module: "commons-configuration"
 
     // only support one csv parser org.apache.commons:commons-csv
 //    exclude group: "com.opencsv", module: "opencsv"
@@ -155,7 +158,7 @@ configurations.configureEach {
 dependencies {
 
     // Required by Spring cloud
-    implementation "org.apache.httpcomponents.client5:httpclient5:5.4.4"
+    implementation "org.apache.httpcomponents.client5:httpclient5:5.5"
     implementation "org.apache.httpcomponents.core5:httpcore5:5.3.4"
     implementation "org.apache.httpcomponents:httpmime:4.5.14"
 
@@ -276,16 +279,20 @@ dependencies {
     runtimeOnly "com.hazelcast:hazelcast-hibernate53:5.2.0"
 
     implementation "org.hibernate.orm:hibernate-core:${hibernate_version}"
+    implementation "org.hibernate.orm:hibernate-envers:${hibernate_version}"
 
     // Required for jdbc connection pooling to databases
     implementation "com.zaxxer:HikariCP:6.3.0"
 
     // Required for several dependencies
     implementation "org.apache.commons:commons-text:1.13.1"
     implementation "org.apache.commons:commons-math3:3.6.1"
+    implementation "org.apache.commons:commons-lang3:3.17.0"
+    // required by eureka, but actually superseded by commons-lang3 above
+    implementation "commons-lang:commons-lang:2.6"
 
     implementation("org.liquibase:liquibase-core:${liquibase_version}") {
-        exclude group: 'com.opencsv', module: 'opencsv'
+        exclude group: "com.opencsv", module: "opencsv"
     }
 
     implementation "org.springframework.boot:spring-boot-starter-validation:${spring_boot_version}"
@@ -306,29 +313,29 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client:${spring_boot_version}"
 
     implementation "org.springframework.data:spring-data-ldap:${spring_boot_version}"
-    implementation "org.springframework.ldap:spring-ldap-core:3.2.12"
+    implementation "org.springframework.ldap:spring-ldap-core:3.3.0"
 
     implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${spring_cloud_version}"
     implementation "org.springframework.cloud:spring-cloud-starter-config:4.2.2"
     implementation "org.springframework.cloud:spring-cloud-commons:${spring_cloud_version}"
 
     // required by the Websocket Broker Connection in WebsocketConfiguration (due to multi node setup support)
-    implementation "io.projectreactor.netty:reactor-netty-core:1.2.5"
+    implementation "io.projectreactor.netty:reactor-netty-core:1.2.6"
     implementation "org.springframework:spring-messaging:${spring_framework_version}"
     // required for the connection to Hermes (push notifications)
-    implementation "org.springframework.retry:spring-retry:2.0.11"
+    implementation "org.springframework.retry:spring-retry:2.0.12"
 
     // passkey functionality to simplify login
-    implementation "com.webauthn4j:webauthn4j-spring-security-core:0.11.0.RELEASE"
-    implementation 'com.webauthn4j:webauthn4j-core:0.29.1.RELEASE'
+    implementation "com.webauthn4j:webauthn4j-spring-security-core:0.11.2.RELEASE"
+    implementation "com.webauthn4j:webauthn4j-core:0.29.2.RELEASE"
 
     implementation "org.springframework.security:spring-security-config:${spring_security_version}"
     implementation "org.springframework.security:spring-security-data:${spring_security_version}"
     implementation "org.springframework.security:spring-security-core:${spring_security_version}"
     implementation "org.springframework.security:spring-security-oauth2-core:${spring_security_version}"
     implementation "org.springframework.security:spring-security-oauth2-client:${spring_security_version}"
     // use newest version of nimbus-jose-jwt to avoid security issues through outdated dependencies
-    implementation "com.nimbusds:nimbus-jose-jwt:10.2"
+    implementation "com.nimbusds:nimbus-jose-jwt:10.3"
 
     implementation "org.springframework.security:spring-security-oauth2-jose:${spring_security_version}"
     implementation "org.springframework.security:spring-security-crypto:${spring_security_version}"
@@ -378,7 +385,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.13.1"
 
     // explicitly only use this at runtime, because developers should prefer org.apache.commons:csv
-    runtimeOnly "com.opencsv:opencsv:5.10"
+    runtimeOnly "com.opencsv:opencsv:5.11"
 
 
     implementation "com.google.errorprone:error_prone_annotations:2.38.0"
@@ -390,7 +397,8 @@ dependencies {
     implementation("net.bytebuddy:byte-buddy-agent") { version {        strictly byte_buddy_version } }
     annotationProcessor("net.bytebuddy:byte-buddy-agent") { version {   strictly byte_buddy_version } }
 
-    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}"
+    annotationProcessor "org.hibernate.orm:hibernate-jpamodelgen:${hibernate_version}"
+    annotationProcessor "org.hibernate.orm:hibernate-core:${hibernate_version}"
     annotationProcessor "org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}"
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${spring_boot_version}"
 
@@ -419,17 +427,17 @@ dependencies {
     testImplementation "io.github.classgraph:classgraph:4.8.179"
     testImplementation "org.awaitility:awaitility:4.3.0"
     testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
-    testImplementation "org.gradle:gradle-tooling-api:8.14"
+    testImplementation "org.gradle:gradle-tooling-api:8.14.1"
     testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.3"
     testImplementation "io.zonky.test:embedded-database-spring-test:2.6.0"
 
-    testImplementation "com.tngtech.archunit:archunit:1.4.0"
+    testImplementation "com.tngtech.archunit:archunit:1.4.1"
     testImplementation "org.skyscreamer:jsonassert:1.5.3"
 
     testImplementation "com.h2database:h2:2.3.232"
 
     // Lightweight JSON library needed for the internals of the MockRestServiceServer
-    testImplementation "org.json:json:20250107"
+    testImplementation "org.json:json:20250517"
 
     testImplementation "org.junit.jupiter:junit-jupiter:${junit_version}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}"
@@ -442,7 +450,7 @@ dependencies {
     testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 }
 
-// we have to apply the test.gradle file after the dependencies block, otherwise we get the error  Cannot change dependencies of dependency configuration ':mockitoAgent' after it has been resolved
+// we have to apply the test.gradle file after the dependencies block, otherwise we get the error  Cannot change dependencies of dependency configuration ":mockitoAgent" after it has been resolved
 apply from: "gradle/test.gradle"
 
 
@@ -478,8 +486,8 @@ checkstyle {
 }
 
 gradleLint {
-    rules  = ['dependency-parentheses']
-//    criticalRules = ['unused-dependency'] // <-- this will fail the build in the event of a violation
+    rules  = ["dependency-parentheses"]
+//    criticalRules = ["unused-dependency"] // <-- this will fail the build in the event of a violation
 }
 
 

.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI__Theia_.xml

@@ -35,7 +35,6 @@ JHIPSTER_SECURITY_AUTHENTICATION_JWT_TOKENVALIDITYINSECONDSFORREMEMBERME="259200
 
 # Properties to be exposed on the /info management endpoint
 
-INFO_IMPRINT="https://ase.in.tum.de/lehrstuhl_1/component/content/article/179-imprint"
 INFO_TESTSERVER="true"
 INFO_TEXTASSESSMENTANALYTICSENABLED="true"
 INFO_STUDENTEXAMSTORESESSIONDATA="true"

README.md

@@ -6,7 +6,7 @@ services:
     nginx:
         # nginx setup based on artemis prod ansible repository
         container_name: artemis-nginx
-        image: docker.io/library/nginx:1.27.4
+        image: docker.io/library/nginx:1.28.0-alpine-slim
         pull_policy: missing
         volumes:
             - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro

build.gradle

@@ -1,4 +1,4 @@
-# default config /etc/nginx/nginx.conf from the nginx:1.27.3 docker image
+# default config /etc/nginx/nginx.conf from the nginx:1.28.0-alpine-slim docker image
 # comment specific Artemis changes!
 
 user  nginx;

docker/artemis/config/playwright.env

@@ -3,17 +3,33 @@
 Setup of Extension Services
 ===========================
 
-This section describes the required setup for various extension services like 'Athena', 'Hermes', 'Iris',
-and 'Apollon' that can be used to activate additional functionality in your Artemis instance.
+This section describes the required setup for various extension services that can be used to activate additional functionality in your Artemis instance.
+
+EduTelligence Suite
+-------------------
+
+EduTelligence is a comprehensive suite of AI-powered microservices designed to enhance Artemis with intelligent features. Some of the AI-powered services that integrate with Artemis are now part of this unified suite.
+
+**Compatibility**: EduTelligence maintains compatibility with different versions of Artemis. Please refer to the `compatibility matrix <https://github.com/ls1intum/edutelligence#-artemis-compatibility>`_ to ensure you're using compatible versions for optimal integration and functionality.
+
+**Repository**: `https://github.com/ls1intum/edutelligence <https://github.com/ls1intum/edutelligence>`_
 
 .. toctree::
    :includehidden:
    :maxdepth: 2
 
-   setup/text-assessment-analytics
+   setup/iris
+   setup/pyris
    setup/athena
+
+Other Extension Services
+------------------------
+
+.. toctree::
+   :includehidden:
+   :maxdepth: 2
+
+   setup/text-assessment-analytics
    setup/apollon
    setup/hermes
-   setup/iris
-   setup/pyris
    setup/aeolus