Merge branch 'develop' into bugfix/lectures/fix-long-filenames-showing

ls1intum · Nov 9, 2024 · b7c0bb4 · b7c0bb4
2 parents bfac2f0 + 64f95cd
commit b7c0bb4
Show file tree

Hide file tree

Showing 162 changed files with 5,540 additions and 1,484 deletions.
diff --git a/build.gradle b/build.gradle
@@ -249,6 +249,7 @@ dependencies {
 
     implementation "de.jplag:c:${jplag_version}"
     implementation "de.jplag:cpp:${jplag_version}"
+    implementation "de.jplag:csharp:${jplag_version}"
     implementation "de.jplag:java:${jplag_version}"
     implementation "de.jplag:javascript:${jplag_version}"
     implementation "de.jplag:kotlin:${jplag_version}"
@@ -313,15 +314,15 @@ dependencies {
     implementation "ch.qos.logback:logback-classic:${logback_version}"
     implementation "ch.qos.logback:logback-core:${logback_version}"
     // required by eureka client
-    implementation "com.thoughtworks.xstream:xstream:1.4.20"
+    implementation "com.thoughtworks.xstream:xstream:1.4.21"
     // required by JPlag
     implementation "xerces:xercesImpl:2.12.2"
     // required by JPlag
     implementation "xalan:xalan:2.7.3"
     // required by JPlag
     implementation "xalan:serializer:2.7.3"
     // required by Saml2
-    implementation "org.apache.santuario:xmlsec:4.0.2"
+    implementation "org.apache.santuario:xmlsec:4.0.3"
 
     implementation "org.jsoup:jsoup:1.18.1"
     implementation "commons-codec:commons-codec:1.17.1"   // needed for spring security saml2
@@ -373,7 +374,7 @@ dependencies {
     implementation "javax.cache:cache-api:1.1.1"
     implementation "org.hibernate.orm:hibernate-core:${hibernate_version}"
 
-    implementation "com.zaxxer:HikariCP:6.0.0"
+    implementation "com.zaxxer:HikariCP:6.1.0"
 
     implementation "org.apache.commons:commons-text:1.12.0"
     implementation "org.apache.commons:commons-math3:3.6.1"
@@ -421,7 +422,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.45"
+    implementation "com.nimbusds:nimbus-jose-jwt:9.46"
 
     implementation "org.springframework.security:spring-security-oauth2-jose:${spring_security_version}"
     implementation "org.springframework.security:spring-security-crypto:${spring_security_version}"

diff --git a/docs/user/adaptive-learning/adaptive-learning-instructor.rst b/docs/user/adaptive-learning/adaptive-learning-instructor.rst
@@ -51,11 +51,10 @@ Create/Edit Competencies
   Besides a title and description, they can set a `taxonomy <https://en.wikipedia.org/wiki/Bloom%27s_taxonomy>`_.
 | The mastery threshold describes the minimum mastery required for a student to consider the competency as mastered.
   The current average mastery shown on this page can be used as a basis for defining a reasonable threshold value.
-| Instructors can link competencies to lecture units on this page by first choosing a lecture and then selecting desired lecture units.
 
 |instructor-competency-edit|
 
-Alternatively, instructors can also link competencies to an exercise or lecture unit on the respective management page using the selection box shown below.
+Instructors can link competencies to an exercise or lecture unit on the respective management page using the selection box shown below.
 
 |instructor-competency-link|
 

diff --git a/docs/user/adaptive-learning/instructor/competency-edit.png b/docs/user/adaptive-learning/instructor/competency-edit.png
diff --git a/docs/user/adaptive-learning/instructor/competency-recommendation.png b/docs/user/adaptive-learning/instructor/competency-recommendation.png
diff --git a/docs/user/exams/instructor/programming_assessment.png b/docs/user/exams/instructor/programming_assessment.png
diff --git a/docs/user/exercises/modeling/create-modeling-exercise-form-3.png b/docs/user/exercises/modeling/create-modeling-exercise-form-3.png
diff --git a/docs/user/exercises/programming-exercise-features.inc b/docs/user/exercises/programming-exercise-features.inc
@@ -43,6 +43,8 @@ Instructors can still use those templates to generate programming exercises and
   +----------------------+----------+---------+
   | TypeScript           | yes      | yes     |
   +----------------------+----------+---------+
+  | C#                   | 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.
@@ -83,6 +85,8 @@ Instructors can still use those templates to generate programming exercises and
   +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
   | TypeScript           | no                   | no                   | yes                 | no           | n/a                                      | no                           | no                         | L: yes, J: no          |
   +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
+  | C#                   | 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.

diff --git a/docs/user/exercises/programming/CodeEditor.png b/docs/user/exercises/programming/CodeEditor.png
diff --git a/...user/exercises/programming/course-management-template-solution-diff-example.png b/...user/exercises/programming/course-management-template-solution-diff-example.png
diff --git a/docs/user/exercises/programming/instructor-editor.png b/docs/user/exercises/programming/instructor-editor.png
diff --git a/docs/user/exercises/programming/online-editor-assessment.png b/docs/user/exercises/programming/online-editor-assessment.png
diff --git a/docs/user/exercises/programming/online-editor-feedback.png b/docs/user/exercises/programming/online-editor-feedback.png
diff --git a/docs/user/exercises/programming/programming-edit-status.png b/docs/user/exercises/programming/programming-edit-status.png
diff --git a/docs/user/exercises/programming/programming-options-problem-statement.png b/docs/user/exercises/programming/programming-options-problem-statement.png
diff --git a/docs/user/exercises/quiz/drag-and-drop-question.png b/docs/user/exercises/quiz/drag-and-drop-question.png
diff --git a/docs/user/exercises/quiz/multiple-choice-question.png b/docs/user/exercises/quiz/multiple-choice-question.png
diff --git a/docs/user/exercises/quiz/short-answer-question.png b/docs/user/exercises/quiz/short-answer-question.png
diff --git a/docs/user/exercises/text/create-text-exercise-form-2.png b/docs/user/exercises/text/create-text-exercise-form-2.png
diff --git a/docs/user/icl/local-vc/commit-diff-view.png b/docs/user/icl/local-vc/commit-diff-view.png
diff --git a/docs/user/icl/local-vc/current-repository-content-view.png b/docs/user/icl/local-vc/current-repository-content-view.png
diff --git a/docs/user/lectures.rst b/docs/user/lectures.rst
@@ -154,44 +154,44 @@ See :ref:`Adaptive Learning <adaptive-learning>` for more information.
 
 
 .. |lectures-overview| image:: lectures/lectures-overview.png
-    :width: 800
+    :width: 1000
 .. |lecture-details| image:: lectures/lecture-details.png
-    :width: 800
+    :width: 1000
 .. |lectures-management| image:: lectures/lectures-management.png
-    :width: 800
+    :width: 1000
 .. |lectures-management-btn| image:: lectures/lectures-management-button.png
     :width: 80
 .. |create-lecture| image:: lectures/create-lecture.png
-    :width: 800
+    :width: 1000
 .. |create-lecture-btn| image:: lectures/create-lecture-button.png
     :width: 120
 .. |switch-to-guided-mode-btn| image:: lectures/switch-to-guided-mode-button.png
     :width: 160
 .. |create-attachment| image:: lectures/create-attachment.png
-    :width: 800
+    :width: 1000
 .. |import-lecture| image:: lectures/import-lecture.png
-    :width: 800
+    :width: 1000
 .. |import-lecture-btn| image:: lectures/import-lecture-button.png
     :width: 120
 .. |units-management-empty| image:: lectures/units-management-empty.png
-    :width: 800
+    :width: 1000
 .. |units-management| image:: lectures/units-management.png
-    :width: 800
+    :width: 1000
 .. |create-online-unit| image:: lectures/create-online-unit.png
-    :width: 800
+    :width: 1000
 .. |create-text-unit| image:: lectures/create-text-unit.png
-    :width: 800
+    :width: 1000
 .. |create-video-unit| image:: lectures/create-video-unit.png
-    :width: 800
+    :width: 1000
 .. |create-attachment-unit| image:: lectures/create-attachment-unit.png
-    :width: 800
+    :width: 1000
 .. |create-exercise-unit| image:: lectures/create-exercise-unit.png
-    :width: 800
+    :width: 1000
 .. |process-units-checkbox| image:: lectures/process-units-checkbox.png
    :width: 120
 .. |process-units-btn| image:: lectures/process-units-btn.png
    :width: 120
 .. |processed-lecture-units| image:: lectures/processed-lecture-units.png
-   :width: 800
+   :width: 1000
 .. |automatic-unit-processing| image:: lectures/automatic-unit-processing.png
-   :width: 800
+   :width: 1000
diff --git a/docs/user/lectures/automatic-unit-processing.png b/docs/user/lectures/automatic-unit-processing.png
diff --git a/docs/user/lectures/create-attachment-unit.png b/docs/user/lectures/create-attachment-unit.png
diff --git a/docs/user/lectures/create-exercise-unit.png b/docs/user/lectures/create-exercise-unit.png
diff --git a/docs/user/lectures/create-lecture.png b/docs/user/lectures/create-lecture.png
diff --git a/docs/user/lectures/create-online-unit.png b/docs/user/lectures/create-online-unit.png
diff --git a/docs/user/lectures/create-text-unit.png b/docs/user/lectures/create-text-unit.png
diff --git a/docs/user/lectures/create-video-unit.png b/docs/user/lectures/create-video-unit.png
diff --git a/docs/user/markdown-support/markdown-lecture-example.png b/docs/user/markdown-support/markdown-lecture-example.png
diff --git a/docs/user/markdown-support/markdown-lecture-preview.png b/docs/user/markdown-support/markdown-lecture-preview.png
diff --git a/docs/user/markdown-support/markdown-post-extensions-preview.png b/docs/user/markdown-support/markdown-post-extensions-preview.png
diff --git a/docs/user/markdown-support/markdown-post-extensions.png b/docs/user/markdown-support/markdown-post-extensions.png
diff --git a/docs/user/plagiarism-check/instructor/student-notification.png b/docs/user/plagiarism-check/instructor/student-notification.png
diff --git a/docs/user/tutorialgroups/instructors-tutorial-group-form.png b/docs/user/tutorialgroups/instructors-tutorial-group-form.png
diff --git a/gradle.properties b/gradle.properties
@@ -19,18 +19,18 @@ hazelcast_version=5.5.0
 fasterxml_version=2.18.1
 jgit_version=7.0.0.202409031743-r
 sshd_version=2.14.0
-checkstyle_version=10.20.0
+checkstyle_version=10.20.1
 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 vulnerabilities
 # 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.16.0
-liquibase_version=4.29.2
+liquibase_version=4.30.0
 docker_java_version=3.4.0
 logback_version=1.5.12
 java_parser_version=3.26.2
-byte_buddy_version=1.15.9
+byte_buddy_version=1.15.10
 
 # testing
 # make sure both versions are compatible
@@ -43,7 +43,7 @@ mockito_version=5.14.2
 gradle_node_plugin_version=7.1.0
 apt_plugin_version=0.21
 liquibase_plugin_version=2.1.1
-modernizer_plugin_version=1.9.3
+modernizer_plugin_version=1.10.0
 
 org.gradle.jvmargs=-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en \
   --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \

diff --git a/jest.config.js b/jest.config.js
@@ -27,12 +27,15 @@ const esModules = [
     'd3-array',
     'd3-brush',
     'd3-color',
+    'd3-dispatch',
     'd3-drag',
     'd3-ease',
+    'd3-force',
     'd3-format',
     'd3-hierarchy',
     'd3-interpolate',
     'd3-path',
+    'd3-quadtree',
     'd3-scale',
     'd3-selection',
     'd3-shape',
@@ -102,10 +105,10 @@ module.exports = {
     coverageThreshold: {
         global: {
             // TODO: in the future, the following values should increase to at least 90%
-            statements: 87.53,
-            branches: 73.62,
-            functions: 82.09,
-            lines: 87.59,
+            statements: 87.55,
+            branches: 73.68,
+            functions: 82.12,
+            lines: 87.61,
         },
     },
     coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],