Skip to content

Commit

Permalink
Merge branch 'develop' into chore/settings/migrate-to-new-client-guid…
Browse files Browse the repository at this point in the history
…elines
  • Loading branch information
SimonEntholzer authored Jan 6, 2025
2 parents cd382fc + 1798b25 commit 897abb0
Show file tree
Hide file tree
Showing 680 changed files with 5,752 additions and 21,182 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 LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 TUM Applied Education Technologies
Copyright (c) 2025 TUM Applied Education Technologies

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
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 [email protected] -w build/libs/Artemis-7.8.1.war
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.8.3.war
```

## Architecture
Expand Down
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"packageManager": "npm",
"cache": {
"enabled": true,
"path": ".cache",
"path": "./build/angular/",
"environment": "all"
},
"schematicCollections": [
Expand Down
42 changes: 19 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
buildscript {
dependencies {
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
classpath "com.diffplug.spotless:spotless-plugin-gradle:${spotless_plugin_version}"
// This is required so that the latest version of the liquibase gradle plugin works
classpath "org.liquibase:liquibase-core:${liquibase_version}"
}
}

plugins {
id "checkstyle"
id "java"
id "maven-publish"
id "idea"
id "jacoco"
id "org.springframework.boot" version "${spring_boot_version}"
id "io.spring.dependency-management" version "1.1.7"
id "com.google.cloud.tools.jib" version "3.4.4"
id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
id "com.diffplug.spotless" version "6.25.0"
// this allows us to find outdated dependencies via ./gradlew dependencyUpdates
id "com.github.ben-manes.versions" version "0.51.0"
id "java"
id "com.adarshr.test-logger" version "4.0.0"
id "com.diffplug.spotless" version "${spotless_plugin_version}"
id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
id "com.github.ben-manes.versions" version "0.51.0"
id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
id "com.google.cloud.tools.jib" version "3.4.4"
id "com.gorylenko.gradle-git-properties" version "2.4.2"
id "io.spring.dependency-management" version "1.1.7"
id "org.liquibase.gradle" version "${liquibase_plugin_version}"
id "org.owasp.dependencycheck" version "11.1.1"
id "com.adarshr.test-logger" version "4.0.0"
id "org.springframework.boot" version "${spring_boot_version}"
}

group = "de.tum.cit.aet.artemis"
version = "7.8.1"
version = "7.8.3"
description = "Interactive Learning with Individual Feedback"

java {
Expand Down Expand Up @@ -144,7 +145,7 @@ dependencies {
exclude module: "jaxb-api"
}

implementation "org.gitlab4j:gitlab4j-api:6.0.0-rc.7"
implementation "org.gitlab4j:gitlab4j-api:6.0.0-rc.8"

implementation "de.jplag:jplag:${jplag_version}"

Expand Down Expand Up @@ -305,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 All @@ -326,7 +327,7 @@ dependencies {
implementation "org.bouncycastle:bcpkix-jdk18on:1.79"
implementation "org.bouncycastle:bcprov-jdk18on:1.79"

implementation "com.mysql:mysql-connector-j:9.1.0"
implementation "com.mysql:mysql-connector-j:${mysql_version}"
implementation "org.postgresql:postgresql:42.7.4"

implementation "org.zalando:problem-spring-web:0.29.1"
Expand Down Expand Up @@ -365,7 +366,7 @@ dependencies {
strictly byte_buddy_version
}
}
liquibase("net.bytebuddy:byte-buddy") {
liquibaseRuntime("net.bytebuddy:byte-buddy") {
version {
strictly byte_buddy_version
}
Expand All @@ -380,11 +381,6 @@ dependencies {
strictly byte_buddy_version
}
}
liquibase("net.bytebuddy:byte-buddy-agent") {
version {
strictly byte_buddy_version
}
}

annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}"
annotationProcessor "org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}"
Expand All @@ -404,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 @@ -424,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: 2 additions & 1 deletion docker/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ http {

keepalive_timeout 65;

#gzip on;
gzip on;
gzip_types text/plain application/javascript application/x-javascript text/javascript text/xml text/css;

# specific Artemis value from the Artemis ansible collection
server_names_hash_bucket_size 256;
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
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# -- Project information -----------------------------------------------------

project = 'Artemis'
copyright = '2024, Applied Education Technologies, Technical University of Munich'
copyright = '2025, Applied Education Technologies, Technical University of Munich'
author = 'Applied Education Technologies, Technical University of Munich'


Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 897abb0

Please sign in to comment.