diff --git a/pom.xml b/pom.xml index 6d76e3dc..78d515fe 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 2.13.2 20180813 1.7.36 - 1.3.5 + 2.1.0 1.18.22 31.1-jre diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index 295283c2..4de46997 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -73,7 +73,6 @@ UTF-8 2.32 - 1.19.3 4.5.13 2.11.0 @@ -127,6 +126,35 @@ jakarta.activation jakarta.activation-api + + jakarta.xml.bind + jakarta.xml.bind-api + + + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 + + + com.sun.xml.bind + jaxb-impl + 2.3.3 + runtime + + + com.sun.activation + jakarta.activation + + + jakarta.activation + jakarta.activation-api + + + jakarta.xml.bind + jakarta.xml.bind-api + @@ -136,11 +164,21 @@ org.glassfish.jersey.inject jersey-hk2 + + + com.sun.activation + jakarta.activation + + org.glassfish.jersey.media jersey-media-json-jackson + + com.fasterxml.jackson.core + jackson-core + com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider @@ -158,12 +196,6 @@ org.glassfish.jersey.core jersey-server - - - jakarta.xml.bind - jakarta.xml.bind-api - - org.json @@ -348,6 +380,7 @@ + diff --git a/telegrambots/src/main/java/module-info.java b/telegrambots/src/main/java/module-info.java index ec05b8c0..799f15f8 100644 --- a/telegrambots/src/main/java/module-info.java +++ b/telegrambots/src/main/java/module-info.java @@ -12,7 +12,6 @@ module telegrambots { requires org.apache.commons.io; requires org.slf4j; requires org.json; - requires java.ws.rs; requires grizzly.http.server; requires grizzly.framework; requires jersey.container.grizzly2.http; @@ -20,7 +19,9 @@ module telegrambots { requires jersey.server; requires org.apache.commons.compress; requires jersey.common; - requires java.annotation; requires com.google.common; + requires jakarta.annotation; + requires java.xml.bind; + requires java.ws.rs; } \ No newline at end of file diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/BrotliEncoder.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/BrotliEncoder.java index f8858469..95d32593 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/BrotliEncoder.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/BrotliEncoder.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.function.Function; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.core.HttpHeaders; import org.apache.commons.compress.compressors.CompressorException; diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/CompressionEncoder.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/CompressionEncoder.java index 8b7686ca..2ccd2308 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/CompressionEncoder.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/CompressionEncoder.java @@ -16,10 +16,10 @@ package org.telegram.telegrambots.updatesreceivers; +import jakarta.annotation.Priority; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.core.HttpHeaders; import org.apache.commons.compress.compressors.CompressorException;