Merge branch 'develop' into chore/update-gitlab-docs

.bamboo/E2E-tests/execute.sh → .ci/E2E-tests/execute.sh

@@ -4,10 +4,10 @@ DB=$1
 
 if [ "$DB" = "mysql" ]; then
   COMPOSE_FILE="cypress-E2E-tests-mysql.yml"
-elif [ "$DB" = "postgresql" ]; then
+elif [ "$DB" = "postgres" ]; then
   COMPOSE_FILE="cypress-E2E-tests-postgres.yml"
 else
-  echo "Invalid database type. Please choose either mysql or postgresql."
+  echo "Invalid database type. Please choose either mysql or postgres."
   exit 1
 fi
 

.bamboo/migration-check/execute.sh → .ci/migration-check/execute.sh

@@ -4,10 +4,10 @@ DB=$1
 
 if [ "$DB" = "mysql" ]; then
   COMPOSE_FILE="artemis-migration-check-mysql.yml"
-elif [ "$DB" = "postgresql" ]; then
+elif [ "$DB" = "postgres" ]; then
   COMPOSE_FILE="artemis-migration-check-postgres.yml"
 else
-  echo "Invalid database type. Please choose either mysql or postgresql."
+  echo "Invalid database type. Please choose either mysql or postgres."
   exit 1
 fi
 

.github/workflows/build.yml

@@ -115,9 +115,9 @@ jobs:
       if: ${{ github.event_name == 'release' }}
       uses: actions/checkout@v4
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
     # Build and Push to GitHub Container Registry
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v2

.github/workflows/test.yml

@@ -209,6 +209,16 @@ jobs:
     - name: Java Documentation
       run: ./gradlew checkstyleMain -x webapp
       if: success() || failure()
