OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-22 14:34:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update Jackson (#4512)

Browse source 
* Update jackson

* relocate yaml on velocity
This commit is contained in:
chris 2024-03-21 19:05:41 +01:00 committed by GitHub
parent 867cf6da05
commit 4fa0bcd01b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstrap/velocity/build.gradle.kts
View file

@ -8,6 +8,7 @@ dependencies {
platformRelocate("com.fasterxml.jackson") platformRelocate("com.fasterxml.jackson")
platformRelocate("it.unimi.dsi.fastutil") platformRelocate("it.unimi.dsi.fastutil")
platformRelocate("net.kyori.adventure.text.serializer.gson.legacyimpl") platformRelocate("net.kyori.adventure.text.serializer.gson.legacyimpl")
platformRelocate("org.yaml")
exclude("com.google.*:*") exclude("com.google.*:*")

3
core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionDescription.java
View file

@ -31,6 +31,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.api.extension.ExtensionDescription; import org.geysermc.geyser.api.extension.ExtensionDescription;
import org.geysermc.geyser.api.extension.exception.InvalidDescriptionException; import org.geysermc.geyser.api.extension.exception.InvalidDescriptionException;
import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.text.GeyserLocale;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor; import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor;
@ -48,7 +49,7 @@ public record GeyserExtensionDescription(@NonNull String id,
@NonNull String version, @NonNull String version,
@NonNull List<String> authors) implements ExtensionDescription { @NonNull List<String> authors) implements ExtensionDescription {
private static final Yaml YAML = new Yaml(new CustomClassLoaderConstructor(Source.class.getClassLoader())); private static final Yaml YAML = new Yaml(new CustomClassLoaderConstructor(Source.class.getClassLoader(), new LoaderOptions()));
public static final Pattern ID_PATTERN = Pattern.compile("[a-z][a-z0-9-_]{0,63}"); public static final Pattern ID_PATTERN = Pattern.compile("[a-z][a-z0-9-_]{0,63}");
public static final Pattern NAME_PATTERN = Pattern.compile("^[A-Za-z_.-]+$"); public static final Pattern NAME_PATTERN = Pattern.compile("^[A-Za-z_.-]+$");

4
gradle/libs.versions.toml
View file

@ -3,7 +3,7 @@ base-api = "1.0.0-SNAPSHOT"
cumulus = "1.1.2" cumulus = "1.1.2"
erosion = "1.0-20230406.174837-8" erosion = "1.0-20230406.174837-8"
events = "1.1-SNAPSHOT" events = "1.1-SNAPSHOT"
jackson = { strictly = "2.14.0" } # Don't let other dependencies override jackson = "2.17.0"
fastutil = "8.5.2" fastutil = "8.5.2"
netty = "4.1.107.Final" netty = "4.1.107.Final"
guava = "29.0-jre" guava = "29.0-jre"
@ -38,7 +38,7 @@ mixin = "0.8.5"
# plugin versions # plugin versions
indra = "3.1.3" indra = "3.1.3"
shadow = "7.1.3-SNAPSHOT" shadow = "8.1.1"
architectury-plugin = "3.4-SNAPSHOT" architectury-plugin = "3.4-SNAPSHOT"
architectury-loom = "1.4-SNAPSHOT" architectury-loom = "1.4-SNAPSHOT"
minotaur = "2.8.7" minotaur = "2.8.7"