Merge branch 'feature/bearer-support' into feature/re-key

ls1intum · Nov 26, 2024 · 30a8652 · 30a8652
2 parents e57a661 + 7172f9c
commit 30a8652
Show file tree

Hide file tree

Showing 128 changed files with 1,432 additions and 1,414 deletions.
diff --git a/README.md b/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.2.war
+./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.7.3.war
 ```
 
 ## Architecture

diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.7.2"
+version = "7.7.3"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -428,6 +428,7 @@ dependencies {
     implementation "org.springframework.security:spring-security-core:${spring_security_version}"
     implementation "org.springframework.security:spring-security-oauth2-core:${spring_security_version}"
     implementation "org.springframework.security:spring-security-oauth2-client:${spring_security_version}"
+    implementation "org.springframework.security:spring-security-oauth2-resource-server:${spring_security_version}"
     // use newest version of nimbus-jose-jwt to avoid security issues through outdated dependencies
     implementation "com.nimbusds:nimbus-jose-jwt:9.47"
 
@@ -476,7 +477,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.11.0"
 
 
-    implementation "com.google.errorprone:error_prone_annotations:2.35.1"
+    implementation "com.google.errorprone:error_prone_annotations:2.36.0"
 
     // NOTE: we want to keep the same unique version for all configurations, implementation and annotationProcessor
     implementation("net.bytebuddy:byte-buddy") {
@@ -543,20 +544,20 @@ dependencies {
     testImplementation "io.github.classgraph:classgraph:4.8.179"
     testImplementation "org.awaitility:awaitility:4.2.2"
     testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
-    testImplementation "org.gradle:gradle-tooling-api:8.11"
+    testImplementation "org.gradle:gradle-tooling-api:8.11.1"
     testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.2"
     testImplementation "com.opencsv:opencsv:5.9"
     testImplementation("io.zonky.test:embedded-database-spring-test:2.5.1") {
         exclude group: "org.testcontainers", module: "mariadb"
         exclude group: "org.testcontainers", module: "mssqlserver"
     }
-    testImplementation "org.testcontainers:testcontainers:1.20.3"
-    testImplementation "org.testcontainers:mysql:1.20.3"
-    testImplementation "org.testcontainers:postgresql:1.20.3"
-    testImplementation "org.testcontainers:testcontainers:1.20.3"
-    testImplementation "org.testcontainers:junit-jupiter:1.20.3"
-    testImplementation "org.testcontainers:jdbc:1.20.3"
-    testImplementation "org.testcontainers:database-commons:1.20.3"
+    testImplementation "org.testcontainers:testcontainers:${testcontainer_version}"
+    testImplementation "org.testcontainers:mysql:${testcontainer_version}"
+    testImplementation "org.testcontainers:postgresql:${testcontainer_version}"
+    testImplementation "org.testcontainers:testcontainers:${testcontainer_version}"
+    testImplementation "org.testcontainers:junit-jupiter:${testcontainer_version}"
+    testImplementation "org.testcontainers:jdbc:${testcontainer_version}"
+    testImplementation "org.testcontainers:database-commons:${testcontainer_version}"
 
     testImplementation "com.tngtech.archunit:archunit:1.3.0"
     testImplementation("org.skyscreamer:jsonassert:1.5.3") {

diff --git a/docs/user/exams/student/access_exam.png b/docs/user/exams/student/access_exam.png
diff --git a/docs/user/exams/student/buttons/exam_hand_in_early.png b/docs/user/exams/student/buttons/exam_hand_in_early.png
diff --git a/docs/user/exams/student/buttons/save_exercise.png b/docs/user/exams/student/buttons/save_exercise.png
diff --git a/docs/user/exams/student/buttons/upload.png b/docs/user/exams/student/buttons/upload.png
diff --git a/docs/user/exams/student/exam_bar.png b/docs/user/exams/student/exam_bar.png
diff --git a/docs/user/exams/student/exam_modeling_exercises.png b/docs/user/exams/student/exam_modeling_exercises.png
diff --git a/docs/user/exams/student/exam_navigation_sidebar.png b/docs/user/exams/student/exam_navigation_sidebar.png
diff --git a/docs/user/exams/student/exam_overview.png b/docs/user/exams/student/exam_overview.png
diff --git a/docs/user/exams/student/exam_programming_exercises.png b/docs/user/exams/student/exam_programming_exercises.png
diff --git a/docs/user/exams/student/exam_quiz_exercises.png b/docs/user/exams/student/exam_quiz_exercises.png
diff --git a/docs/user/exams/student/exam_text_exercises.png b/docs/user/exams/student/exam_text_exercises.png
diff --git a/docs/user/exams/students_guide.rst b/docs/user/exams/students_guide.rst
@@ -105,6 +105,14 @@ Welcome Screen
 
    Welcome Screen, waiting for exam start
 
+This video offers a detailed guide on accessing your exams:
+
+.. raw:: html
+
+    <iframe src="https://live.rbg.tum.de/w/artemisintro/52546?video_only=1&t=0" allowfullscreen="1" frameborder="0" width="600" height="350">
+        Watch this video on TUM-Live.
+    </iframe>
+
 Exam Conduction
 ^^^^^^^^^^^^^^^
 - Once the exam working time starts and you have confirmed your participation, the *Exercise Overview* screen will appear. This screen lists all exercises that are part of your exam with their respective amount of points, title and exercise type. The status column indicates the status of each exercise and whether you have a submission in them or not.
@@ -132,6 +140,14 @@ Exam Conduction
 
    Exam Navigation Sidebar
 
+- You have two options to save your changes for an exercise:
+
+    1. Click the |save_exercise| button to manually save and submit your changes.
+    2. Select an exercise in the navigation sidebar (either the current one or a different exercise), which will automatically save and submit your changes.
+
+        .. warning::
+            The |save_exercise| button is only available for text, modeling, and quiz exercises. For file upload exercises, you need to manually click the |upload| button, and for programming exercises, you need to manually click the |submit| button to save and submit your changes. 
+
 - On the header, you will find the exam bar that includes the remaining time and the |exam_hand_in_early| button. If you click this button, you will be sent to the exam `End Screen`_.
 - The *time left* until the end of the exam is also shown next to the button.
 
@@ -373,6 +389,14 @@ Summary
 
    Complaining about the Assessment of a Text Exercise
 
+This video offers a detailed guide on participating in your exams:
+
+.. raw:: html
+
+    <iframe src="https://live.rbg.tum.de/w/artemisintro/53405?video_only=1&t=0" allowfullscreen="1" frameborder="0" width="600" height="350">
+        Watch this video on TUM-Live.
+    </iframe>
+
 Example Solutions
 ^^^^^^^^^^^^^^^^^
 - If the instructor sets the example solution publication date of the exam, the solutions will be available after that date.
@@ -470,3 +494,5 @@ Grades
 .. |exam_no_results_found| image:: student/buttons/exam_no_results_found.png
 .. |exam_hand_in_early| image:: student/buttons/exam_hand_in_early.png
 .. |saved_exercises| image:: student/buttons/saved_exercises.png
+.. |upload| image:: student/buttons/upload.png
+.. |save_exercise| image:: student/buttons/save_exercise.png
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ npm_version=10.8.0
 
 # Dependency versions
 jhipster_dependencies_version=8.7.2
-spring_boot_version=3.3.5
+spring_boot_version=3.3.6
 spring_security_version=6.3.5
 # 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
@@ -25,7 +25,7 @@ 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.17.0
+sentry_version=7.18.0
 liquibase_version=4.30.0
 docker_java_version=3.4.0
 logback_version=1.5.12
@@ -38,6 +38,7 @@ netty_version=4.1.115.Final
 junit_version=5.11.3
 junit_platform_version=1.11.3
 mockito_version=5.14.2
+testcontainer_version=1.20.4
 
 
 # gradle plugin version

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME