Merge branch 'develop' into feature/programming-exercises/add-more-ex…

…plicity-auxiliary-repo-tool-tip

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

build.gradle

@@ -13,19 +13,19 @@ plugins {
     id "jacoco"
     id "org.springframework.boot" version "${spring_boot_version}"
     id "io.spring.dependency-management" version "1.1.6"
-    id "com.google.cloud.tools.jib" version "3.4.3"
+    id "com.google.cloud.tools.jib" version "3.4.4"
     id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
     id "com.diffplug.spotless" version "6.25.0"
     // 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.2"
-    id "org.owasp.dependencycheck" version "10.0.4"
+    id "org.owasp.dependencycheck" version "11.0.0"
     id "com.adarshr.test-logger" version "4.0.0"
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.6.2"
+version = "7.6.4"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -257,13 +257,14 @@ dependencies {
     implementation "de.jplag:rust:${jplag_version}"
     implementation "de.jplag:swift:${jplag_version}"
     implementation "de.jplag:text:${jplag_version}"
+    implementation "de.jplag:typescript:${jplag_version}"
 
     // those are transitive dependencies of JPlag Text --> Stanford NLP
     // Note: ideally we would exclude them, but for some reason this does not work
     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.28.2"
+    implementation "com.google.protobuf:protobuf-java:4.28.3"
 
     // we have to override those values to use the latest version
     implementation "org.slf4j:jcl-over-slf4j:${slf4j_version}"
@@ -412,7 +413,7 @@ dependencies {
     implementation "io.netty:netty-all:4.1.114.Final"
     implementation "io.projectreactor.netty:reactor-netty:1.1.23"
     implementation "org.springframework:spring-messaging:6.1.14"
-    implementation "org.springframework.retry:spring-retry:2.0.9"
+    implementation "org.springframework.retry:spring-retry:2.0.10"
 
     implementation "org.springframework.security:spring-security-config:${spring_security_version}"
     implementation "org.springframework.security:spring-security-data:${spring_security_version}"
@@ -451,7 +452,7 @@ dependencies {
     implementation "org.apache.maven:maven-model:3.9.9"
     implementation "org.apache.pdfbox:pdfbox:3.0.3"
     implementation "org.apache.commons:commons-csv:1.12.0"
-    implementation "org.commonmark:commonmark:0.23.0"
+    implementation "org.commonmark:commonmark:0.24.0"
     implementation "commons-fileupload:commons-fileupload:1.5"
     implementation "net.lingala.zip4j:zip4j:2.11.5"
 
@@ -467,7 +468,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.11.0"
 
 
-    implementation "com.google.errorprone:error_prone_annotations:2.33.0"
+    implementation "com.google.errorprone:error_prone_annotations:2.34.0"
 
     // NOTE: we want to keep the same unique version for all configurations, implementation and annotationProcessor
     implementation("net.bytebuddy:byte-buddy") {

docs/admin/setup/distributed.rst

@@ -617,8 +617,13 @@ These credentials are used to clone repositories via HTTPS. You must also add th
                 container-cleanup:
                     expiry-minutes: 5                               # Time after a hanging container will automatically be removed
                     cleanup-schedule-minutes: 60                    # Schedule for container cleanup
+                build-agent:
+                    short-name: "artemis-build-agent-X"             # Short name of the build agent. This should be unique for each build agent. Only lowercase letters, numbers and hyphens are allowed.
+                    display-name: "Artemis Build Agent X"           # This value is optional. If omitted, the short name will be used as display name. Display name of the build agent. This is shown in the Artemis UI.
 
 
+Please note that ``artemis.continuous-integration.build-agent.short-name`` must be provided. Otherwise, the build agent will not start.
+
 Build agents run as `Hazelcast Lite Members <https://docs.hazelcast.com/hazelcast/5.3/maintain-cluster/lite-members>`__ and require a full member, in our case a core node, to be running.
 Thus, before starting a build agent make sure that at least the primary node is running. You can then add and remove build agents to the cluster as desired.
 

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

@@ -41,6 +41,8 @@ Instructors can still use those templates to generate programming exercises and
   +----------------------+----------+---------+
   | C++                  | yes      | yes     |
   +----------------------+----------+---------+
+  | TypeScript           | yes      | yes     |
+  +----------------------+----------+---------+
 
 - Not all ``templates`` support the same feature set and supported features can also change depending on the continuous integration system setup.
   Depending on the feature set, some options might not be available during the creation of the programming exercise.
@@ -79,6 +81,8 @@ Instructors can still use those templates to generate programming exercises and
   +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
   | C++                  | no                   | no                   | yes                 | no           | n/a                                      | no                           | no                         | L: yes, J: no          |
   +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
+  | TypeScript           | no                   | no                   | yes                 | no           | n/a                                      | no                           | no                         | L: yes, J: no          |
+  +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
 
   - *Sequential Test Runs*: ``Artemis`` can generate a build plan which first executes structural and then behavioral tests. This feature can help students to better concentrate on the immediate challenge at hand.
   - *Static Code Analysis*: ``Artemis`` can generate a build plan which additionally executes static code analysis tools.

gradle.properties

@@ -7,8 +7,8 @@ npm_version=10.8.0
 
 # Dependency versions
 jhipster_dependencies_version=8.7.1
-spring_boot_version=3.3.4
-spring_security_version=6.3.3
+spring_boot_version=3.3.5
+spring_security_version=6.3.4
 # TODO: upgrading to 6.6.0 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?
@@ -25,17 +25,17 @@ jplag_version=5.1.0
 # NOTE: we do not need to use the latest version 9.x here as long as Stanford CoreNLP does not reference it
 lucene_version=8.11.4
 slf4j_version=2.0.16
-sentry_version=7.15.0
+sentry_version=7.16.0
 liquibase_version=4.29.2
 docker_java_version=3.4.0
 logback_version=1.5.11
 java_parser_version=3.26.2
-byte_buddy_version=1.15.5
+byte_buddy_version=1.15.7
 
 # testing
 # make sure both versions are compatible
 junit_version=5.11.0
-junit_platform_version=1.11.2
+junit_platform_version=1.11.3
 mockito_version=5.14.2
 
 

jest.config.js

@@ -102,10 +102,10 @@ module.exports = {
     coverageThreshold: {
         global: {
             // TODO: in the future, the following values should increase to at least 90%
-            statements: 87.39,
-            branches: 73.60,
-            functions: 81.97,
-            lines: 87.45,
+            statements: 87.53,
+            branches: 73.62,
+            functions: 82.13,
+            lines: 87.58,
         },
     },
     coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],