Skip to content

Commit

Permalink
Merge branch 'develop' into feature/lectures/add-status-bar
Browse files Browse the repository at this point in the history
  • Loading branch information
florian-glombik authored Dec 22, 2024
2 parents 1d6a4e3 + fbf086c commit 0430c36
Show file tree
Hide file tree
Showing 115 changed files with 2,244 additions and 1,099 deletions.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ dependencies {
implementation "de.jplag:c:${jplag_version}"
implementation "de.jplag:cpp:${jplag_version}"
implementation "de.jplag:csharp:${jplag_version}"
implementation "de.jplag:golang:${jplag_version}"
implementation "de.jplag:java:${jplag_version}"
implementation "de.jplag:javascript:${jplag_version}"
implementation "de.jplag:kotlin:${jplag_version}"
Expand Down Expand Up @@ -418,7 +419,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.47"
implementation "com.nimbusds:nimbus-jose-jwt:9.48"

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 @@ -532,7 +533,7 @@ dependencies {
testImplementation "io.github.classgraph:classgraph:4.8.179"
testImplementation "org.awaitility:awaitility:4.2.2"
testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
testImplementation "org.gradle:gradle-tooling-api:8.11.1"
testImplementation "org.gradle:gradle-tooling-api:8.12"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.2"
testImplementation "com.opencsv:opencsv:5.9"
testImplementation("io.zonky.test:embedded-database-spring-test:2.6.0") {
Expand Down
2 changes: 1 addition & 1 deletion docker/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
services:
mysql:
container_name: artemis-mysql
image: docker.io/library/mysql:9.0.1
image: docker.io/library/mysql:9.1.0
pull_policy: if_not_present
volumes:
- artemis-mysql-data:/var/lib/mysql
Expand Down
2 changes: 1 addition & 1 deletion docker/nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
nginx:
# nginx setup based on artemis prod ansible repository
container_name: artemis-nginx
image: docker.io/library/nginx:1.26
image: docker.io/library/nginx:1.27.3
pull_policy: if_not_present
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
Expand Down
2 changes: 1 addition & 1 deletion docker/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# default config /etc/nginx/nginx.conf from the nginx:1.26 docker image
# default config /etc/nginx/nginx.conf from the nginx:1.27.3 docker image
# comment specific Artemis changes!

user nginx;
Expand Down
2 changes: 1 addition & 1 deletion docker/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
services:
postgres:
container_name: artemis-postgres
image: docker.io/library/postgres:17.0-alpine
image: docker.io/library/postgres:17.2-alpine
pull_policy: if_not_present
user: postgres
command: ["postgres", "-c", "max_connections=10000"]
Expand Down
4 changes: 2 additions & 2 deletions docs/admin/database.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Migrating MySQL Data to PostgreSQL
---
services:
mysql:
image: docker.io/library/mysql:9.0.1
image: docker.io/library/mysql:9.1.0
environment:
- MYSQL_DATABASE=Artemis
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
Expand All @@ -59,7 +59,7 @@ Migrating MySQL Data to PostgreSQL
- db-migration
postgres:
image: docker.io/library/postgres:17.0
image: docker.io/library/postgres:17.2-alpine
environment:
- POSTGRES_USER=root
- POSTGRES_DB=Artemis
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/setup/docker-compose.rst
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ The ``docker-compose.yml`` file could look like this for an Artemis, Jenkins and
- "traefik.http.services.artemis.loadbalancer.server.port=8080"
artemis-db:
image: mysql:9
image: mysql:9.1.0
container_name: "mysql"
restart: unless-stopped
volumes:
Expand Down
4 changes: 4 additions & 0 deletions docs/user/exercises/programming-exercise-features.inc
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ Instructors can still use those templates to generate programming exercises and
+----------------------+----------+---------+
| C# | yes | yes |
+----------------------+----------+---------+
| Go | 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.
Expand Down Expand Up @@ -87,6 +89,8 @@ Instructors can still use those templates to generate programming exercises and
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
| C# | no | no | yes | no | n/a | no | no | L: yes, J: no |
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
| Go | no | no | yes | yes | 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.
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ npm_version=10.9.0

# Dependency versions
jhipster_dependencies_version=8.7.2
spring_boot_version=3.4.0
spring_boot_version=3.4.1
spring_framework_version=6.2.1
spring_cloud_version=4.2.0
spring_security_version=6.4.2
Expand All @@ -31,7 +31,7 @@ slf4j_version=2.0.16
sentry_version=7.19.0
liquibase_version=4.30.0
docker_java_version=3.4.1
logback_version=1.5.14
logback_version=1.5.15
java_parser_version=3.26.2
byte_buddy_version=1.15.11
netty_version=4.1.115.Final
Expand All @@ -48,7 +48,7 @@ testcontainer_version=1.20.4
# gradle plugin version
gradle_node_plugin_version=7.1.0
apt_plugin_version=0.21
liquibase_plugin_version=2.1.1
liquibase_plugin_version=2.2.2
modernizer_plugin_version=1.10.0

org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en \
Expand Down
8 changes: 4 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ module.exports = {
coverageThreshold: {
global: {
// TODO: in the future, the following values should increase to at least 90%
statements: 87.69,
branches: 73.79,
functions: 82.28,
lines: 87.74,
statements: 87.73,
branches: 73.85,
functions: 82.31,
lines: 87.78,
},
},
coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],
Expand Down
Loading

0 comments on commit 0430c36

Please sign in to comment.