Skip to content

Commit

Permalink
Development: Update server dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephan Krusche committed Jun 9, 2024
1 parent 70e0fde commit df6b789
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 50 deletions.
25 changes: 12 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id "jacoco"
id "org.springframework.boot" version "${spring_boot_version}"
id "io.spring.dependency-management" version "1.1.5"
id "com.google.cloud.tools.jib" version "3.4.2"
id "com.google.cloud.tools.jib" version "3.4.3"
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
Expand Down Expand Up @@ -284,7 +284,7 @@ dependencies {
implementation "org.apache.sshd:sshd-sftp:${sshd_version}"

// https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml
implementation "net.sourceforge.plantuml:plantuml:1.2024.4"
implementation "net.sourceforge.plantuml:plantuml:1.2024.5"
implementation "org.jasypt:jasypt:1.9.3"
implementation "me.xdrop:fuzzywuzzy:1.4.0"
implementation("org.yaml:snakeyaml") {
Expand Down Expand Up @@ -376,13 +376,13 @@ dependencies {
implementation "org.springframework.ldap:spring-ldap-core:3.2.3"
implementation "org.springframework.data:spring-data-ldap:3.3.0"

implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.1") {
implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.2") {
// NOTE: these modules contain security vulnerabilities and are not needed
exclude module: "commons-jxpath"
exclude module: "woodstox-core"
}
implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.1"
implementation "org.springframework.cloud:spring-cloud-commons:4.1.2"
implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.2"
implementation "org.springframework.cloud:spring-cloud-commons:4.1.3"

implementation "io.netty:netty-all:4.1.110.Final"
implementation "io.projectreactor.netty:reactor-netty:1.1.19"
Expand All @@ -395,7 +395,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.39.1"
implementation "com.nimbusds:nimbus-jose-jwt:9.40"

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 @@ -436,7 +436,7 @@ dependencies {
implementation "net.lingala.zip4j:zip4j:2.11.5"
implementation "org.jgrapht:jgrapht-core:1.5.2"
// use newest version of guava to avoid security issues through outdated dependencies
implementation "com.google.guava:guava:33.2.0-jre"
implementation "com.google.guava:guava:33.2.1-jre"

// use newest version of gson to avoid security issues through outdated dependencies
implementation "com.google.code.gson:gson:2.11.0"
Expand Down Expand Up @@ -466,13 +466,13 @@ dependencies {
}
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.25.3"
testImplementation "org.assertj:assertj-core:3.26.0"
testImplementation "org.mockito:mockito-core:${mockito_version}"
testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
testImplementation "io.github.classgraph:classgraph:4.8.171"
testImplementation "io.github.classgraph:classgraph:4.8.173"
testImplementation "org.awaitility:awaitility:4.2.1"
testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
testImplementation "org.gradle:gradle-tooling-api:8.7"
testImplementation "org.gradle:gradle-tooling-api:8.8"
testImplementation "org.apache.maven.surefire:surefire-report-parser:3.2.5"
testImplementation "com.opencsv:opencsv:5.9"
testImplementation("io.zonky.test:embedded-database-spring-test:2.5.1") {
Expand All @@ -485,10 +485,9 @@ dependencies {
}
testImplementation("net.bytebuddy:byte-buddy") {
version {
strictly "1.14.16"
strictly "1.14.17"
}
}
testImplementation "io.github.classgraph:classgraph:4.8.172"
testImplementation "com.h2database:h2:2.2.224"

// Lightweight JSON library needed for the internals of the MockRestServiceServer
Expand Down Expand Up @@ -556,7 +555,7 @@ tasks.withType(Test).configureEach {
}

wrapper {
gradleVersion = "8.7"
gradleVersion = "8.8"
}

tasks.register("stage") {
Expand Down
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ node_version=20.10.0
npm_version=10.2.3

# Dependency versions
jhipster_dependencies_version=8.4.0
jhipster_dependencies_version=8.5.0
spring_boot_version=3.3.0
spring_security_version=6.3.0
# NOTE: Update to 6.5.x not possible due to issues with query performance
hibernate_version=6.4.8.Final
# TODO: can we update to 5.x?
opensaml_version=4.3.2
Expand All @@ -20,10 +21,10 @@ mockito_version=5.12.0
fasterxml_version=2.17.1
jgit_version=6.9.0.202403050737-r
sshd_version=2.12.1
checkstyle_version=10.16.0
checkstyle_version=10.17.0
jplag_version=5.1.0
slf4j_version=2.0.13
sentry_version=7.9.0
sentry_version=7.10.0
liquibase_version=4.28.0
docker_java_version=3.3.6
logback_version=1.5.6
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,8 @@ void testShouldEnforceLockRepositoryPolicy() throws Exception {
programmingExerciseGradingService.processNewProgrammingExerciseResult(participation, resultRequestBody);

// Should throw an AccessForbiddenException because the submission limit is already reached.
AccessForbiddenException exception = catchThrowableOfType(
() -> repositoryAccessService.checkAccessRepositoryElseThrow(participation, student, programmingExercise, RepositoryActionType.WRITE),
AccessForbiddenException.class);
AccessForbiddenException exception = catchThrowableOfType(AccessForbiddenException.class,
() -> repositoryAccessService.checkAccessRepositoryElseThrow(participation, student, programmingExercise, RepositoryActionType.WRITE));

assertThat(exception.getMessage()).isEqualTo("You are not allowed to access the repository of this programming exercise.");
}
Expand Down

0 comments on commit df6b789

Please sign in to comment.