Merge branch 'develop' into feature/communication/add-section-group-f…

…or-recent-channels

# Conflicts:
#	src/main/webapp/i18n/de/student-dashboard.json
#	src/main/webapp/i18n/en/student-dashboard.json

.gitignore

@@ -193,6 +193,7 @@ data-exports/
 ######################
 /src/test/playwright/test-reports/
 /src/test/playwright/test-results/*
+/src/test/playwright/ssh-keys/known_hosts
 
 #################################
 # Files generated by prebuild.mjs

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 TUM Applied Software Engineering
+Copyright (c) 2024 TUM Applied Education Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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 username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.8.0.war
+./artemis-server-cli deploy username@artemis-test0.artemis.in.tum.de -w build/libs/Artemis-7.8.1.war
 ```
 
 ## Architecture

build.gradle

@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.8.0"
+version = "7.8.1"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -242,6 +242,7 @@ dependencies {
     implementation "de.jplag:c:${jplag_version}"
     implementation "de.jplag:cpp:${jplag_version}"
     implementation "de.jplag:csharp:${jplag_version}"
+    implementation "de.jplag:golang:${jplag_version}"
     implementation "de.jplag:java:${jplag_version}"
     implementation "de.jplag:javascript:${jplag_version}"
     implementation "de.jplag:kotlin:${jplag_version}"
@@ -257,7 +258,7 @@ dependencies {
     implementation "org.apache.lucene:lucene-queryparser:${lucene_version}"
     implementation "org.apache.lucene:lucene-core:${lucene_version}"
     implementation "org.apache.lucene:lucene-analyzers-common:${lucene_version}"
-    implementation "com.google.protobuf:protobuf-java:4.29.1"
+    implementation "com.google.protobuf:protobuf-java:4.29.2"
 
     // we have to override those values to use the latest version
     implementation "org.slf4j:jcl-over-slf4j:${slf4j_version}"
@@ -418,7 +419,7 @@ dependencies {
     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:9.47"
+    implementation "com.nimbusds:nimbus-jose-jwt:9.48"
 
     implementation "org.springframework.security:spring-security-oauth2-jose:${spring_security_version}"
     implementation "org.springframework.security:spring-security-crypto:${spring_security_version}"
@@ -525,14 +526,14 @@ dependencies {
     }
     testImplementation "org.springframework.security:spring-security-test:${spring_security_version}"
     testImplementation "org.springframework.boot:spring-boot-test:${spring_boot_version}"
-    testImplementation "org.assertj:assertj-core:3.26.3"
+    testImplementation "org.assertj:assertj-core:3.27.0"
     testImplementation "org.mockito:mockito-core:${mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
 
     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.11.1"
+    testImplementation "org.gradle:gradle-tooling-api:8.12"
     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.6.0") {
@@ -614,7 +615,7 @@ tasks.withType(Test).configureEach {
 }
 
 wrapper {
-    gradleVersion = "8.12-rc-2"
+    gradleVersion = "8.12"
 }
 
 tasks.register("stage") {

docker/artemis/config/playwright-local.env

@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------------------------------------------------
-# Artemis configuration overrides for the Playwright E2E Postgres setups
+# Artemis configuration overrides for the Playwright E2E Local CI/VC setups
 # ----------------------------------------------------------------------------------------------------------------------
 
 SPRING_PROFILES_ACTIVE="artemis,scheduling,localvc,localci,buildagent,core,prod,docker"
@@ -12,3 +12,5 @@ ARTEMIS_CONTINUOUSINTEGRATION_ARTEMISAUTHENTICATIONTOKENVALUE='demo'
 ARTEMIS_CONTINUOUSINTEGRATION_DOCKERCONNECTIONURI='unix:///var/run/docker.sock'
 ARTEMIS_GIT_NAME='artemis'
 ARTEMIS_GIT_EMAIL='[email protected]'
+ARTEMIS_VERSIONCONTROL_SSHHOSTKEYPATH='/app/artemis/src/test/playwright/ssh-keys'
+ARTEMIS_VERSIONCONTROL_SSHPORT='7921'

docker/mysql.yml

@@ -5,7 +5,7 @@
 services:
     mysql:
         container_name: artemis-mysql
-        image: docker.io/library/mysql:9.0.1
+        image: docker.io/library/mysql:9.1.0
         pull_policy: if_not_present
         volumes:
             - artemis-mysql-data:/var/lib/mysql

docker/nginx.yml

@@ -6,7 +6,7 @@ services:
     nginx:
         # nginx setup based on artemis prod ansible repository
         container_name: artemis-nginx
-        image: docker.io/library/nginx:1.26
+        image: docker.io/library/nginx:1.27.3
         pull_policy: if_not_present
         volumes:
             - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro

docker/nginx/nginx.conf

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

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

@@ -109,6 +109,8 @@ services:
         condition: service_healthy
     environment:
       PLAYWRIGHT_DB_TYPE: 'MySQL'
+    networks:
+      - artemis
 
 networks:
   artemis:

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

@@ -47,6 +47,7 @@ services:
                 condition: service_healthy
         environment:
             PLAYWRIGHT_DB_TYPE: 'MySQL'
+        network_mode: service:artemis-app
 
 networks:
     artemis:

docker/playwright.yml

@@ -35,13 +35,6 @@ services:
           '
         volumes:
             - ..:/app/artemis
-        networks:
-            - artemis
         stdin_open: true
         tty: true
         ipc: host
-
-networks:
-    artemis:
-        driver: 'bridge'
-        name: artemis

docker/postgres.yml

@@ -5,7 +5,7 @@
 services:
     postgres:
         container_name: artemis-postgres
-        image: docker.io/library/postgres:17.0-alpine
+        image: docker.io/library/postgres:17.2-alpine
         pull_policy: if_not_present
         user: postgres
         command: ["postgres", "-c", "max_connections=10000"]

docs/.readthedocs.yaml

@@ -2,11 +2,12 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.12"
+    python: "3.13"
 sphinx:
   fail_on_warning: true
+  configuration: docs/conf.py
 python:
   install:
     - requirements: docs/requirements.txt

docs/admin/database.rst

@@ -42,7 +42,7 @@ Migrating MySQL Data to PostgreSQL
         ---
         services:
             mysql:
-                image: docker.io/library/mysql:9.0.1
+                image: docker.io/library/mysql:9.1.0
                 environment:
                     - MYSQL_DATABASE=Artemis
                     - MYSQL_ALLOW_EMPTY_PASSWORD=yes
@@ -59,7 +59,7 @@ Migrating MySQL Data to PostgreSQL
                     - db-migration
 
             postgres:
-                image: docker.io/library/postgres:17.0
+                image: docker.io/library/postgres:17.2-alpine
                 environment:
                     - POSTGRES_USER=root
                     - POSTGRES_DB=Artemis

docs/admin/setup/distributed.rst

@@ -17,7 +17,7 @@ Setup with multiple instances
 There are certain scenarios, where a setup with multiple instances of the application server is required.
 This can e.g. be due to special requirements regarding fault tolerance or performance.
 
-Artemis also supports this setup (which is also used at the Chair for Applied Software Engineering at TUM).
+Artemis also supports this setup (which is also used at TUM).
 
 Multiple instances of the application server are used to distribute the load:
 

docs/conf.py

@@ -18,8 +18,8 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Artemis'
-copyright = '2024, Technical University of Munich, Applied Software Engineering'
-author = 'Technical University of Munich, Applied Software Engineering'
+copyright = '2024, Applied Education Technologies, Technical University of Munich'
+author = 'Applied Education Technologies, Technical University of Munich'
 
 
 # -- General configuration ---------------------------------------------------