Merge branch 'develop' into bugfix/communication/thread-shows-wrong-m…

…essage

.github/issue-labeler.yml

@@ -10,6 +10,8 @@ assessment:
 
 athena:
   - athena
+  - ai feedback
+  - request (ai )?feedback
   - caseSensitive: false
 
 atlas:
@@ -48,8 +50,6 @@ core:
   - authority
   - data export
   - migration
-  - user
-  - group
   - caseSensitive: false
 
 exam:
@@ -79,20 +79,19 @@ iris:
   - iris
   - llm
   - chatbot
-  - ai
+  - \b(?<!\S)ai(?!\S)\b
   - caseSensitive: false
 
 lecture:
   - lecture
   - attachment
-  - online
   - slide
   - video
   - text unit
   - caseSensitive: false
 
 lti:
-  - lti
+  - \b(?<!\S)lti(?!\S)\b
   - online course
   - caseSensitive: false
 
@@ -111,15 +110,14 @@ programming:
   - build
   - build plan
   - code hint
-  - git
+  - \b(?<!\S)git(?!\S)\b
   - testwise coverage
-  - ide
+  - \b(?<!\S)ide(?!\S)\b
   - submission policy
   - aeolus
   - penalty
   - auxilary
   - commit
-  - project
   - static code analysis
   - caseSensitive: false
 
@@ -134,11 +132,9 @@ quiz:
   - caseSensitive: false
 
 text:
-  - text
   - block
   - caseSensitive: false
 
 tutorialgroup:
   - tutorialgroup
-  - session
   - caseSensitive: false

README.md

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

angular.json

@@ -39,6 +39,7 @@
                   "markdown-it-highlightjs",
                   "mobile-drag-drop",
                   "papaparse",
+                  "pako",
                   "pepjs",
                   "prop-types",
                   "react",

build.gradle

