Merge branch 'develop' into chore/communication/faq/migrate-client-to…

…-use-inject

.gitignore

@@ -219,4 +219,3 @@ data-exports/
 # Supporting scripts config
 ##############################
 /supporting_scripts/**/*.ini
-/supporting_scripts/analysis-of-endpoint-connections/build/**/*

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.4.war
+./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.7.5.war
 ```
 
 ## Architecture

build.gradle

@@ -20,12 +20,12 @@ plugins {
     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.2"
-    id "org.owasp.dependencycheck" version "11.1.0"
+    id "org.owasp.dependencycheck" version "11.1.1"
     id "com.adarshr.test-logger" version "4.0.0"
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.7.4"
+version = "7.7.5"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -96,9 +96,10 @@ spotless {
             @Override
             String apply(String s, File file) throws Exception {
                 if (s =~ /\nimport .*\*;/) {
-                    throw new AssertionError("Do not use wildcard imports. spotlessApply cannot resolve this issue.\n" +
+                    throw new IllegalArgumentException("Do not use wildcard imports. spotlessApply cannot resolve this issue.\n" +
                         "The following file violates this rule: " + file.getName())
                 }
+                return s // Ensure a value is returned after processing
             }
         }))
     }
@@ -134,8 +135,8 @@ test {
     }
     testLogging.showStandardStreams = true
     reports.html.required = false
-    minHeapSize = "1024m" // initial heap size
-    maxHeapSize = "3072m" // maximum heap size
+    minHeapSize = "2g" // initial heap size
+    maxHeapSize = "8g" // maximum heap size
 }
 
 tasks.register("testReport", TestReport) {
@@ -180,13 +181,13 @@ jacocoTestCoverageVerification {
                 counter = "INSTRUCTION"
                 value = "COVEREDRATIO"
                 // TODO: in the future the following value should become higher than 0.92
-                minimum = 0.893
+                minimum = 0.892
             }
             limit {
                 counter = "CLASS"
                 value = "MISSEDCOUNT"
                 // TODO: in the future the following value should become less than 10
-                maximum = 64
+                maximum = 65
             }
         }
     }
@@ -212,18 +213,8 @@ repositories {
     maven {
         url "https://build.shibboleth.net/maven/releases"
     }
-    // TODO: remove this when spring cloud is available in the official maven repository
-    maven {
-        url "https://repo.spring.io/milestone"
-    }
 }
 
-ext["jackson.version"] = fasterxml_version
-ext["junit-jupiter.version"] = junit_version
-
-ext { qDoxVersionReusable = "com.thoughtworks.qdox:qdox:2.2.0" }
-ext { springBootStarterWeb = "org.springframework.boot:spring-boot-starter-web:${spring_boot_version}" }
-
 dependencies {
 
     // Note: jenkins-client is not well maintained and includes dependencies to libraries with critical security issues (e.g. CVE-2020-10683 for [email protected])
@@ -266,7 +257,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.0"
+    implementation "com.google.protobuf:protobuf-java:4.29.1"
 
     // we have to override those values to use the latest version
     implementation "org.slf4j:jcl-over-slf4j:${slf4j_version}"
@@ -297,7 +288,7 @@ dependencies {
     implementation "org.apache.sshd:sshd-sftp:${sshd_version}"
 
     // https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml
-    implementation "net.sourceforge.plantuml:plantuml:1.2024.7"
+    implementation "net.sourceforge.plantuml:plantuml:1.2024.8"
     implementation "org.jasypt:jasypt:1.9.3"
     implementation "me.xdrop:fuzzywuzzy:1.4.0"
     implementation("org.yaml:snakeyaml") {
@@ -307,7 +298,7 @@ dependencies {
         }
     }
 
-    implementation qDoxVersionReusable
+    implementation "com.thoughtworks.qdox:qdox:2.2.0"
     implementation "io.sentry:sentry-logback:${sentry_version}"
     implementation "io.sentry:sentry-spring-boot-starter-jakarta:${sentry_version}"
 
@@ -328,10 +319,6 @@ dependencies {
     implementation "org.jsoup:jsoup:1.18.3"
     implementation "commons-codec:commons-codec:1.17.1"   // needed for spring security saml2
 
-    // TODO: decide if we want to use OpenAPI and Swagger v3
-//    implementation 'io.swagger.core.v3:swagger-annotations:2.2.23'
-//    implementation "org.springdoc:springdoc-openapi-ui:1.8.0"
-
     // use the latest version to avoid security vulnerabilities
     implementation "org.springframework:spring-webmvc:${spring_framework_version}"
 
@@ -393,7 +380,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-aop:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-data-jpa:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-security:${spring_boot_version}"
-    implementation(springBootStarterWeb) {
+    implementation("org.springframework.boot:spring-boot-starter-web:${spring_boot_version}") {
         exclude module: "spring-boot-starter-undertow"
     }
     implementation "org.springframework.boot:spring-boot-starter-tomcat:${spring_boot_version}"
@@ -550,8 +537,8 @@ dependencies {
         exclude module: "android-json"
     }
 
-    // cannot update due to "Syntax error in SQL statement "WITH ids_to_delete"
-//    testImplementation "com.h2database:h2:2.3.230"
+    // NOTE: cannot update due to "Syntax error in SQL statement "WITH ids_to_delete" --> should be resolved when we collapse the changelogs again for Artemis 8.0
+//    testImplementation "com.h2database:h2:2.3.232"
     testImplementation "com.h2database:h2:2.2.224"
 
     // Lightweight JSON library needed for the internals of the MockRestServiceServer
@@ -563,7 +550,7 @@ dependencies {
 
 dependencyManagement {
     imports {
-        mavenBom "io.zonky.test.postgres:embedded-postgres-binaries-bom:17.0.0"
+        mavenBom "io.zonky.test.postgres:embedded-postgres-binaries-bom:17.2.0"
     }
 }
 

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

@@ -404,14 +404,38 @@ Edit Maximum Build Duration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 **This option is only available when using** :ref:`integrated code lifecycle<integrated code lifecycle>`
-This section is optional. In most cases, the preconfigured build script does not need to be changed.
+
+This section is optional. In most cases, the default maximum build duration does not need to be changed.
 
 The maximum build duration is the time limit for the build plan to execute. If the build plan exceeds this time limit, it will be terminated. The default value is 120 seconds.
 You can change the maximum build duration by using the slider.
 
 .. figure:: programming/timeout-slider.png
           :align: center
 
+Edit Container Configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**This option is only available when using** :ref:`integrated code lifecycle<integrated code lifecycle>`
+
+This section is optional. In most cases, the default container configuration does not need to be changed.
+
+Currently, instructors can only change whether the container has internet access and add additional environment variables.
+Disabling internet access can be useful if instructors want to prevent students from downloading additional dependencies during the build process.
+If internet access is disabled, the container cannot access the internet during the build process. Thus, it will not be able to download additional dependencies.
+The dependencies must then be included/cached in the docker image.
+
+Additional environment variables can be added to the container configuration. This can be useful if the build process requires additional environment variables to be set.
+
+.. figure:: programming/docker-flags-edit.png
+          :align: center
+
+We plan to add more options to the container configuration in the future.
+
+.. warning::
+  - Disabling internet access is not currently supported for Swift and Haskell exercises.
+
+
 .. _configure_static_code_analysis_tools:
 
 Configure static code analysis

gradle.properties

@@ -9,22 +9,22 @@ npm_version=10.8.0
 jhipster_dependencies_version=8.7.2
 spring_boot_version=3.4.0
 spring_framework_version=6.2.0
-spring_cloud_version=4.2.0-RC1
+spring_cloud_version=4.2.0
 spring_security_version=6.4.1
-# TODO: upgrading to 6.6.0 currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code
+# TODO: upgrading to 6.6.x currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code
 hibernate_version=6.4.10.Final
 # TODO: can we update to 5.x?
 opensaml_version=4.3.2
 jwt_version=0.12.6
 jaxb_runtime_version=4.0.5
 hazelcast_version=5.5.0
 fasterxml_version=2.18.2
-jgit_version=7.0.0.202409031743-r
+jgit_version=7.1.0.202411261347-r
 sshd_version=2.14.0
 checkstyle_version=10.20.2
 jplag_version=5.1.0
-# not really used in Artemis, nor Jplag, nor the used version of Stanford CoreNLP, but we use the latest to avoid security vulnerabilities
-# NOTE: we do not need to use the latest version 9.x here as long as Stanford CoreNLP does not reference it
+# not really used in Artemis, nor JPlag, nor the used version of Stanford CoreNLP, but we use the latest to avoid security vulnerability warnings
+# NOTE: we cannot need to use the latest version 9.x or 10.x here as long as Stanford CoreNLP does not reference it
 lucene_version=8.11.4
 slf4j_version=2.0.16
 sentry_version=7.18.1
@@ -49,7 +49,7 @@ apt_plugin_version=0.21
 liquibase_plugin_version=2.1.1
 modernizer_plugin_version=1.10.0
 
-org.gradle.jvmargs=-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en \
+org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en \
   --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \

jest.config.js

@@ -105,10 +105,10 @@ module.exports = {
     coverageThreshold: {
         global: {
             // TODO: in the future, the following values should increase to at least 90%
-            statements: 87.72,
-            branches: 73.83,
-            functions: 82.29,
-            lines: 87.78,
+            statements: 87.69,
+            branches: 73.79,
+            functions: 82.27,
+            lines: 87.74,
         },
     },
     coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],