+    - name: Java Architecture Tests
+      run: ./gradlew test -DincludeTags='ArchitectureTest' -x webapp
+      if: success() || failure()
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: success() || failure()    # run this step even if previous step failed
+      with:
+        name: Java Architecture Tests
+        path: build/test-results/test/*.xml
+        reporter: java-junit
 
   client-tests:
     runs-on: ubuntu-latest

.github/workflows/testserver.yml

@@ -184,16 +184,16 @@ jobs:
           #    artemis-test8.artemis.cit.tum.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGxtzUJPdHMAIfaL4Dr8OLMySCNInARsqnNN3e0JqHG/Y6xCVDVF9ZTOGUqMO9woMhsyTU6EOo6KaVfIVrw7SEA=
           #    artemis-test8.artemis.cit.tum.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFN6fu1oNKX3xFE1pe6Ichl5XJ/eTYhihywVvkH0mWRF
 
-          #- environment: artemis-test9.artemis.cit.tum.de
-          #  label-identifier: artemis-test9
-          #  url: https://artemis-test9.artemis.cit.tum.de
-          #  user: deployment
-          #  hosts: artemis-test9.artemis.cit.tum.de
-          #  folder: /opt/artemis
-          #  host_keys: |
-          #    artemis-test9.artemis.cit.tum.de ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDRDisk0MgHoxymMGadsBitagXKn0DGhlg9khTHyel1CjQeNNc+d/sf8JHabodmMsZo4UKlKnVHDL48mzJWuTiacB0YvWfYYM+WKGZ3Wyc5INr4hK4Yj632UMEqBdLZqF3SJA2jPQk2u1rO416TeYJfR7pJwM694HmtuFifqmMaugV7evug195KckL+mxwxghjkRLtaY0AB5l0f0S5obVWTkKNaNaSKRidJfUyv6kZkZn2zZACWqkCudsEAjT6ZFXWhjiQqglmHZwlX6pLjsI6kL+C6xd4S/yB4okh3Rb7RVWxbT/9YzOAWJzRu1+IGf1/5UeFUEqKL1B8TJ0yZA1xZAXtvmYecK+iBibmeTXBNN/TBsTjPrArfUPnWN3/C8nf0lMyce/iPbyYMmu1oiHo3NdLXGsHpk2+oLAWjY7edcF/WyXOp0ax4OCIZ/lMsbA8euNewEahfDGFyRXzj694uwog8zpMtANb4+Lxo26N8hgSBZGsb22vLCHMerS5dfCU=
-          #    artemis-test9.artemis.cit.tum.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG3531IQdJVxkckhWGahHh4sb5REa3g+0UYMxGOKExj0Q/KxKFcfsu0rJ0vN4zKEfuZRHJouNcLQVVJfSDxqZF8=
-          #    artemis-test9.artemis.cit.tum.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbS/SXTRdYBE/qVjRHNMPXXMegsjBZrnuK6oAQJJstZ
+          - environment: artemis-test9.artemis.cit.tum.de
+            label-identifier: artemis-test9
+            url: https://artemis-test9.artemis.cit.tum.de
+            user: deployment
+            hosts: artemis-test9.artemis.cit.tum.de
+            folder: /opt/artemis
+            host_keys: |
+              artemis-test9.artemis.cit.tum.de ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDRDisk0MgHoxymMGadsBitagXKn0DGhlg9khTHyel1CjQeNNc+d/sf8JHabodmMsZo4UKlKnVHDL48mzJWuTiacB0YvWfYYM+WKGZ3Wyc5INr4hK4Yj632UMEqBdLZqF3SJA2jPQk2u1rO416TeYJfR7pJwM694HmtuFifqmMaugV7evug195KckL+mxwxghjkRLtaY0AB5l0f0S5obVWTkKNaNaSKRidJfUyv6kZkZn2zZACWqkCudsEAjT6ZFXWhjiQqglmHZwlX6pLjsI6kL+C6xd4S/yB4okh3Rb7RVWxbT/9YzOAWJzRu1+IGf1/5UeFUEqKL1B8TJ0yZA1xZAXtvmYecK+iBibmeTXBNN/TBsTjPrArfUPnWN3/C8nf0lMyce/iPbyYMmu1oiHo3NdLXGsHpk2+oLAWjY7edcF/WyXOp0ax4OCIZ/lMsbA8euNewEahfDGFyRXzj694uwog8zpMtANb4+Lxo26N8hgSBZGsb22vLCHMerS5dfCU=
+              artemis-test9.artemis.cit.tum.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG3531IQdJVxkckhWGahHh4sb5REa3g+0UYMxGOKExj0Q/KxKFcfsu0rJ0vN4zKEfuZRHJouNcLQVVJfSDxqZF8=
+              artemis-test9.artemis.cit.tum.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbS/SXTRdYBE/qVjRHNMPXXMegsjBZrnuK6oAQJJstZ
 
           #- environment: artemis-test10.artemis.cit.tum.de
           #  label-identifier: artemis-test10
@@ -214,7 +214,7 @@ jobs:
       TS6: ${{ steps.filter.outputs.artemis-test6 || '' }}
       #TS7: ${{ steps.filter.outputs.artemis-test7 || '' }}
       #TS8: ${{ steps.filter.outputs.artemis-test8 || '' }}
-      #TS9: ${{ steps.filter.outputs.artemis-test9 || '' }}
+      TS9: ${{ steps.filter.outputs.artemis-test9 || '' }}
       #TS10: ${{ steps.filter.outputs.artemis-test10 || '' }}
     steps:
       - run: |

.gitignore

@@ -185,6 +185,8 @@ data-exports/
 !/docker/.docker-data/artemis-data/.gitkeep
 /docker/.docker-data/artemis-mysql-data/*
 !/docker/.docker-data/artemis-mysql-data/.gitkeep
+/docker/.docker-data/artemis-postgres-data/*
+!/docker/.docker-data/artemis-postgres-data/.gitkeep
 
 ######################
 # Cypress

build.gradle

@@ -15,21 +15,21 @@ plugins {
     id "idea"
     id "jacoco"
     id "org.springframework.boot" version "${spring_boot_version}"
-    id "io.spring.dependency-management" version "1.1.2"
+    id "io.spring.dependency-management" version "1.1.3"
     id "com.google.cloud.tools.jib" version "3.3.2"
     id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
-    id "com.diffplug.spotless" version "6.20.0"
+    id "com.diffplug.spotless" version "6.21.0"
     // this allows us to find outdated dependencies via ./gradlew dependencyUpdates
-    id "com.github.ben-manes.versions" version "0.47.0"
+    id "com.github.ben-manes.versions" version "0.48.0"
     id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
     id "com.gorylenko.gradle-git-properties" version "2.4.1"
     id "info.solidsoft.pitest" version "1.9.11"
-    id "org.owasp.dependencycheck" version "8.3.1"
+    id "org.owasp.dependencycheck" version "8.4.0"
     id "com.adarshr.test-logger" version "3.2.0"
 }
 
 group = "de.tum.in.www1.artemis"
-version = "6.4.3"
+version = "6.5.0"
 description = "Interactive Learning with Individual Feedback"
 
 sourceCompatibility=17
@@ -96,10 +96,17 @@ modernizer {
 }
 
 // Execute the test cases: ./gradlew test
-
+// Execute only architecture tests: ./gradlew test -DincludeTags='ArchitectureTest'
 test {
-    useJUnitPlatform()
-    exclude "**/*IT*", "**/*IntTest*"
+    if (System.getProperty("includeTags")) {
+        useJUnitPlatform {
+            includeTags System.getProperty("includeTags")
+        }
+    } else {
+        useJUnitPlatform()
+        exclude "**/*IT*", "**/*IntTest*"
+    }
+
     testLogging {
         events "FAILED", "SKIPPED"
     }
@@ -115,7 +122,7 @@ tasks.register("testReport", TestReport) {
 }
 
 jacoco {
-    toolVersion = "0.8.8"
+    toolVersion = "0.8.10"
 }
 
 jar {
@@ -127,7 +134,7 @@ private excludedClassFilesForReport(classDirectories) {
         fileTree(dir: it,
             exclude: [
                 "**/de/tum/in/www1/artemis/domain/**/*_*",
-                "**/de/tum/in/www1/artemis/config/migration/entries/*_*",
+                "**/de/tum/in/www1/artemis/config/migration/entries/**",
                 "**/gradle-wrapper.jar/**"
             ]
         )
@@ -156,7 +163,7 @@ jacocoTestCoverageVerification {
                 counter = "CLASS"
                 value = "MISSEDCOUNT"
                 // TODO: in the future the following value should become less than 10
-                maximum = 20
+                maximum = 19
             }
         }
     }
@@ -256,15 +263,15 @@ dependencies {
     implementation "org.springdoc:springdoc-openapi-ui:1.7.0"
     implementation "com.vdurmont:semver4j:3.1.0"
 
-    implementation "com.github.docker-java:docker-java-core:3.3.2"
-    implementation "com.github.docker-java:docker-java-transport-httpclient5:3.3.2"
+    implementation "com.github.docker-java:docker-java-core:3.3.3"
+    implementation "com.github.docker-java:docker-java-transport-httpclient5:3.3.3"
 
     // 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.11.2"
+    implementation "io.micrometer:micrometer-registry-prometheus:1.11.4"
     implementation "net.logstash.logback:logstash-logback-encoder:7.4"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc:${fasterxml_version}"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${fasterxml_version}"
@@ -281,7 +288,7 @@ dependencies {
     implementation "org.apache.commons:commons-math3:3.6.1"
     implementation "javax.transaction:javax.transaction-api:1.3"
     implementation "org.hibernate:hibernate-entitymanager:${hibernate_version}"
-    implementation "org.liquibase:liquibase-core:4.23.0"
+    implementation "org.liquibase:liquibase-core:4.23.2"
     implementation "org.springframework.boot:spring-boot-starter-validation:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-loader-tools:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-mail:${spring_boot_version}"
@@ -298,16 +305,16 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:${spring_boot_version}"
 
     implementation "org.springframework.ldap:spring-ldap-core:2.4.1"
-    implementation "org.springframework.data:spring-data-ldap:2.7.14"
+    implementation "org.springframework.data:spring-data-ldap:2.7.15"
 
     implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:3.1.7"
     implementation "org.springframework.cloud:spring-cloud-starter-config:3.1.8"
     implementation "org.springframework.boot:spring-boot-starter-cloud-connectors:2.2.13.RELEASE"
 
-    implementation "io.netty:netty-all:4.1.96.Final"
-    implementation "io.projectreactor.netty:reactor-netty:1.1.9"
+    implementation "io.netty:netty-all:4.1.97.Final"
+    implementation "io.projectreactor.netty:reactor-netty:1.1.11"
     implementation "org.springframework:spring-messaging:5.3.29"
-    implementation "org.springframework.retry:spring-retry:2.0.2"
+    implementation "org.springframework.retry:spring-retry:2.0.3"
 
     implementation "org.springframework.security:spring-security-config:${spring_security_version}"
     implementation "org.springframework.security:spring-security-data:${spring_security_version}"
@@ -326,15 +333,15 @@ dependencies {
     implementation "io.springfox:springfox-bean-validators:3.0.0"
     implementation "mysql:mysql-connector-java:8.0.33"
     implementation "org.postgresql:postgresql:42.6.0"
-    implementation "com.h2database:h2:2.2.220"
+    implementation "com.h2database:h2:2.2.222"
 
     // zalando problem spring web can only be updated when we support Spring 6
     implementation "org.zalando:problem-spring-web:0.27.0"
     implementation "com.ibm.icu:icu4j:73.2"
     implementation "com.github.seancfoley:ipaddress:5.4.0"
-    implementation "org.apache.maven:maven-model:3.9.3"
-    implementation "org.apache.pdfbox:pdfbox:2.0.29"
-    implementation "com.google.protobuf:protobuf-java:3.23.4"
+    implementation "org.apache.maven:maven-model:3.9.4"
+    implementation "org.apache.pdfbox:pdfbox:3.0.0"
+    implementation "com.google.protobuf:protobuf-java:3.24.3"
     implementation "org.apache.commons:commons-csv:1.10.0"
     implementation "org.commonmark:commonmark:0.21.0"
     implementation "commons-fileupload:commons-fileupload:1.5"
@@ -359,14 +366,14 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter:${junit_version}"
     testImplementation "org.mockito:mockito-core:${mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
-    testImplementation "io.github.classgraph:classgraph:4.8.161"
+    testImplementation "io.github.classgraph:classgraph:4.8.162"
     testImplementation "org.awaitility:awaitility:4.2.0"
     testImplementation "org.apache.maven.shared:maven-invoker:3.2.0"
-    testImplementation "org.gradle:gradle-tooling-api:8.2.1"
+    testImplementation "org.gradle:gradle-tooling-api:8.3"
     testImplementation "org.apache.maven.surefire:surefire-report-parser:3.1.2"
     testImplementation "com.opencsv:opencsv:5.8"
     testImplementation "io.zonky.test:embedded-database-spring-test:2.3.0"
-    testImplementation "com.tngtech.archunit:archunit:1.0.1"
+    testImplementation "com.tngtech.archunit:archunit:1.1.0"
     testImplementation "org.skyscreamer:jsonassert:1.5.1"
 
     // Lightweight JSON library needed for the internals of the MockRestServiceServer
@@ -410,7 +417,7 @@ tasks.withType(Test).configureEach {
 }
 
 wrapper {
-    gradleVersion = "8.2.1"
+    gradleVersion = "8.3"
 }
 
 tasks.register("stage") {

docker/artemis-dev-mysql.yml

@@ -17,11 +17,8 @@ services:
         # expose the port to make it reachable docker internally even if the external port mapping changes
         expose:
             - "5005"
-        environment:
-            # The following enables the Java Remote Debugging port. More infos in the documentation:
-            # https://ls1intum.github.io/Artemis/dev/setup.html#debugging-with-docker
-            _JAVA_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
-            SPRING_PROFILES_ACTIVE: artemis,scheduling,athena,dev,docker
+        env_file:
+            - ./artemis/config/dev.env
         depends_on:
             mysql:
                 condition: service_healthy

docker/artemis-dev-postgres.yml

@@ -0,0 +1,39 @@
+# ----------------------------------------------------------------------------------------------------------------------
+# Artemis-Dev-Postgres Setup
+# ----------------------------------------------------------------------------------------------------------------------
+
+services:
+    artemis-app:
+        extends:
+            file: ./artemis.yml
+            service: artemis-app
+        # just add this linux workaround for docker compose in a development version of artemis as developers
+        # might want to access external services on the docker host
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
+        ports:
+            - "8080:8080"
+            - "5005:5005" # Java Remote Debugging port declared in the java cmd options
+        # expose the port to make it reachable docker internally even if the external port mapping changes
+        expose:
+            - "5005"
+        env_file:
+            - ./artemis/config/dev.env
+            - ./artemis/config/postgres.env
+        depends_on:
+            postgres:
+                condition: service_healthy
+    postgres:
+        extends:
+            file: ./postgres.yml
+            service: postgres
+
+networks:
+    artemis:
+        driver: "bridge"
+        name: artemis
+volumes:
+    artemis-postgres-data:
+        name: artemis-postgres-data
+    artemis-data:
+        name: artemis-data

docker/artemis-migration-check-postgres.yml

@@ -8,15 +8,17 @@ services:
             file: ./artemis.yml
             service: artemis-app
         env_file:
+            - ./artemis/config/postgres.env
+            - ./artemis/config/cypress.env
             - ./artemis/config/cypress-postgres.env
             - ./artemis/config/migration-check.env
         depends_on:
             postgresql:
                 condition: service_healthy
     postgresql:
         extends:
-            file: ./postgresql.yml
-            service: postgresql
+            file: ./postgres.yml
+            service: postgres
     migration-check:
         image: alpine
         container_name: migration-check
@@ -32,7 +34,7 @@ networks:
         driver: "bridge"
         name: artemis
 volumes:
-    artemis-postgresql-data:
-        name: artemis-postgresql-data
+    artemis-postgres-data:
+        name: artemis-postgres-data
     artemis-data:
         name: artemis-data