@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.7.1"
+version = "7.7.2"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -180,7 +180,7 @@ jacocoTestCoverageVerification {
                 counter = "INSTRUCTION"
                 value = "COVEREDRATIO"
                 // TODO: in the future the following value should become higher than 0.92
-                minimum = 0.892
+                minimum = 0.895
             }
             limit {
                 counter = "CLASS"
@@ -345,13 +345,12 @@ dependencies {
     // use newest version of commons-compress to avoid security issues through outdated dependencies
     implementation "org.apache.commons:commons-compress:1.27.1"
 
-
     // import JHipster dependencies BOM
     implementation platform("tech.jhipster:jhipster-dependencies:${jhipster_dependencies_version}")
 
     implementation "tech.jhipster:jhipster-framework:${jhipster_dependencies_version}"
     implementation "org.springframework.boot:spring-boot-starter-cache:${spring_boot_version}"
-    implementation "io.micrometer:micrometer-registry-prometheus:1.13.6"
+    implementation "io.micrometer:micrometer-registry-prometheus:1.14.1"
     implementation "net.logstash.logback:logstash-logback-encoder:8.0"
 
     // Defines low-level streaming API, and includes JSON-specific implementations
@@ -377,7 +376,7 @@ dependencies {
     implementation "javax.cache:cache-api:1.1.1"
     implementation "org.hibernate.orm:hibernate-core:${hibernate_version}"
 
-    implementation "com.zaxxer:HikariCP:6.1.0"
+    implementation "com.zaxxer:HikariCP:6.2.1"
 
     implementation "org.apache.commons:commons-text:1.12.0"
     implementation "org.apache.commons:commons-math3:3.6.1"
@@ -403,7 +402,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client:${spring_boot_version}"
 
-    implementation "org.springframework.ldap:spring-ldap-core:3.2.7"
+    implementation "org.springframework.ldap:spring-ldap-core:3.2.8"
     implementation "org.springframework.data:spring-data-ldap:3.3.5"
 
     implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.3") {
@@ -414,8 +413,13 @@ dependencies {
     implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.3"
     implementation "org.springframework.cloud:spring-cloud-commons:4.1.4"
 
-    implementation "io.netty:netty-all:4.1.114.Final"
-    implementation "io.projectreactor.netty:reactor-netty:1.1.23"
+    implementation "io.projectreactor.netty:reactor-netty:1.2.0"
+    implementation("io.netty:netty-common") {
+        version {
+            strictly netty_version
+        }
+    }
+
     implementation "org.springframework:spring-messaging:6.1.14"
     implementation "org.springframework.retry:spring-retry:2.0.10"
 
@@ -424,8 +428,9 @@ dependencies {
     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}"
+    implementation "org.springframework.security:spring-security-oauth2-resource-server:${spring_security_version}"
     // use newest version of nimbus-jose-jwt to avoid security issues through outdated dependencies
-    implementation "com.nimbusds:nimbus-jose-jwt:9.46"
+    implementation "com.nimbusds:nimbus-jose-jwt:9.47"
 
     implementation "org.springframework.security:spring-security-oauth2-jose:${spring_security_version}"
     implementation "org.springframework.security:spring-security-crypto:${spring_security_version}"
@@ -472,7 +477,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.11.0"
 
 
-    implementation "com.google.errorprone:error_prone_annotations:2.35.1"
+    implementation "com.google.errorprone:error_prone_annotations:2.36.0"
 
     // NOTE: we want to keep the same unique version for all configurations, implementation and annotationProcessor
     implementation("net.bytebuddy:byte-buddy") {
@@ -536,16 +541,24 @@ dependencies {
     testImplementation "org.mockito:mockito-core:${mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
 
-    testImplementation "io.github.classgraph:classgraph:4.8.177"
+    testImplementation "io.github.classgraph:classgraph:4.8.179"
     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.gradle:gradle-tooling-api:8.11.1"
     testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.2"
     testImplementation "com.opencsv:opencsv:5.9"
     testImplementation("io.zonky.test:embedded-database-spring-test:2.5.1") {
         exclude group: "org.testcontainers", module: "mariadb"
         exclude group: "org.testcontainers", module: "mssqlserver"
     }
+    testImplementation "org.testcontainers:testcontainers:${testcontainer_version}"
+    testImplementation "org.testcontainers:mysql:${testcontainer_version}"
+    testImplementation "org.testcontainers:postgresql:${testcontainer_version}"
+    testImplementation "org.testcontainers:testcontainers:${testcontainer_version}"
+    testImplementation "org.testcontainers:junit-jupiter:${testcontainer_version}"
+    testImplementation "org.testcontainers:jdbc:${testcontainer_version}"
+    testImplementation "org.testcontainers:database-commons:${testcontainer_version}"
+
     testImplementation "com.tngtech.archunit:archunit:1.3.0"
     testImplementation("org.skyscreamer:jsonassert:1.5.3") {
         exclude module: "android-json"
@@ -597,7 +610,7 @@ tasks.withType(Test).configureEach {
 
     afterTest { descriptor, result ->
         if (result.resultType == TestResult.ResultType.FAILURE) {
-            String failedTest = "${descriptor.className}::${descriptor.name}"
+            var failedTest = "${descriptor.className}::${descriptor.name}"
             logger.debug("Adding " + failedTest + " to failedTests...")
             failedTests << [failedTest]
         }
@@ -621,7 +634,7 @@ tasks.withType(Test).configureEach {
 }
 
 wrapper {
-    gradleVersion = "8.10.2"
+    gradleVersion = "8.11"
 }
 
 tasks.register("stage") {

docker/playwright-E2E-tests-multi-node.yml

@@ -109,14 +109,6 @@ services:
         condition: service_healthy
     environment:
       PLAYWRIGHT_DB_TYPE: 'MySQL'
-    command: >
-      sh -c '
-      cd /app/artemis/src/test/playwright &&
-      chmod 777 /root &&
-      npm ci &&
-      npm run playwright:setup &&
-      npm run playwright:test
-      '
 
 networks:
   artemis:

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

@@ -47,14 +47,6 @@ services:
                 condition: service_healthy
         environment:
             PLAYWRIGHT_DB_TYPE: 'MySQL'
-        command: >
-            sh -c '
-            cd /app/artemis/src/test/playwright &&
-            chmod 777 /root &&
-            npm ci &&
-            npm run playwright:setup &&
-            npm run playwright:test
-            '
 
 networks:
     artemis:

docker/playwright-E2E-tests-mysql.yml

@@ -44,14 +44,6 @@ services:
                 condition: service_healthy
         environment:
             PLAYWRIGHT_DB_TYPE: 'MySQL'
-        command: >
-            sh -c '
-            chmod 777 /root &&
-            cd /app/artemis/src/test/playwright &&
-            npm ci &&
-            npm run playwright:setup &&
-            npm run playwright:test
-            '
 
 networks:
     artemis:

docker/playwright-E2E-tests-postgres.yml

@@ -45,14 +45,6 @@ services:
                 condition: service_healthy
         environment:
             PLAYWRIGHT_DB_TYPE: 'Postgres'
-        command: >
-            sh -c '
-            chmod 777 /root &&
-            cd /app/artemis/src/test/playwright &&
-            npm ci &&
-            npm run playwright:setup &&
-            npm run playwright:test
-            '
 
 networks:
     artemis:

docker/playwright.yml

@@ -22,7 +22,17 @@ services:
             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"
+            SLOW_TEST_TIMEOUT_SECONDS: '${bamboo_slow_test_timeout_seconds}'
+            FAST_TEST_TIMEOUT_SECONDS: '${bamboo_fast_test_timeout_seconds}'
+        command: >
+          sh -c '
+          cd /app/artemis/src/test/playwright &&
+          chmod 777 /root &&
+          npm ci &&
+          npm run playwright:setup &&
+          npm run playwright:test;
+          rm ./test-reports/results-fast.xml ./test-reports/results-slow.xml
+          '
         volumes:
             - ..:/app/artemis
         networks: