Merge remote-tracking branch 'origin/develop' into feature/integrated…

…-code-editor/remember-scroll-position

.github/workflows/testserver.yml

@@ -138,12 +138,13 @@ jobs:
             folder: /opt/artemis
             host_keys: |
 
-          #- environment: artemis-test7.artemis.cit.tum.de
-          #  label-identifier: artemis-test7
-          #  url: https://artemis-test7.artemis.cit.tum.de
-          #  user: deployment
-          #  hosts: artemis-test7.artemis.cit.tum.de
-          #  folder: /opt/artemis
+          - environment: artemis-test7.artemis.cit.tum.de
+            label-identifier: artemis-test7
+            url: https://artemis-test7.artemis.cit.tum.de
+            user: deployment
+            hosts: artemis-test7.artemis.cit.tum.de
+            folder: /opt/artemis
+            host_keys: |
 
           #- environment: artemis-test8.artemis.cit.tum.de
           #  label-identifier: artemis-test8

build.gradle

@@ -12,7 +12,7 @@ plugins {
     id "idea"
     id "jacoco"
     id "org.springframework.boot" version "${spring_boot_version}"
-    id "io.spring.dependency-management" version "1.1.6"
+    id "io.spring.dependency-management" version "1.1.7"
     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"
@@ -268,7 +268,7 @@ dependencies {
         }
     }
 
-    implementation "org.apache.logging.log4j:log4j-to-slf4j:2.24.2"
+    implementation "org.apache.logging.log4j:log4j-to-slf4j:2.24.3"
 
     // Note: spring-security-lti13 does not work with jakarta yet, so we built our own custom version and declare its transitive dependencies below
     // implementation "uk.ac.ox.ctl:spring-security-lti13:0.1.11"
@@ -337,7 +337,7 @@ dependencies {
 
     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.14.1"
+    implementation "io.micrometer:micrometer-registry-prometheus:1.14.2"
     implementation "net.logstash.logback:logstash-logback-encoder:8.0"
 
     // Defines low-level streaming API, and includes JSON-specific implementations
@@ -365,7 +365,7 @@ dependencies {
 
     implementation "com.zaxxer:HikariCP:6.2.1"
 
-    implementation "org.apache.commons:commons-text:1.12.0"
+    implementation "org.apache.commons:commons-text:1.13.0"
     implementation "org.apache.commons:commons-math3:3.6.1"
 
     implementation "javax.transaction:javax.transaction-api:1.3"
@@ -384,13 +384,20 @@ dependencies {
         exclude module: "spring-boot-starter-undertow"
     }
     implementation "org.springframework.boot:spring-boot-starter-tomcat:${spring_boot_version}"
+
+    // Avoid security issues in Tomcat 10.1.33
+    implementation "org.apache.tomcat.embed:tomcat-embed-core:${tomcat_version}"
+    implementation "org.apache.tomcat.embed:tomcat-embed-el:${tomcat_version}"
+    implementation "org.apache.tomcat.embed:tomcat-embed-websocket:${tomcat_version}"
+    implementation "org.apache.tomcat:tomcat-annotations-api:${tomcat_version}"
+
     implementation "org.springframework.boot:spring-boot-starter-websocket:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:${spring_boot_version}"
     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.8"
-    implementation "org.springframework.data:spring-data-ldap:3.4.0"
+    implementation "org.springframework.ldap:spring-ldap-core:3.2.10"
+    implementation "org.springframework.data:spring-data-ldap:3.4.1"
 
     implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${spring_cloud_version}") {
         // NOTE: these modules contain security vulnerabilities and are not needed
@@ -400,10 +407,10 @@ dependencies {
     implementation "org.springframework.cloud:spring-cloud-starter-config:${spring_cloud_version}"
     implementation "org.springframework.cloud:spring-cloud-commons:${spring_cloud_version}"
 
-    implementation "io.netty:netty-all:4.1.115.Final"
-    implementation "io.projectreactor.netty:reactor-netty:1.2.0"
+    implementation "io.netty:netty-all:4.1.116.Final"
+    implementation "io.projectreactor.netty:reactor-netty:1.2.1"
     implementation "org.springframework:spring-messaging:${spring_framework_version}"
-    implementation "org.springframework.retry:spring-retry:2.0.10"
+    implementation "org.springframework.retry:spring-retry:2.0.11"
 
     implementation "org.springframework.security:spring-security-config:${spring_security_version}"
     implementation "org.springframework.security:spring-security-data:${spring_security_version}"
@@ -451,7 +458,7 @@ dependencies {
     implementation "org.apfloat:apfloat:1.14.0"
 
     // use newest version of guava to avoid security issues through outdated dependencies
-    implementation "com.google.guava:guava:33.3.1-jre"
+    implementation "com.google.guava:guava:33.4.0-jre"
     implementation "com.sun.activation:jakarta.activation:2.0.1"
 
     // use newest version of gson to avoid security issues through outdated dependencies
@@ -607,7 +614,7 @@ tasks.withType(Test).configureEach {
 }
 
 wrapper {
-    gradleVersion = "8.11.1"
+    gradleVersion = "8.12-rc-2"
 }
 
 tasks.register("stage") {

gradle.properties

@@ -2,15 +2,15 @@ rootProject.name=Artemis
 profile=dev
 
 # Build properties
-node_version=22.10.0
-npm_version=10.8.0
+node_version=22.12.0
+npm_version=10.9.0
 
 # Dependency versions
 jhipster_dependencies_version=8.7.2
 spring_boot_version=3.4.0
-spring_framework_version=6.2.0
+spring_framework_version=6.2.1
 spring_cloud_version=4.2.0
-spring_security_version=6.4.1
+spring_security_version=6.4.2
 # 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?
@@ -19,26 +19,28 @@ jwt_version=0.12.6
 jaxb_runtime_version=4.0.5
 hazelcast_version=5.5.0
 fasterxml_version=2.18.2
-jgit_version=7.1.0.202411261347-r
+# TODO: 7.1.0 includes bugs related to git diffs, therefore we cannot update
+jgit_version=7.0.0.202409031743-r
 sshd_version=2.14.0
-checkstyle_version=10.20.2
+checkstyle_version=10.21.0
 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 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
+sentry_version=7.19.0
 liquibase_version=4.30.0
-docker_java_version=3.4.0
+docker_java_version=3.4.1
 logback_version=1.5.12
 java_parser_version=3.26.2
-byte_buddy_version=1.15.10
+byte_buddy_version=1.15.11
 netty_version=4.1.115.Final
+tomcat_version=10.1.34
 
 # testing
 # make sure both versions are compatible
 junit_version=5.11.3
-junit_platform_version=1.11.3
+junit_platform_version=1.11.4
 mockito_version=5.14.2
 testcontainer_version=1.20.4
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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.67,
+            statements: 87.69,
             branches: 73.79,
-            functions: 82.27,
-            lines: 87.72,
+            functions: 82.28,
+            lines: 87.74,
         },
     },
     coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],