Merge branch 'develop' into feature/lectures/add-status-bar

.github/issue-labeler.yml

@@ -111,7 +111,6 @@ programming:
   - build plan
   - code hint
   - \b(?<!\S)git(?!\S)\b
-  - testwise coverage
   - \b(?<!\S)ide(?!\S)\b
   - submission policy
   - aeolus

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 TUM Applied Education Technologies
+Copyright (c) 2025 TUM Applied Education Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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 username@artemis-test0.artemis.in.tum.de -w build/libs/Artemis-7.8.1.war
+./artemis-server-cli deploy username@artemis-test0.artemis.in.tum.de -w build/libs/Artemis-7.8.2.war
 ```
 
 ## Architecture

angular.json

@@ -226,7 +226,7 @@
     "packageManager": "npm",
     "cache": {
       "enabled": true,
-      "path": ".cache",
+      "path": "./build/angular/",
       "environment": "all"
     },
     "schematicCollections": [

build.gradle

@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.8.1"
+version = "7.8.2"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -306,7 +306,7 @@ dependencies {
     implementation "org.springframework.security:spring-security-oauth2-core:${spring_security_version}"
     implementation "org.springframework.security:spring-security-oauth2-client:${spring_security_version}"
     // use newest version of nimbus-jose-jwt to avoid security issues through outdated dependencies
-    implementation "com.nimbusds:nimbus-jose-jwt:9.48"
+    implementation "com.nimbusds:nimbus-jose-jwt:10.0.1"
 
     implementation "org.springframework.security:spring-security-oauth2-jose:${spring_security_version}"
     implementation "org.springframework.security:spring-security-crypto:${spring_security_version}"
@@ -400,7 +400,7 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-test:${spring_boot_version}"
     testImplementation "org.springframework.security:spring-security-test:${spring_security_version}"
     testImplementation "org.springframework.boot:spring-boot-test:${spring_boot_version}"
-    testImplementation "org.assertj:assertj-core:3.27.0"
+    testImplementation "org.assertj:assertj-core:3.27.2"
     testImplementation "org.mockito:mockito-core:${mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
 
@@ -420,7 +420,7 @@ dependencies {
     testImplementation "com.h2database:h2:2.2.224"
 
     // Lightweight JSON library needed for the internals of the MockRestServiceServer
-    testImplementation "org.json:json:20240303"
+    testImplementation "org.json:json:20241224"
 
     // NOTE: make sure this corresponds to the version used for JUnit in the testImplementation
     testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"

docker/nginx/nginx.conf

@@ -32,7 +32,8 @@ http {
 
     keepalive_timeout  65;
 
-    #gzip  on;
+    gzip on;
+    gzip_types text/plain application/javascript application/x-javascript text/javascript text/xml text/css;
 
     # specific Artemis value from the Artemis ansible collection
     server_names_hash_bucket_size 256;

docs/admin/setup/programming-exercises.rst

@@ -98,9 +98,6 @@ server or exercise settings:
   * - ``#isStaticCodeAnalysisEnabled``
     - Defines if static code analysis should be performed.
     - Exercise configuration
-  * - ``#isTestWiseCoverageEnabled``
-    - Defines if testwise coverage should be collected.
-    - Exercise configuration
 
 The ``pipeline.groovy`` file can be customized further by instructors after creating the exercise from within
 Artemis via the ‘Edit Build Plan’ button on the details page of the exercise.

docs/conf.py

@@ -18,7 +18,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Artemis'
-copyright = '2024, Applied Education Technologies, Technical University of Munich'
+copyright = '2025, Applied Education Technologies, Technical University of Munich'
 author = 'Applied Education Technologies, Technical University of Munich'
 
 

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

@@ -106,9 +106,6 @@ Generate programming exercise
     - **Sequential Test Runs:** Activate this option to first run structural and then behavior tests.
       This feature allows students to better concentrate on the immediate challenge at hand.
       Not supported together with static code analysis. Cannot be changed after the exercise creation.
-    - **Record Testwise Coverage:** Activate this option to record the testwise coverage for the solution repository.
-      This is necessary when working with Hestia to generate code-based hints.
-      This option is only available for Java/Kotlin-exercises with non-sequential test runs.
     - **Customize Build Plan** Activate this option if you want to customize the build plan of your exercise.
       This feature is available for all programming languages, and works with LocalCI and Jenkins, Artemis provides templates for the build plan configuration.
       The build plan can also be customized after the exercise creation.

gradle.properties

@@ -28,7 +28,7 @@ jplag_version=5.1.0
 # 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.19.1
+sentry_version=7.20.0
 liquibase_version=4.30.0
 docker_java_version=3.4.1
 logback_version=1.5.15
@@ -41,7 +41,7 @@ mysql_version=9.1.0
 # make sure both versions are compatible
 junit_version=5.11.3
 junit_platform_version=1.11.4
-mockito_version=5.14.2
+mockito_version=5.15.2
 testcontainer_version=1.20.4
 
 # gradle plugin version

gradle/liquibase.gradle

@@ -19,12 +19,12 @@ ext.isWindows = OperatingSystem.current().isWindows()
 
 if (isWindows) {
     tasks.register("pathingLiquibaseJar", Jar) {
-        dependsOn configurations.liquibase
+        dependsOn configurations.liquibaseRuntime
         archiveAppendix = "pathingLiquibase"
 
         doFirst {
             manifest {
-                attributes "Class-Path": (sourceSets.main.runtimeClasspath + configurations.liquibase).collect {
+                attributes "Class-Path": (sourceSets.main.runtimeClasspath + configurations.liquibaseRuntime).collect {
                     it.toURI().toURL().toString().replaceFirst(/file:\/+/, "/")
                 }.join(" ")
             }
@@ -46,7 +46,7 @@ def liquibaseCommand(command) {
             classpath tasks.named("pathingLiquibaseJar").get().outputs.files
         } else {
             classpath sourceSets.main.runtimeClasspath
-            classpath configurations.liquibase
+            classpath configurations.liquibaseRuntime
         }
         mainClass = "liquibase.integration.commandline.Main"
 

gradle/test.gradle

@@ -57,7 +57,8 @@ test {
         useJUnitPlatform()
         exclude "**/*IT*", "**/*IntTest*"
     }
-
+    testClassesDirs = testing.suites.test.sources.output.classesDirs
+    classpath = testing.suites.test.sources.runtimeClasspath
     testLogging {
         events "FAILED", "SKIPPED"
     }
@@ -107,13 +108,13 @@ jacocoTestCoverageVerification {
                 counter = "INSTRUCTION"
                 value = "COVEREDRATIO"
                 // TODO: in the future the following value should become higher than 0.92
-                minimum = 0.895
+                minimum = 0.891
             }
             limit {
                 counter = "CLASS"
                 value = "MISSEDCOUNT"
                 // TODO: in the future the following value should become less than 10
-                maximum = 56
+                maximum = 55
             }
         }
     }

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.71,
-            branches: 73.85,
-            functions: 82.28,
-            lines: 87.77,
+            statements: 87.73,
+            branches: 73.87,
+            functions: 82.44,
+            lines: 87.78,
         },
     },
     coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],