Merge branch 'develop' into feature/tutorial-groups/tutorial-lectures

Author: marlonnienaber

.idea/runConfigurations/Artemis_Server__Dev__BuildAgent_LocalCI_.xml

@@ -19,7 +19,7 @@ plugins {
     id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
     id "com.github.ben-manes.versions" version "0.53.0"
     id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
-    id "com.google.cloud.tools.jib" version "3.5.0"
+    id "com.google.cloud.tools.jib" version "3.5.1"
     id "com.gorylenko.gradle-git-properties" version "2.5.3"
     id "io.spring.dependency-management" version "1.1.7"
     id "nebula.lint" version "21.1.3"
@@ -42,7 +42,7 @@ java {
 }
 
 wrapper {
-    gradleVersion = "9.2.0"
+    gradleVersion = "9.2.1"
 }
 
 node {
@@ -376,8 +376,8 @@ dependencies {
     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.data:spring-data-jpa:3.5.5"
-    implementation "org.springframework.data:spring-data-ldap:3.5.5"
+    implementation "org.springframework.data:spring-data-jpa:3.5.6"
+    implementation "org.springframework.data:spring-data-ldap:3.5.6"
     implementation "org.springframework.ldap:spring-ldap-core:3.3.4"
 
     implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${spring_cloud_version}"
@@ -508,9 +508,9 @@ dependencies {
     testImplementation "io.github.classgraph:classgraph:4.8.184"
     testImplementation "org.awaitility:awaitility:4.3.0"
     testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
-    testImplementation "org.gradle:gradle-tooling-api:9.2.0"
+    testImplementation "org.gradle:gradle-tooling-api:9.2.1"
     testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.4"
-    testImplementation "io.zonky.test:embedded-database-spring-test:2.7.0"
+    testImplementation "io.zonky.test:embedded-database-spring-test:2.7.1"
     testImplementation "com.redis:testcontainers-redis:2.2.4"
     testImplementation "com.tngtech.archunit:archunit:1.4.1"
     testImplementation "org.skyscreamer:jsonassert:1.5.3"

build.gradle

@@ -7,11 +7,11 @@ npm_version=11.5.1
 
 # Dependency versions
 jhipster_dependencies_version=8.11.0
-spring_boot_version=3.5.7
-tomcat_version=10.1.48
-spring_framework_version=6.2.13
+spring_boot_version=3.5.8
+tomcat_version=10.1.49
+spring_framework_version=6.2.14
 spring_cloud_version=4.3.0
-spring_security_version=6.5.6
+spring_security_version=6.5.7
 # TODO: upgrading to 6.6.x currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code. See https://hibernate.atlassian.net/browse/HHH-19249
 hibernate_version=6.5.3.Final
 opensaml_version=5.1.6
@@ -38,7 +38,7 @@ mysql_version=9.5.0
 micrometer_version=1.16.0
 snakeyaml_version=2.5
 helios_status_version=1.1.0
-commons_lang3_version=3.19.0
+commons_lang3_version=3.20.0
 commons_text_version=1.14.0
 redisson_version=3.52.0
 
@@ -52,7 +52,7 @@ gradle_node_plugin_version=7.1.0
 apt_plugin_version=0.21
 liquibase_plugin_version=3.0.2
 modernizer_plugin_version=1.12.0
-spotless_plugin_version=8.0.0
+spotless_plugin_version=8.1.0
 
 org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en \
   --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \

gradle.properties

@@ -1,26 +1,26 @@
 ext {
     // TODO: this should become 90% for INSTRUCTION and 0 for CLASS
     //This also needs to be lowered if we merge nebula PRs
-    AggregatedCoverageThresholds = ["INSTRUCTION": 0.865, "CLASS": 123]
+    AggregatedCoverageThresholds = ["INSTRUCTION": 0.865, "CLASS": 132]
     // TODO: each module should achieve 90% for INSTRUCTION and 0 for CLASS
     ModuleCoverageThresholds = [
-        "assessment"    :          ["INSTRUCTION": 0.926, "CLASS":  0],
-        "athena"        :          ["INSTRUCTION": 0.879, "CLASS":  2],
-        "atlas"         :          ["INSTRUCTION": 0.894, "CLASS":  4],
+        "assessment"    :          ["INSTRUCTION": 0.923, "CLASS":  0],
+        "athena"        :          ["INSTRUCTION": 0.855, "CLASS":  2],
+        "atlas"         :          ["INSTRUCTION": 0.894, "CLASS":  6],
         "buildagent"    :          ["INSTRUCTION": 0.781, "CLASS":  0],
         "communication" :          ["INSTRUCTION": 0.870, "CLASS":  6],
-        "core"          :          ["INSTRUCTION": 0.815, "CLASS": 50],
-        "exam"          :          ["INSTRUCTION": 0.915, "CLASS":  2],
+        "core"          :          ["INSTRUCTION": 0.815, "CLASS": 52],
+        "exam"          :          ["INSTRUCTION": 0.914, "CLASS":  3],
         "exercise"      :          ["INSTRUCTION": 0.913, "CLASS":  0],
         "fileupload"    :          ["INSTRUCTION": 0.946, "CLASS":  0],
         "hyperion"      :          ["INSTRUCTION": 0.700, "CLASS":  2],
         "iris"          :          ["INSTRUCTION": 0.772, "CLASS": 28],
-        "lecture"       :          ["INSTRUCTION": 0.910, "CLASS":  1],
+        "lecture"       :          ["INSTRUCTION": 0.900, "CLASS":  1],
         "lti"           :          ["INSTRUCTION": 0.888, "CLASS":  2],
         "modeling"      :          ["INSTRUCTION": 0.936, "CLASS":  0],
         "plagiarism"    :          ["INSTRUCTION": 0.908, "CLASS":  2],
-        "programming"   :          ["INSTRUCTION": 0.834, "CLASS": 14],
-        "quiz"          :          ["INSTRUCTION": 0.906, "CLASS":  2],
+        "programming"   :          ["INSTRUCTION": 0.834, "CLASS": 26],
+        "quiz"          :          ["INSTRUCTION": 0.865, "CLASS":  2],
         "text"          :          ["INSTRUCTION": 0.947, "CLASS":  1],
         "tutorialgroup" :          ["INSTRUCTION": 0.915, "CLASS":  1],
         //Adjust this after we merge the corresponding PRs

gradle/jacoco.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -94,7 +94,7 @@ module.exports = {
     coverageThreshold: {
         global: {
             statements: 90.10,
-            branches: 76.40,
+            branches: 76.50,
             functions: 84.10,
             lines: 90.10,
         },