Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ssh-usability-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonEntholzer authored Jun 20, 2024
2 parents eaeb1d7 + c63709d commit 21d4a9c
Show file tree
Hide file tree
Showing 183 changed files with 3,269 additions and 3,040 deletions.
17 changes: 9 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,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.2.2.war
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.2.3.war
```

## Architecture
Expand Down
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
"index": "src/main/webapp/index.html",
"browser": "src/main/webapp/app/app.main.ts",
"polyfills": [
"src/main/webapp/app/polyfills.ts"
"src/main/webapp/app/polyfills.ts",
"@angular/localize/init"
],
"tsConfig": "tsconfig.json",
"inlineStyleLanguage": "scss",
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ plugins {
}

group = "de.tum.in.www1.artemis"
version = "7.2.2"
version = "7.2.3"
description = "Interactive Learning with Individual Feedback"

java {
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/setup/athena.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ following dependencies/tools on your machine:
2. `MySQL Database Server 8 <https://dev.mysql.com/downloads/mysql>`__, or `PostgreSQL <https://www.postgresql.org/>`_:
Artemis uses Hibernate to store entities in an SQL database and Liquibase to
automatically apply schema transformations when updating Artemis.
3. `Node.js <https://nodejs.org/en/download>`__: We use Node LTS (>=20.10.0 < 21) to compile
3. `Node.js <https://nodejs.org/en/download>`__: We use Node LTS (>=20.14.0 < 21) to compile
and run the client Angular application. Depending on your system, you
can install Node either from source or as a pre-packaged bundle.
4. `Npm <https://nodejs.org/en/download>`__: We use Npm (>=10.2.3) to
4. `Npm <https://nodejs.org/en/download>`__: We use Npm (>=10.7.0) to
manage client side dependencies. Npm is typically bundled with Node.js,
but can also be installed separately.
5. ( `Graphviz <https://www.graphviz.org/download/>`__: We use Graphviz to generate graphs within exercise task
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ rootProject.name=Artemis
profile=dev

# Build properties
node_version=20.10.0
npm_version=10.2.3
node_version=20.14.0
npm_version=10.7.0

# Dependency versions
jhipster_dependencies_version=8.5.0
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ module.exports = {
global: {
// TODO: in the future, the following values should increase to at least 90%
statements: 86.80,
branches: 73.21,
branches: 73.18,
functions: 81.21,
lines: 86.89,
},
Expand Down
Binary file removed libs/jenkins-client-0.4.0.jar
Binary file not shown.
Binary file added libs/jenkins-client-0.4.1.jar
Binary file not shown.
Binary file removed libs/spring-security-lti13-0.1.12.jar
Binary file not shown.
Binary file added libs/spring-security-lti13-0.1.13.jar
Binary file not shown.
Loading

0 comments on commit 21d4a9c

Please sign in to comment.