Skip to content

Commit

Permalink
Merge branch 'develop' into chore/integrated-code-lifecycle/build-age…
Browse files Browse the repository at this point in the history
…nt-integration-tests
  • Loading branch information
BBesrour committed Mar 11, 2025
2 parents 1c6dc60 + 06f2da4 commit d92b5b3
Show file tree
Hide file tree
Showing 90 changed files with 8,950 additions and 3,236 deletions.
20 changes: 14 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
id "com.github.ben-manes.versions" version "0.52.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 "com.gorylenko.gradle-git-properties" version "2.5.0"
id "io.spring.dependency-management" version "1.1.7"
id "nebula.lint" version "20.5.6"
id "org.liquibase.gradle" version "${liquibase_plugin_version}"
Expand All @@ -37,7 +37,7 @@ java {
}

wrapper {
gradleVersion = "8.13-rc-2"
gradleVersion = "8.13"
}

node {
Expand Down Expand Up @@ -105,6 +105,7 @@ configurations.configureEach {
exclude group: "javax.xml.bind", module: "jaxb-api"

exclude group: "org.junit.vintage", module: "junit-vintage-engine"
exclude group: "junit", module: "junit"
exclude group: "com.vaadin.external.google", module: "android-json"
exclude group: "org.xmlunit", module: "xmlunit-core"

Expand Down Expand Up @@ -158,7 +159,7 @@ dependencies {
implementation "org.apache.httpcomponents.core5:httpcore5:5.3.3"
implementation "org.apache.httpcomponents:httpmime:4.5.14"

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

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

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

implementation "org.jsoup:jsoup:1.18.3"
implementation "org.jsoup:jsoup:1.19.1"
implementation "commons-codec:commons-codec:1.18.0" // needed for spring security saml2

// use the latest version to avoid security vulnerabilities
Expand Down Expand Up @@ -322,7 +323,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:10.0.1"
implementation "com.nimbusds:nimbus-jose-jwt:10.0.2"

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 @@ -411,7 +412,7 @@ dependencies {
testImplementation "io.github.classgraph:classgraph:4.8.179"
testImplementation "org.awaitility:awaitility:4.3.0"
testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
testImplementation "org.gradle:gradle-tooling-api:8.12.1"
testImplementation "org.gradle:gradle-tooling-api:8.13"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.2"
testImplementation "io.zonky.test:embedded-database-spring-test:2.6.0"

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

testImplementation "org.junit.jupiter:junit-jupiter:${junit_version}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}"
testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}"

// NOTE: make sure this corresponds to the version used for JUnit in the testImplementation
testImplementation "org.junit.platform:junit-platform-commons:${junit_platform_version}"
testImplementation "org.junit.platform:junit-platform-engine:${junit_platform_version}"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
}

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
alabaster==1.0.0
docutils==0.21.2
Jinja2==3.1.5
Jinja2==3.1.6
requests==2.32.3
Sphinx==8.1.3
sphinx-rtd-theme==3.0.2
Expand Down
2 changes: 1 addition & 1 deletion docs/user/exercises/programming-exercise-features.inc
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Instructors can still use those templates to generate programming exercises and
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
| Rust | no | L: yes; J: no | yes | no | n/a | no | L: yes, J: no |
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
| JavaScript | no | no | yes | no | n/a | no | L: yes, J: no |
| JavaScript | no | L: yes; J: no | yes | no | n/a | no | L: yes, J: no |
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
| R | no | no | yes | no | n/a | no | L: yes, J: no |
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
Expand Down
24 changes: 12 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,37 @@ opensaml_version=4.3.2
jwt_version=0.12.6
jaxb_runtime_version=4.0.5
hazelcast_version=5.5.0
fasterxml_version=2.18.2
fasterxml_version=2.18.3
# TODO: 7.1.0 includes bugs related to git diffs, therefore we cannot update
jgit_version=7.0.0.202409031743-r
sshd_version=2.14.0
checkstyle_version=10.21.2
sshd_version=2.15.0
checkstyle_version=10.21.4
jplag_version=6.0.0
# not really used in Artemis, nor JPlag, nor the used version of Stanford CoreNLP, but we use the latest to avoid security vulnerability warnings
# 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=8.2.0
slf4j_version=2.0.17
sentry_version=8.3.0
liquibase_version=4.31.1
docker_java_version=3.4.1
logback_version=1.5.16
docker_java_version=3.4.2
logback_version=1.5.17
java_parser_version=3.26.2
byte_buddy_version=1.17.1
byte_buddy_version=1.17.2
netty_version=4.1.118.Final
mysql_version=9.2.0
micrometer_version=1.14.4

# testing
# make sure both versions are compatible
junit_version=5.11.4
junit_platform_version=1.11.4
mockito_version=5.15.2
junit_version=5.12.0
junit_platform_version=1.12.0
mockito_version=5.16.0
testcontainer_version=1.20.4

# gradle plugin version
gradle_node_plugin_version=7.1.0
apt_plugin_version=0.21
liquibase_plugin_version=3.0.1
liquibase_plugin_version=3.0.2
modernizer_plugin_version=1.11.0
spotless_plugin_version=7.0.2

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 4 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ module.exports = {
coverageThreshold: {
global: {
// TODO: in the future, the following values should increase to at least 90%
statements: 88.72,
branches: 74.42,
functions: 82.84,
lines: 88.78,
statements: 88.71,
branches: 74.39,
functions: 82.86,
lines: 88.77,
},
},
coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],
Expand Down
Loading

0 comments on commit d92b5b3

Please sign in to comment.