Release 2.0.0

.envrc

@@ -0,0 +1 @@
+use nix

.github/workflows/javadocs.yml

@@ -10,12 +10,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
-          distribution: adopt
-          java-version: 17
+          distribution: temurin
+          java-version: 25
       - name: Build Javadocs
         run: |
           echo "Building javadocs with gradle"

.github/workflows/publish_to_nexus.yml

@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
       - name: Build with Gradle
         run: ./gradlew --build-cache build
       - name: Test with Gradle

.github/workflows/verify.yml

@@ -7,12 +7,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
       - name: Build with Gradle
         run: ./gradlew --build-cache build
       - name: Test with Gradle

.gitignore

@@ -34,3 +34,4 @@ buildNumber.properties
 /config/
 /logs/
 /out/
+.direnv

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "de.chojo.universalis"
-version = "1.4.2"
+version = "2.0.0"
 
 repositories {
     maven("https://eldonexus.de/repository/maven-public")
@@ -50,13 +50,14 @@ allprojects {
         withSourcesJar()
         withJavadocJar()
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(25))
         }
     }
 
     dependencies {
         val testlibs = rootProject.testlibs
         testImplementation(testlibs.bundles.junit)
+        testRuntimeOnly(testlibs.junit.platform.launcher)
         testImplementation(testlibs.mockito.core)
         testImplementation(testlibs.slf4j.noop)
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 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-9.6.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -20,47 +20,49 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            plugin("spotless", "com.diffplug.spotless").version("6.25.0")
+            plugin("spotless", "com.diffplug.spotless").version("8.4.0")
 
-            version("jackson", "2.17.0")
-            library("jackson-core", "com.fasterxml.jackson.core", "jackson-core").versionRef("jackson")
-            library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef("jackson")
-            library("jackson-annotations", "com.fasterxml.jackson.core", "jackson-annotations").versionRef("jackson")
-            library("jackson-yaml", "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml").versionRef("jackson")
+            version("jackson", "3.2.0")
+            library("jackson-core", "tools.jackson.core", "jackson-core").versionRef("jackson")
+            library("jackson-databind", "tools.jackson.core", "jackson-databind").versionRef("jackson")
+            library("jackson-annotations", "com.fasterxml.jackson.core", "jackson-annotations").version("2.22")
+            library("jackson-yaml", "tools.jackson.dataformat", "jackson-dataformat-yaml").versionRef("jackson")
             bundle("jackson-full", listOf("jackson-core", "jackson-databind", "jackson-annotations", "jackson-yaml"))
             bundle("jackson-lite", listOf("jackson-core", "jackson-databind", "jackson-annotations"))
 
-            library("jetbrains-annotations", "org.jetbrains:annotations:24.1.0")
+            library("jetbrains-annotations", "org.jetbrains:annotations:26.1.0")
 
-            version("slf4j", "2.0.13")
+            version("slf4j", "2.0.18")
             library("slf4j-api", "org.slf4j", "slf4j-api").versionRef("slf4j")
 
-            version("log4j", "2.23.1")
-            // "org.apache.logging.log4j", "log4j-core", "2.23.1"
+            version("log4j", "2.26.0")
+            // "org.apache.logging.log4j", "log4j-core", "2.26.0"
             library("apache-log4j-core", "org.apache.logging.log4j", "log4j-core").versionRef("log4j")
             library("apache-log4j-slf4j", "org.apache.logging.log4j", "log4j-slf4j2-impl").versionRef("log4j")
             bundle("log4j", listOf("apache-log4j-core", "apache-log4j-slf4j"))
 
 
             library("bucket4j", "com.bucket4j:bucket4j-core:8.10.1")
-            library("apache-httpclient", "org.apache.httpcomponents.client5:httpclient5:5.3.1")
+            library("apache-httpclient", "org.apache.httpcomponents.client5:httpclient5:5.6.2")
 
             library("websocketclient", "com.neovisionaries:nv-websocket-client:2.14")
-            library("mongodb-bson", "org.mongodb:bson:5.0.1")
-            library("google-guava", "com.google.guava:guava:33.1.0-jre")
+            library("mongodb-bson", "org.mongodb:bson:5.8.0")
+            library("caffeine", "com.github.ben-manes.caffeine:caffeine:3.2.4")
 
         }
 
         create("testlibs") {
-            version("junit", "5.10.2")
+            version("junit", "5.14.4")
             library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").versionRef("junit")
             library("junit-params", "org.junit.jupiter", "junit-jupiter-params").versionRef("junit")
+            library("junit-platform-launcher", "org.junit.platform", "junit-platform-launcher").version("1.14.4")
+            library("junit-pioneer", "org.junit-pioneer", "junit-pioneer").version("2.3.0")
             bundle("junit", listOf("junit-jupiter", "junit-params"))
 
             version("mockito", "5.+")
             library("mockito-core", "org.mockito", "mockito-core").versionRef("mockito")
 
-            version("slf4j", "2.0.13")
+            version("slf4j", "2.0.17")
             library("slf4j-noop", "org.slf4j", "slf4j-simple").versionRef("slf4j")
         }
     }

