Skip to content

Commit 292798b

Browse files
Merge branch 'develop' into feature/localVC/failed-access-logging
2 parents 53ef0ff + 06f2da4 commit 292798b

File tree

90 files changed

+8950
-3236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+8950
-3236
lines changed

build.gradle

+14-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919
id "com.github.ben-manes.versions" version "0.52.0"
2020
id "com.github.node-gradle.node" version "${gradle_node_plugin_version}"
2121
id "com.google.cloud.tools.jib" version "3.4.4"
22-
id "com.gorylenko.gradle-git-properties" version "2.4.2"
22+
id "com.gorylenko.gradle-git-properties" version "2.5.0"
2323
id "io.spring.dependency-management" version "1.1.7"
2424
id "nebula.lint" version "20.5.6"
2525
id "org.liquibase.gradle" version "${liquibase_plugin_version}"
@@ -37,7 +37,7 @@ java {
3737
}
3838

3939
wrapper {
40-
gradleVersion = "8.13-rc-2"
40+
gradleVersion = "8.13"
4141
}
4242

4343
node {
@@ -105,6 +105,7 @@ configurations.configureEach {
105105
exclude group: "javax.xml.bind", module: "jaxb-api"
106106

107107
exclude group: "org.junit.vintage", module: "junit-vintage-engine"
108+
exclude group: "junit", module: "junit"
108109
exclude group: "com.vaadin.external.google", module: "android-json"
109110
exclude group: "org.xmlunit", module: "xmlunit-core"
110111

@@ -158,7 +159,7 @@ dependencies {
158159
implementation "org.apache.httpcomponents.core5:httpcore5:5.3.3"
159160
implementation "org.apache.httpcomponents:httpmime:4.5.14"
160161

161-
implementation "org.gitlab4j:gitlab4j-api:6.0.0-rc.8"
162+
implementation "org.gitlab4j:gitlab4j-api:6.0.0-rc.9"
162163

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

@@ -223,7 +224,7 @@ dependencies {
223224
// required by Saml2, should NOT be used in other places
224225
implementation "org.apache.santuario:xmlsec:4.0.3"
225226

226-
implementation "org.jsoup:jsoup:1.18.3"
227+
implementation "org.jsoup:jsoup:1.19.1"
227228
implementation "commons-codec:commons-codec:1.18.0" // needed for spring security saml2
228229

229230
// use the latest version to avoid security vulnerabilities
@@ -322,7 +323,7 @@ dependencies {
322323
implementation "org.springframework.security:spring-security-oauth2-core:${spring_security_version}"
323324
implementation "org.springframework.security:spring-security-oauth2-client:${spring_security_version}"
324325
// use newest version of nimbus-jose-jwt to avoid security issues through outdated dependencies
325-
implementation "com.nimbusds:nimbus-jose-jwt:10.0.1"
326+
implementation "com.nimbusds:nimbus-jose-jwt:10.0.2"
326327

327328
implementation "org.springframework.security:spring-security-oauth2-jose:${spring_security_version}"
328329
implementation "org.springframework.security:spring-security-crypto:${spring_security_version}"
@@ -411,7 +412,7 @@ dependencies {
411412
testImplementation "io.github.classgraph:classgraph:4.8.179"
412413
testImplementation "org.awaitility:awaitility:4.3.0"
413414
testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
414-
testImplementation "org.gradle:gradle-tooling-api:8.12.1"
415+
testImplementation "org.gradle:gradle-tooling-api:8.13"
415416
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.2"
416417
testImplementation "io.zonky.test:embedded-database-spring-test:2.6.0"
417418

@@ -425,7 +426,14 @@ dependencies {
425426
// Lightweight JSON library needed for the internals of the MockRestServiceServer
426427
testImplementation "org.json:json:20250107"
427428

429+
testImplementation "org.junit.jupiter:junit-jupiter:${junit_version}"
430+
testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}"
431+
testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}"
432+
testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}"
433+
428434
// NOTE: make sure this corresponds to the version used for JUnit in the testImplementation
435+
testImplementation "org.junit.platform:junit-platform-commons:${junit_platform_version}"
436+
testImplementation "org.junit.platform:junit-platform-engine:${junit_platform_version}"
429437
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
430438
}
431439

docs/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
alabaster==1.0.0
22
docutils==0.21.2
3-
Jinja2==3.1.5
3+
Jinja2==3.1.6
44
requests==2.32.3
55
Sphinx==8.1.3
66
sphinx-rtd-theme==3.0.2

docs/user/exercises/programming-exercise-features.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Instructors can still use those templates to generate programming exercises and
8787
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
8888
| Rust | no | L: yes; J: no | yes | no | n/a | no | L: yes, J: no |
8989
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
90-
| JavaScript | no | no | yes | no | n/a | no | L: yes, J: no |
90+
| JavaScript | no | L: yes; J: no | yes | no | n/a | no | L: yes, J: no |
9191
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
9292
| R | no | no | yes | no | n/a | no | L: yes, J: no |
9393
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+

gradle.properties

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,37 @@ opensaml_version=4.3.2
1818
jwt_version=0.12.6
1919
jaxb_runtime_version=4.0.5
2020
hazelcast_version=5.5.0
21-
fasterxml_version=2.18.2
21+
fasterxml_version=2.18.3
2222
# TODO: 7.1.0 includes bugs related to git diffs, therefore we cannot update
2323
jgit_version=7.0.0.202409031743-r
24-
sshd_version=2.14.0
25-
checkstyle_version=10.21.2
24+
sshd_version=2.15.0
25+
checkstyle_version=10.21.4
2626
jplag_version=6.0.0
2727
# not really used in Artemis, nor JPlag, nor the used version of Stanford CoreNLP, but we use the latest to avoid security vulnerability warnings
2828
# NOTE: we cannot need to use the latest version 9.x or 10.x here as long as Stanford CoreNLP does not reference it
2929
lucene_version=8.11.4
30-
slf4j_version=2.0.16
31-
sentry_version=8.2.0
30+
slf4j_version=2.0.17
31+
sentry_version=8.3.0
3232
liquibase_version=4.31.1
33-
docker_java_version=3.4.1
34-
logback_version=1.5.16
33+
docker_java_version=3.4.2
34+
logback_version=1.5.17
3535
java_parser_version=3.26.2
36-
byte_buddy_version=1.17.1
36+
byte_buddy_version=1.17.2
3737
netty_version=4.1.118.Final
3838
mysql_version=9.2.0
3939
micrometer_version=1.14.4
4040

4141
# testing
4242
# make sure both versions are compatible
43-
junit_version=5.11.4
44-
junit_platform_version=1.11.4
45-
mockito_version=5.15.2
43+
junit_version=5.12.0
44+
junit_platform_version=1.12.0
45+
mockito_version=5.16.0
4646
testcontainer_version=1.20.4
4747

4848
# gradle plugin version
4949
gradle_node_plugin_version=7.1.0
5050
apt_plugin_version=0.21
51-
liquibase_plugin_version=3.0.1
51+
liquibase_plugin_version=3.0.2
5252
modernizer_plugin_version=1.11.0
5353
spotless_plugin_version=7.0.2
5454

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

jest.config.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ module.exports = {
9191
coverageThreshold: {
9292
global: {
9393
// TODO: in the future, the following values should increase to at least 90%
94-
statements: 88.72,
95-
branches: 74.42,
96-
functions: 82.84,
97-
lines: 88.78,
94+
statements: 88.71,
95+
branches: 74.39,
96+
functions: 82.86,
97+
lines: 88.77,
9898
},
9999
},
100100
coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],

0 commit comments

Comments
 (0)