Merge branch 'develop' into feature/exam-mode/iPad-attendance-checker-endpoints

Author: SamuelRoettgermann

.github/workflows/bean-instantiations.yml

@@ -17,7 +17,7 @@ jobs:
       MAX_STARTUP_DEPENDENCY_CHAIN_LENGTH: 9
       MAX_DEFERRED_CHAIN_LENGTH: 16
       MIN_INSTANTIATED_BEANS: 20
-      MAX_INSTANTIATED_BEANS: 100
+      MAX_INSTANTIATED_BEANS: 102
       MIN_DEFERRED_CHAIN_LENGTH: 1
 
     steps:

.github/workflows/quality.yml

@@ -35,7 +35,7 @@ jobs:
           complex_beans=$(echo "$output" | grep -o "Found [0-9]* Spring beans with constructors having more than" | grep -o "[0-9]*")
 
           # TODO these values should become zero in the future
-          max_large_classes=9
+          max_large_classes=11
           max_complex_beans=10
 
           echo "=========================================="

README.md

@@ -205,7 +205,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.5.0.war
+./artemis-server-cli deploy [email protected] -w build/libs/Artemis-8.5.1.war
 ```
 
 ## Architecture

build.gradle

@@ -19,20 +19,20 @@ plugins {
     id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
     id "com.github.ben-manes.versions" version "0.53.0"
     id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
-    id "com.google.cloud.tools.jib" version "3.4.5"
+    id "com.google.cloud.tools.jib" version "3.5.0"
     id "com.gorylenko.gradle-git-properties" version "2.5.3"
     id "io.spring.dependency-management" version "1.1.7"
     id "nebula.lint" version "21.1.3"
     id "org.liquibase.gradle" version "${liquibase_plugin_version}"
-    id "org.owasp.dependencycheck" version "12.1.8"
+    id "org.owasp.dependencycheck" version "12.1.9"
     id "org.springframework.boot" version "${spring_boot_version}"
     id "org.springdoc.openapi-gradle-plugin" version "1.9.0"
     id "org.openapi.generator" version "7.17.0"
     id "com.google.osdetector" version "1.7.3"
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "8.5.0"
+version = "8.5.1"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -166,7 +166,7 @@ dependencies {
     implementation "org.apache.httpcomponents:httpmime:4.5.14"
 
     implementation "jakarta.ws.rs:jakarta.ws.rs-api:4.0.0"
-    implementation "org.glassfish.jersey.core:jersey-common:3.1.11"
+    implementation "org.glassfish.jersey.core:jersey-common:4.0.0"
 
     implementation "de.jplag:jplag:${jplag_version}"
 
@@ -184,8 +184,14 @@ dependencies {
     implementation "de.jplag:text:${jplag_version}"
     implementation "de.jplag:typescript:${jplag_version}"
 
-    implementation platform("org.springframework.ai:spring-ai-bom:1.0.3")
+    // Align all Spring AI modules to the same version
+    implementation platform("org.springframework.ai:spring-ai-bom:1.1.0")
+    // Azure OpenAI (prod, or when you want Azure)
     implementation "org.springframework.ai:spring-ai-starter-model-azure-openai" // can also use non-azure models
+    implementation "org.springframework.ai:spring-ai-starter-model-chat-memory-repository-jdbc"
+    // OpenAI / OpenAI-compatible (dev, localhost:1234, etc.)
+    implementation "org.springframework.ai:spring-ai-starter-model-openai"
+
 
     // we have to override those values to use the latest version
     implementation "org.slf4j:jcl-over-slf4j:${slf4j_version}"
@@ -214,8 +220,9 @@ dependencies {
     implementation "org.apache.sshd:sshd-osgi:${sshd_version}"
     implementation "org.apache.sshd:sshd-sftp:${sshd_version}"
 
-    // https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml
-    implementation "net.sourceforge.plantuml:plantuml:1.2025.9"
+    // Allows generating UML diagrams from text descriptions in problem statement markdown files for programming exercises
+    implementation "net.sourceforge.plantuml:plantuml-mit:1.2025.10"
+
     implementation "me.xdrop:fuzzywuzzy:1.4.0"
     implementation("org.yaml:snakeyaml") {
         version {
@@ -237,7 +244,7 @@ dependencies {
 
     implementation "org.jsoup:jsoup:1.21.2"
     // needed by e.g. spring security saml2, we explicitly use the newest version to avoid security vulnerabilities
-    implementation "commons-codec:commons-codec:1.19.0"
+    implementation "commons-codec:commons-codec:1.20.0"
 
     // use the latest version to avoid security vulnerabilities
     implementation "org.springframework:spring-aop:${spring_framework_version}"
@@ -273,7 +280,7 @@ dependencies {
     implementation "io.micrometer:micrometer-jakarta9:${micrometer_version}"
 
     // Prometheus requires the protobuf-java dependency, but we explicitly use the latest version to avoid security vulnerabilities
-    implementation "com.google.protobuf:protobuf-java:4.33.0"
+    implementation "com.google.protobuf:protobuf-java:4.33.1"
 
     implementation "tech.jhipster:jhipster-framework:${jhipster_dependencies_version}"
 
@@ -339,6 +346,8 @@ dependencies {
     implementation "org.apache.commons:commons-text:${commons_text_version}"
     implementation "org.apache.commons:commons-math3:3.6.1"
     implementation "org.apache.commons:commons-lang3:${commons_lang3_version}"
+    implementation "org.apache.commons:commons-collections4:4.5.0"
+
     // required by eureka, but actually superseded by commons-lang3 above
     implementation "commons-lang:commons-lang:2.6"
 
@@ -376,29 +385,33 @@ dependencies {
     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.11"
+    // Note: this should be upgraded to 1.3.x when Spring is updated to 4.x
+    implementation "io.projectreactor.netty:reactor-netty-core:1.2.12"
 
     // required for the connection to Hermes (push notifications)
     implementation "org.springframework.retry:spring-retry:2.0.12"
 
     // passkey functionality to simplify login
     implementation "com.webauthn4j:webauthn4j-spring-security-core:0.11.2.RELEASE"
-    implementation "com.webauthn4j:webauthn4j-core:0.29.7.RELEASE"
+    implementation "com.webauthn4j:webauthn4j-core:0.30.0.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.5"
+    implementation "com.nimbusds:nimbus-jose-jwt:10.6"
 
     implementation "org.springframework.security:spring-security-oauth2-jose:${spring_security_version}"
     implementation "org.springframework.security:spring-security-crypto:${spring_security_version}"
     implementation "org.springframework.security:spring-security-web:${spring_security_version}"
     implementation "org.springframework.security:spring-security-messaging:${spring_security_version}"
     implementation "org.springframework.security:spring-security-ldap:${spring_security_version}"
 
+    // Nullable annotations for improved static analysis
+    implementation "org.jspecify:jspecify:1.0.0"
+
     // Helios push-based status updates
     implementation "de.tum.cit.aet:helios-status-spring-starter:${helios_status_version}"
 
@@ -446,12 +459,13 @@ dependencies {
     // make sure to use the latest version to avoid security vulnerabilities
     runtimeOnly "commons-beanutils:commons-beanutils:1.11.0"
     checkstyle "commons-beanutils:commons-beanutils:1.11.0"
+
     checkstyle "org.apache.commons:commons-lang3:${commons_lang3_version}"
     checkstyle "org.apache.commons:commons-text:${commons_text_version}"
 
-    implementation "com.google.errorprone:error_prone_annotations:2.43.0"
+    implementation "com.google.errorprone:error_prone_annotations:2.44.0"
     // needed for OpenAPI generation
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.14"
 
 
     // NOTE: we want to keep the same unique version for all configurations, implementation and annotationProcessor
@@ -466,7 +480,7 @@ dependencies {
     annotationProcessor "org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}"
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${spring_boot_version}"
 
-    implementation "org.mnode.ical4j:ical4j:4.2.0"
+    implementation "org.mnode.ical4j:ical4j:4.2.1"
 
 
     // ---- CHECKSTYLE DEPENDENCIES ----
@@ -496,7 +510,7 @@ dependencies {
     testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
     testImplementation "org.gradle:gradle-tooling-api:9.2.0"
     testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.4"
-    testImplementation "io.zonky.test:embedded-database-spring-test:2.6.0"
+    testImplementation "io.zonky.test:embedded-database-spring-test:2.7.0"
     testImplementation "com.redis:testcontainers-redis:2.2.4"
     testImplementation "com.tngtech.archunit:archunit:1.4.1"
     testImplementation "org.skyscreamer:jsonassert:1.5.3"
@@ -513,9 +527,9 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}"
 
     // NOTE: make sure this corresponds to the version used for JUnit in the testImplementation
-    testImplementation "org.junit.platform:junit-platform-commons:${junit_platform_version}"
-    testImplementation "org.junit.platform:junit-platform-engine:${junit_platform_version}"
-    testImplementation "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    testImplementation "org.junit.platform:junit-platform-commons:${junit_version}"
+    testImplementation "org.junit.platform:junit-platform-engine:${junit_version}"
+    testImplementation "org.junit.platform:junit-platform-launcher:${junit_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

docs/admin/setup/pyris.rst

@@ -15,7 +15,7 @@ Overview
 
 Iris is an intelligent virtual tutor integrated into Artemis, providing one-on-one programming assistance, course content support,
 and competency generation for students. Iris relies on Pyris, an intermediary service from the EduTelligence suite that brokers
-requests to Large Language Models (LLMs) via a FastAPI backend.
+requests to Large Language Models (LLMs) using FastAPI.
 
 This guide consolidates everything you need to configure both Artemis and Pyris so they communicate securely and reliably.
 

docs/dev/guidelines/database.rst

@@ -223,7 +223,7 @@ In order to load the relationships of an entity on demand, we then use one of 3
 
 
     // ProgrammingExerciseRepository.java
-    @NotNull
+    @NonNull
     default ProgrammingExercise findByIdWithDynamicFetchElseThrow(long exerciseId, Collection<ProgrammingExerciseFetchOptions> fetchOptions) throws EntityNotFoundException {
         var specification = getDynamicSpecification(fetchOptions);
         return findOneByIdElseThrow(specification, exerciseId, "Programming Exercise");

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

@@ -106,12 +106,30 @@ Generate programming exercise
     - **Sequential Test Runs:** Activate this option to first run structural and then behavior tests.
       This feature allows students to better concentrate on the immediate challenge at hand.
       Not supported together with static code analysis. Cannot be changed after the exercise creation.
-    - **Customize Build Plan** Activate this option if you want to customize the build plan of your exercise.
+    - **Customize Build Plan:** Activate this option if you want to customize the build plan of your exercise.
       This feature is available for all programming languages, and works with LocalCI and Jenkins, Artemis provides templates for the build plan configuration.
       The build plan can also be customized after the exercise creation.
 
     |
 
+    .. figure:: programming/programming-options-version-control.png
+              :align: center
+
+    - **Allow Custom Branches:** Activate this option if students should be able to push (to) other branches than the default one.
+
+      .. warning::
+
+          Artemis does not show those branches in the UI, and also offers no merge support in the UI.
+
+      Pushing to other (non-default) branches does not trigger any builds, and does not create submissions.
+      Students are therefore fully responsible for managing their branches locally. Further features that deal with branches
+      in the Artemis UI are out of scope and will not be implemented in the future.
+      Please only activate this option if it is absolutely necessary!
+
+    - **Regular Expression for the branch name:** The custom branch name is matched against this Java regular expression and pushing is only allowed, if it matches.
+
+    |
+
     .. figure:: programming/programming-options-score.png
               :align: center
 

docs/user/exercises/programming/programming-options-version-control.png

@@ -8,9 +8,9 @@
 version: 2
 
 build:
-  os: "ubuntu-22.04"
+  os: "ubuntu-24.04"
   tools:
-    nodejs: "20"
+    nodejs: "22"
   commands:
     # Install dependencies
     - cd documentation && npm ci

documentation/.readthedocs.yaml

@@ -160,15 +160,15 @@ const config: Config = {
                     items: [
                         {
                             label: 'AET Website',
-                            href: 'https://aet.cit.tum.de/',
+                            href: 'https://aet.cit.tum.de',
                         },
                         {
                             label: 'AET LinkedIn',
-                            href: 'https://www.linkedin.com/company/tumaet/posts/?feedView=all',
+                            href: 'https://www.linkedin.com/company/tumaet',
                         },
                         {
                             label: 'AET Instagram',
-                            href: 'https://www.instagram.com/tum.aet/',
+                            href: 'https://www.instagram.com/tum.aet',
                         },
                     ],
                 },
@@ -199,7 +199,7 @@ const config: Config = {
                     ],
                 },
             ],
-            copyright: `© 2025 Technische Universität München – Built with ❤️ by the Artemis Team at Applied Education Technologies (AET)`,
+            copyright: `© 2025 Technical University of Munich – Built with ❤️ by the Artemis Team at Applied Education Technologies (AET)`,
         },
         prism: {
             theme: prismThemes.github,