shell.nix

@@ -0,0 +1,5 @@
+{ pkgs ? import <nixpkgs> {}, ... }:
+
+pkgs.mkShell {
+  packages = with pkgs; [jdk25 nodejs_24];
+}

universalis-core/src/main/java/de/chojo/universalis/deserializer/CityDeserializer.java

@@ -6,19 +6,17 @@
 
 package de.chojo.universalis.deserializer;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.ValueDeserializer;
 import de.chojo.universalis.entities.City;
 
-import java.io.IOException;
-
 /**
  * Deserializer for cities from id or names.
  */
-public class CityDeserializer extends JsonDeserializer<City> {
+public class CityDeserializer extends ValueDeserializer<City> {
     @Override
-    public City deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+    public City deserialize(JsonParser p, DeserializationContext ctxt) {
         if (p.isExpectedNumberIntToken()) {
             return City.fromId(p.getValueAsInt());
         }

universalis-core/src/main/java/de/chojo/universalis/deserializer/DataCenterDeserializer.java

@@ -6,20 +6,18 @@
 
 package de.chojo.universalis.deserializer;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.ValueDeserializer;
 import de.chojo.universalis.worlds.DataCenter;
 import de.chojo.universalis.worlds.Worlds;
 
-import java.io.IOException;
-
 /**
  * Deserializer for data center
  */
-public class DataCenterDeserializer extends JsonDeserializer<DataCenter> {
+public class DataCenterDeserializer extends ValueDeserializer<DataCenter> {
     @Override
-    public DataCenter deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+    public DataCenter deserialize(JsonParser p, DeserializationContext ctxt) {
         if (p.isExpectedNumberIntToken()) {
             return Worlds.datacenterById(p.getValueAsInt());
         }

universalis-core/src/main/java/de/chojo/universalis/deserializer/ItemDeserializer.java

@@ -6,18 +6,16 @@
 
 package de.chojo.universalis.deserializer;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.ValueDeserializer;
 import de.chojo.universalis.entities.Item;
 import de.chojo.universalis.provider.NameSupplier;
 
-import java.io.IOException;
-
 /**
  * Deserializer for {@link Item}
  */
-public class ItemDeserializer extends JsonDeserializer<Item> {
+public class ItemDeserializer extends ValueDeserializer<Item> {
     private final NameSupplier itemNameSupplier;
 
     /**
@@ -30,7 +28,7 @@ public ItemDeserializer(NameSupplier itemNameSupplier) {
     }
 
     @Override
-    public Item deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+    public Item deserialize(JsonParser p, DeserializationContext ctxt) {
         return Item.build(itemNameSupplier, p.getValueAsInt());
     }
 }

universalis-core/src/main/java/de/chojo/universalis/deserializer/MillisDateTimeConverter.java

@@ -6,7 +6,7 @@
 
 package de.chojo.universalis.deserializer;
 
-import com.fasterxml.jackson.databind.util.StdConverter;
+import tools.jackson.databind.util.StdConverter;
 
 import java.time.Instant;
 import java.time.LocalDateTime;