Merge branch 'develop' into feature/exam-mode/add-sidebar-with-large-…

…cards

Pull latest changes from develop

.github/PULL_REQUEST_TEMPLATE.md

@@ -74,14 +74,15 @@ Prerequisites:
 > [!NOTE]
 > These badges show the state of the test servers.
 > Green = Currently available, Red = Currently locked
-
-![](https://byob.yarr.is/ls1intum/Artemis/artemis-test1)
-![](https://byob.yarr.is/ls1intum/Artemis/artemis-test2)
-![](https://byob.yarr.is/ls1intum/Artemis/artemis-test3)
-![](https://byob.yarr.is/ls1intum/Artemis/artemis-test4)
-![](https://byob.yarr.is/ls1intum/Artemis/artemis-test5)
-![](https://byob.yarr.is/ls1intum/Artemis/artemis-test6)
-![](https://byob.yarr.is/ls1intum/Artemis/artemis-test9)
+> Click on the badges to get to the test servers.
+
+[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test1)](https://artemis-test1.artemis.cit.tum.de)
+[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test2)](https://artemis-test2.artemis.cit.tum.de)
+[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test3)](https://artemis-test3.artemis.cit.tum.de)
+[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test4)](https://artemis-test4.artemis.cit.tum.de)
+[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test5)](https://artemis-test5.artemis.cit.tum.de)
+[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test6)](https://artemis-test6.artemis.cit.tum.de)
+[![](https://byob.yarr.is/ls1intum/Artemis/artemis-test9)](https://artemis-test9.artemis.cit.tum.de)
 
 ### Review Progress
 <!-- Each PR should be reviewed by at least two other developers. The code, the functionality (= manual test) and the exam mode need to be reviewed. -->

build.gradle

@@ -228,7 +228,7 @@ dependencies {
 
     // Note: jenkins-client is not well maintained and includes dependencies to libraries with critical security issues (e.g. CVE-2020-10683 for [email protected])
     //    implementation "com.offbytwo.jenkins:jenkins-client:0.3.8"
-    implementation files("libs/jenkins-client-0.4.0.jar")
+    implementation files("libs/jenkins-client-0.4.1.jar")
     // The following 4 dependencies are explicitly integrated as transitive dependencies of jenkins-client-0.4.0.jar
     implementation "org.apache.httpcomponents.client5:httpclient5:5.3.1"
     implementation "org.apache.httpcomponents.core5:httpcore5:5.2.4"
@@ -268,7 +268,7 @@ dependencies {
 
     // 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"
-    implementation files("libs/spring-security-lti13-0.1.12.jar")
+    implementation files("libs/spring-security-lti13-0.1.13.jar")
 
     // https://search.maven.org/artifact/org.eclipse.jgit/org.eclipse.jgit
     implementation "org.eclipse.jgit:org.eclipse.jgit:${jgit_version}"

docs/admin/setup/athena.rst

@@ -25,7 +25,7 @@ HTTP. We need to extend the configuration in the file
    artemis:
       # ...
       athena:
-         url: http://localhost:5000
+         url: http://localhost:5100
          secret: abcdef12345
          modules:
             # See https://github.com/ls1intum/Athena for a list of available modules

src/main/resources/config/application-artemis.yml

@@ -95,7 +95,7 @@ artemis:
     name: Artemis
     email: [email protected]
   athena:
-    url: http://localhost:5000
+    url: http://localhost:5100
     secret: abcdef12345
     restricted-modules: module_text_llm,module_programming_llm
   apollon:

src/main/webapp/app/course/competencies/competency-accordion/competency-accordion.component.html

@@ -6,12 +6,14 @@
         (click)="toggle()"
     >
         <h4 class="fw-medium mb-0 py-2 col-sm-6 d-flex gap-2">
-            <fa-icon
-                [icon]="getIcon(competency.taxonomy)"
-                [fixedWidth]="true"
-                [ngbTooltip]="'artemisApp.competency.taxonomies.' + competency.taxonomy | artemisTranslate"
-                container="body"
-            />
+            @if (competency.taxonomy) {
+                <fa-icon
+                    [icon]="getIcon(competency.taxonomy)"
+                    [fixedWidth]="true"
+                    [ngbTooltip]="'artemisApp.competency.taxonomies.' + competency.taxonomy | artemisTranslate"
+                    container="body"
+                />
+            }
             {{ competency.title }}
         </h4>
         <div class="w-100 d-flex align-items-center gap-4">

src/main/webapp/app/entities/student-metrics.model.ts

@@ -71,7 +71,7 @@ export class CompetencyInformation {
     public id: number;
     public title: string;
     public description: string;
-    public taxonomy: CompetencyTaxonomy;
+    public taxonomy?: CompetencyTaxonomy;
     public softDueDate?: dayjs.Dayjs;
     public optional: boolean;
     public masteryThreshold: number;

src/main/webapp/i18n/de/global.json

@@ -251,7 +251,7 @@
             "viewResult": "Ergebnis anzeigen",
             "cleanupBuildPlan": "Build-Plan aufräumen",
             "exercise": "Aufgaben",
-            "scores": "Bewertungen",
+            "scores": "Punkte",
             "exams": "Klausuren",
             "hints": "Hinweise",
             "addExternalSubmission": "Externe Einreichung anlegen",

src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java

@@ -65,13 +65,13 @@ class ProgrammingExerciseLocalVCLocalCIIntegrationTest extends AbstractSpringInt
 
     private ProgrammingExercise programmingExercise;
 
-    LocalRepository templateRepository;
+    private LocalRepository templateRepository;
 
-    LocalRepository solutionRepository;
+    private LocalRepository solutionRepository;
 
-    LocalRepository testsRepository;
+    private LocalRepository testsRepository;
 
-    LocalRepository assignmentRepository;
+    private LocalRepository assignmentRepository;
 
     @Value("${artemis.user-management.internal-admin.username}")
     private String localVCUsername;

src/test/resources/config/application-artemis.yml

@@ -57,7 +57,7 @@ artemis:
         name: Artemis
         email: [email protected]
     athena:
-        url: http://localhost:5000
+        url: http://localhost:5100
         secret: abcdef12345
         restricted-modules: module_text_test_restricted,module_programming_test_restricted
     apollon: