diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts index 170cffd8..070bde8d 100644 --- a/backend/build.gradle.kts +++ b/backend/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { implementation("org.springdoc:springdoc-openapi-kotlin:1.8.0") // Serialization - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.20.1") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.22.1") // Postgres Database implementation("org.postgresql:postgresql:42.7.12") @@ -63,13 +63,13 @@ dependencies { implementation("dnsjava:dnsjava:3.6.5") // Packages required by metrics-lib (org.torproject.descriptor in java module) (JavaDoc: https://metrics.torproject.org/metrics-lib/index.html) - implementation("commons-codec:commons-codec:1.10") - implementation("org.apache.commons:commons-compress:1.13") - implementation("com.fasterxml.jackson.core:jackson-annotations:2.12.4") - implementation("com.fasterxml.jackson.core:jackson-databind:2.12.4") - implementation("com.fasterxml.jackson.core:jackson-core:2.12.4") + implementation("commons-codec:commons-codec:1.22.0") + implementation("org.apache.commons:commons-compress:1.28.0") + implementation("com.fasterxml.jackson.core:jackson-annotations:2.22") + implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1") + implementation("com.fasterxml.jackson.core:jackson-core:2.22.1") implementation("org.slf4j:slf4j-api:1.7.36") - implementation("org.tukaani:xz:1.6") + implementation("org.tukaani:xz:1.12") // Testing JUnit and Kotest (https://kotest.io/) testImplementation("org.springframework.boot:spring-boot-starter-test") { diff --git a/backend/src/main/java/org/torproject/descriptor/index/IndexNode.java b/backend/src/main/java/org/torproject/descriptor/index/IndexNode.java index acbb7249..2ffc5f27 100644 --- a/backend/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/backend/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import org.torproject.descriptor.internal.FileType; import java.io.IOException; @@ -42,7 +42,7 @@ public class IndexNode { new TreeSet<>(), new TreeSet<>()); private static ObjectMapper objectMapper = new ObjectMapper() - .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) + .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) .setSerializationInclusion(JsonInclude.Include.NON_EMPTY) .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE) .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY) @@ -187,4 +187,3 @@ public String toString() { + ",\nfns: " + files + ",\ndirs: " + directories; } } - diff --git a/backend/src/main/java/org/torproject/descriptor/onionperf/ParsedOnionPerfAnalysis.java b/backend/src/main/java/org/torproject/descriptor/onionperf/ParsedOnionPerfAnalysis.java index 50c50c90..8c49ff09 100644 --- a/backend/src/main/java/org/torproject/descriptor/onionperf/ParsedOnionPerfAnalysis.java +++ b/backend/src/main/java/org/torproject/descriptor/onionperf/ParsedOnionPerfAnalysis.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import java.io.IOException; import java.util.Map; @@ -25,7 +25,7 @@ public class ParsedOnionPerfAnalysis { * of this class. */ private static final ObjectMapper objectMapper = new ObjectMapper() - .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) + .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE) .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY) .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); @@ -543,4 +543,3 @@ static class Stream { Double unixTsEnd; } } -