Skip to content

Commit

Permalink
Development: Update server dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
krusche committed Oct 24, 2024
1 parent 5e5e208 commit 5e64de4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ plugins {
id "jacoco"
id "org.springframework.boot" version "${spring_boot_version}"
id "io.spring.dependency-management" version "1.1.6"
id "com.google.cloud.tools.jib" version "3.4.3"
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 "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
id "com.gorylenko.gradle-git-properties" version "2.4.2"
id "org.owasp.dependencycheck" version "10.0.4"
id "org.owasp.dependencycheck" version "11.0.0"
id "com.adarshr.test-logger" version "4.0.0"
}

Expand Down Expand Up @@ -264,7 +264,7 @@ dependencies {
implementation "org.apache.lucene:lucene-queryparser:${lucene_version}"
implementation "org.apache.lucene:lucene-core:${lucene_version}"
implementation "org.apache.lucene:lucene-analyzers-common:${lucene_version}"
implementation "com.google.protobuf:protobuf-java:4.28.2"
implementation "com.google.protobuf:protobuf-java:4.28.3"

// we have to override those values to use the latest version
implementation "org.slf4j:jcl-over-slf4j:${slf4j_version}"
Expand Down Expand Up @@ -413,7 +413,7 @@ dependencies {
implementation "io.netty:netty-all:4.1.114.Final"
implementation "io.projectreactor.netty:reactor-netty:1.1.23"
implementation "org.springframework:spring-messaging:6.1.14"
implementation "org.springframework.retry:spring-retry:2.0.9"
implementation "org.springframework.retry:spring-retry:2.0.10"

implementation "org.springframework.security:spring-security-config:${spring_security_version}"
implementation "org.springframework.security:spring-security-data:${spring_security_version}"
Expand Down Expand Up @@ -452,7 +452,7 @@ dependencies {
implementation "org.apache.maven:maven-model:3.9.9"
implementation "org.apache.pdfbox:pdfbox:3.0.3"
implementation "org.apache.commons:commons-csv:1.12.0"
implementation "org.commonmark:commonmark:0.23.0"
implementation "org.commonmark:commonmark:0.24.0"
implementation "commons-fileupload:commons-fileupload:1.5"
implementation "net.lingala.zip4j:zip4j:2.11.5"

Expand All @@ -468,7 +468,7 @@ dependencies {
implementation "com.google.code.gson:gson:2.11.0"


implementation "com.google.errorprone:error_prone_annotations:2.33.0"
implementation "com.google.errorprone:error_prone_annotations:2.34.0"

// NOTE: we want to keep the same unique version for all configurations, implementation and annotationProcessor
implementation("net.bytebuddy:byte-buddy") {
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ npm_version=10.8.0

# Dependency versions
jhipster_dependencies_version=8.7.1
spring_boot_version=3.3.4
spring_security_version=6.3.3
spring_boot_version=3.3.5
spring_security_version=6.3.4
# TODO: upgrading to 6.6.0 currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code
hibernate_version=6.4.10.Final
# TODO: can we update to 5.x?
Expand All @@ -25,17 +25,17 @@ jplag_version=5.1.0
# NOTE: we do not need to use the latest version 9.x here as long as Stanford CoreNLP does not reference it
lucene_version=8.11.4
slf4j_version=2.0.16
sentry_version=7.15.0
sentry_version=7.16.0
liquibase_version=4.29.2
docker_java_version=3.4.0
logback_version=1.5.11
java_parser_version=3.26.2
byte_buddy_version=1.15.5
byte_buddy_version=1.15.7

# testing
# make sure both versions are compatible
junit_version=5.11.0
junit_platform_version=1.11.2
junit_platform_version=1.11.3
mockito_version=5.14.2


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -557,10 +557,10 @@ SELECT COUNT(c) > 0
SELECT new de.tum.cit.aet.artemis.core.dto.CourseForArchiveDTO(c.id, c.title, c.semester, c.color, c.courseIcon)
FROM Course c
WHERE (:isAdmin = TRUE
OR c.studentGroupName in :groups
OR c.teachingAssistantGroupName in :groups
OR c.editorGroupName in :groups
OR c.instructorGroupName in :groups
OR c.studentGroupName IN :groups
OR c.teachingAssistantGroupName IN :groups
OR c.editorGroupName IN :groups
OR c.instructorGroupName IN :groups
)
AND c.semester IS NOT NULL
AND c.endDate IS NOT NULL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
implementation "com.github.javaparser:javaparser-core:${project.java_parser_version}"
implementation "com.github.javaparser:javaparser-core-serialization:${project.java_parser_version}"
implementation "com.fasterxml.jackson.core:jackson-databind:${project.fasterxml_version}"
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${project.fasterxml_version}'
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${project.fasterxml_version}"
implementation rootProject.ext.springBootStarterWeb
implementation "org.slf4j:slf4j-api:${project.slf4j_version}"
implementation "ch.qos.logback:logback-classic:${project.logback_version}"
Expand Down

0 comments on commit 5e64de4

Please sign in to comment.