Skip to content

Commit

Permalink
Merge branch 'develop' into feature/programming-exercises/editor-reme…
Browse files Browse the repository at this point in the history
…mber-scroll-position
  • Loading branch information
chrisknedl authored Jan 5, 2025
2 parents 1ae0652 + 327857d commit b3c1437
Show file tree
Hide file tree
Showing 446 changed files with 2,809 additions and 19,010 deletions.
1 change: 0 additions & 1 deletion .github/issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ programming:
- build plan
- code hint
- \b(?<!\S)git(?!\S)\b
- testwise coverage
- \b(?<!\S)ide(?!\S)\b
- submission policy
- aeolus
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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}"

Expand All @@ -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}"
Expand Down
3 changes: 0 additions & 3 deletions docs/admin/setup/programming-exercises.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 37 additions & 42 deletions docs/user/exercises/programming-exercise-features.inc

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions docs/user/exercises/programming-exercise-setup.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,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
}
}
}
Expand Down
Loading

0 comments on commit b3c1437

Please sign in to comment.