Merge branch 'develop' into pe/update-dependencies

build.gradle

@@ -26,7 +26,7 @@ plugins {
     // this allows us to find outdated dependencies via ./gradlew dependencyUpdates
     id "com.github.ben-manes.versions" version "0.51.0"
     id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
-    id "com.gorylenko.gradle-git-properties" version "2.4.1"
+    id "com.gorylenko.gradle-git-properties" version "2.4.2"
     id "org.owasp.dependencycheck" version "9.1.0"
     id "com.adarshr.test-logger" version "4.0.0"
 }
@@ -184,13 +184,13 @@ jacocoTestCoverageVerification {
                 counter = "INSTRUCTION"
                 value = "COVEREDRATIO"
                 // TODO: in the future the following value should become higher than 0.92
-                minimum = 0.897
+                minimum = 0.899
             }
             limit {
                 counter = "CLASS"
                 value = "MISSEDCOUNT"
                 // TODO: in the future the following value should become less than 10
-                maximum = 25
+                maximum = 26
             }
         }
     }
@@ -304,7 +304,7 @@ dependencies {
     implementation "org.apache.santuario:xmlsec:4.0.2"
 
     implementation "org.jsoup:jsoup:1.17.2"
-    implementation "commons-codec:commons-codec:1.16.1"   // needed for spring security saml2
+    implementation "commons-codec:commons-codec:1.17.0"   // needed for spring security saml2
 
     implementation "org.springdoc:springdoc-openapi-ui:1.8.0"
     implementation "com.vdurmont:semver4j:3.1.0"
@@ -409,7 +409,7 @@ dependencies {
         exclude module: "mapstruct"
     }
     implementation "io.springfox:springfox-bean-validators:3.0.0"
-    implementation "com.mysql:mysql-connector-j:8.3.0"
+    implementation "com.mysql:mysql-connector-j:8.4.0"
     implementation "org.postgresql:postgresql:42.7.3"
     implementation "com.h2database:h2:2.2.224"
 
@@ -426,7 +426,7 @@ dependencies {
     implementation "net.lingala.zip4j:zip4j:2.11.5"
     implementation "org.jgrapht:jgrapht-core:1.5.2"
     // use newest version of guava to avoid security issues through outdated dependencies
-    implementation "com.google.guava:guava:33.1.0-jre"
+    implementation "com.google.guava:guava:33.2.0-jre"
 
     // use newest version of gson to avoid security issues through outdated dependencies
     implementation "com.google.code.gson:gson:2.10.1"
@@ -459,7 +459,7 @@ dependencies {
     testImplementation "org.assertj:assertj-core:3.25.3"
     testImplementation "org.mockito:mockito-core:${mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
-    testImplementation "io.github.classgraph:classgraph:4.8.170"
+    testImplementation "io.github.classgraph:classgraph:4.8.171"
     testImplementation "org.awaitility:awaitility:4.2.1"
     testImplementation "org.apache.maven.shared:maven-invoker:3.2.0"
     testImplementation "org.gradle:gradle-tooling-api:8.7"

docker/artemis/config/cypress-local.env

@@ -5,7 +5,7 @@
 SPRING_PROFILES_ACTIVE="artemis,scheduling,localvc,localci,buildagent,core,prod,docker"
 
 ARTEMIS_USERMANAGEMENT_USEEXTERNAL="false"
-ARTEMIS_VERSIONCONTROL_URL='https://localhost'
+ARTEMIS_VERSIONCONTROL_URL='http://localhost:8080'
 ARTEMIS_VERSIONCONTROL_USER='demo'
 ARTEMIS_VERSIONCONTROL_PASSWORD='demo'
 ARTEMIS_CONTINUOUSINTEGRATION_ARTEMISAUTHENTICATIONTOKENVALUE='demo'

docker/playwright-E2E-tests-mysql-localci.yml

@@ -33,10 +33,10 @@ services:
         volumes:
             - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
         ports:
-            - "80:80"
-            - "443:443"
+            - '80:80'
+            - '443:443'
             # see comments in artemis/config/cypress.env why this port is necessary
-            - "54321:54321"
+            - '54321:54321'
 
     artemis-playwright:
         extends:
@@ -46,7 +46,7 @@ services:
             artemis-app:
                 condition: service_healthy
         environment:
-            PLAYWRIGHT_DB_TYPE: "MySQL"
+            PLAYWRIGHT_DB_TYPE: 'MySQL'
         command: >
             sh -c '
             cd /app/artemis/src/test/playwright &&
@@ -58,7 +58,7 @@ services:
 
 networks:
     artemis:
-        driver: "bridge"
+        driver: 'bridge'
         name: artemis
 volumes:
     artemis-mysql-data:

docker/playwright-E2E-tests-mysql.yml

@@ -30,10 +30,10 @@ services:
         volumes:
             - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
         ports:
-            - "80:80"
-            - "443:443"
+            - '80:80'
+            - '443:443'
             # see comments in artemis/config/cypress.env why this port is necessary
-            - "54321:54321"
+            - '54321:54321'
 
     artemis-playwright:
         extends:
@@ -43,7 +43,7 @@ services:
             artemis-app:
                 condition: service_healthy
         environment:
-            PLAYWRIGHT_DB_TYPE: "MySQL"
+            PLAYWRIGHT_DB_TYPE: 'MySQL'
         command: >
             sh -c '
             chmod 777 /root &&
@@ -55,7 +55,7 @@ services:
 
 networks:
     artemis:
-        driver: "bridge"
+        driver: 'bridge'
         name: artemis
 volumes:
     artemis-mysql-data:

docker/playwright-E2E-tests-postgres.yml

@@ -31,10 +31,10 @@ services:
         volumes:
             - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
         ports:
-            - "80:80"
-            - "443:443"
+            - '80:80'
+            - '443:443'
             # see comments in artemis/config/cypress.env why this port is necessary
-            - "54321:54321"
+            - '54321:54321'
 
     artemis-playwright:
         extends:
@@ -44,7 +44,7 @@ services:
             artemis-app:
                 condition: service_healthy
         environment:
-            PLAYWRIGHT_DB_TYPE: "Postgres"
+            PLAYWRIGHT_DB_TYPE: 'Postgres'
         command: >
             sh -c '
             chmod 777 /root &&
@@ -56,7 +56,7 @@ services:
 
 networks:
     artemis:
-        driver: "bridge"
+        driver: 'bridge'
         name: artemis
 volumes:
     artemis-postgres-data:

docker/playwright.yml

@@ -7,20 +7,21 @@ services:
         image: mcr.microsoft.com/playwright:v1.40.0-jammy
         pull_policy: if_not_present
         environment:
-            BASE_URL: "https://artemis-nginx"
-            ADMIN_USERNAME: "${bamboo_artemis_admin_username}"
-            ADMIN_PASSWORD: "${bamboo_artemis_admin_password}"
-            PLAYWRIGHT_USERNAME_TEMPLATE: "${bamboo_playwright_username_template}"
-            PLAYWRIGHT_PASSWORD_TEMPLATE: "${bamboo_playwright_password_template}"
-            ALLOW_GROUP_CUSTOMIZATION: "true"
-            STUDENT_GROUP_NAME: "artemis-e2etest-students"
-            TUTOR_GROUP_NAME: "artemis-e2etest-tutors"
-            EDITOR_GROUP_NAME: "artemis-e2etest-editors"
-            INSTRUCTOR_GROUP_NAME: "artemis-e2etest-instructors"
-            CREATE_USERS: "${bamboo_playwright_create_users}"
-            TEST_TIMEOUT_SECONDS: "${bamboo_test_timeout_seconds}"
-            TEST_RETRIES: "${bamboo_test_retries}"
-            TEST_WORKER_PROCESSES: "${bamboo_test_worker_processes}"
+            CI: 'true'
+            BASE_URL: 'https://artemis-nginx'
+            ADMIN_USERNAME: '${bamboo_artemis_admin_username}'
+            ADMIN_PASSWORD: '${bamboo_artemis_admin_password}'
+            PLAYWRIGHT_USERNAME_TEMPLATE: '${bamboo_playwright_username_template}'
+            PLAYWRIGHT_PASSWORD_TEMPLATE: '${bamboo_playwright_password_template}'
+            ALLOW_GROUP_CUSTOMIZATION: 'true'
+            STUDENT_GROUP_NAME: 'artemis-e2etest-students'
+            TUTOR_GROUP_NAME: 'artemis-e2etest-tutors'
+            EDITOR_GROUP_NAME: 'artemis-e2etest-editors'
+            INSTRUCTOR_GROUP_NAME: 'artemis-e2etest-instructors'
+            CREATE_USERS: '${bamboo_playwright_create_users}'
+            TEST_TIMEOUT_SECONDS: '${bamboo_test_timeout_seconds}'
+            TEST_RETRIES: '${bamboo_test_retries}'
+            TEST_WORKER_PROCESSES: '${bamboo_test_worker_processes}'
         command: sh -c "cd /app/artemis/src/test/playwright && chmod 777 /root && npm ci && npm run playwright:test"
         volumes:
             - ..:/app/artemis
@@ -32,5 +33,5 @@ services:
 
 networks:
     artemis:
-        driver: "bridge"
+        driver: 'bridge'
         name: artemis

docs/dev/guidelines/language-guidelines.rst

@@ -52,6 +52,7 @@ The German language is mainly used for user interaction.
 **Best practices** (written in German for demonstration purposes)
 
 * **Nutze neutrale Formulierungen**: Wenn möglich ist es empfehlenswert, neutrale Formulierungen zu finden. Neben passiven Formen, wie z.B. Studierende, können auch aktive mit „Mensch“ bzw. „Person“ etc. verwendet werden. Das spart „der/die“ und inkludiert alle Menschen unabhängig davon, welche Eigenschaften/Kategorien diese Personen sonst noch mitbringen.
+* **Verwende die Anrede „du“**:Um eine persönliche und weniger formelle Atmosphäre zu schaffen, verwende „du“ statt „Sie".
 * **Beschreibe Handlungen (aktiv oder passiv)**:
 
   * „Automatisch generierte Ergebnisse werden am Ende des Bearbeitungszeitraums erstellt“. Statt „Die Studierenden erhalten am Ende des Bearbeitungszeitraums ein automisch generiertes Ergebnis.“)

docs/dev/setup/integrated-code-lifecycle.rst

@@ -43,8 +43,11 @@ Create a file ``src/main/resources/config/application-local.yml`` with the follo
                use-external: false
            version-control:
                url: http://localhost:8080
-           # Only necessary on Windows:
            continuous-integration:
+               # Only necessary on ARM-based systems, the default is amd64 for Intel/AMD systems
+               # ARM-based systems include Apple M-series, Raspberry Pi, etc.
+               image-architecture: arm64
+               # Only necessary on Windows:
                docker-connection-uri: tcp://localhost:2375
 
 The values configured here are sufficient for a basic Artemis setup that allows for running programming exercises with Integrated Code Lifecycle.
@@ -69,7 +72,7 @@ The Local CI subsystem of the Integrated Code Lifecycle is used to automatically
        artemis:
            continuous-integration:
                 specify-concurrent-builds: true
-                // The number of concurrent builds that can be executed
+                # The number of concurrent builds that can be executed
                 concurrent-build-size: 2
 
 .. _Start Artemis:

gradle.properties

@@ -6,7 +6,7 @@ node_version=20.10.0
 npm_version=10.2.3
 
 # Dependency versions
-jhipster_dependencies_version=8.3.0
+jhipster_dependencies_version=8.4.0
 spring_boot_version=3.2.5
 spring_security_version=6.2.4
 # TODO: Update to 6.5.0.Final not possible, would lead to errors
@@ -39,4 +39,10 @@ org.gradle.jvmargs=-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+  --add-modules java.se \
+  --add-exports java.base/jdk.internal.ref=ALL-UNNAMED \
+  --add-opens java.base/java.lang=ALL-UNNAMED \
+  --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
+  --add-opens java.management/sun.management=ALL-UNNAMED \
+  --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED