tdlight-team/TDLightTelegramBots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Andrea Cavalli 2022-04-09 18:17:17 +02:00
parent a8a00430e6
commit fd79082fcf
5 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -76,7 +76,7 @@
<jackson.version>2.13.2</jackson.version>
<json.version>20180813</json.version>
<slf4j.version>1.7.36</slf4j.version>
<jakarta.annotation.version>1.3.5</jakarta.annotation.version>
<jakarta.annotation.version>2.1.0</jakarta.annotation.version>
<lombok.version>1.18.22</lombok.version>
<guava.version>31.1-jre</guava.version>
</properties>

47
telegrambots/pom.xml
View File

@ -73,7 +73,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<glassfish.version>2.32</glassfish.version>
<jerseybundle.version>1.19.3</jerseybundle.version>
<httpcompontents.version>4.5.13</httpcompontents.version>
<commonio.version>2.11.0</commonio.version>
</properties>
@ -127,6 +126,35 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -136,11 +164,21 @@
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
@ -158,12 +196,6 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.json</groupId>
@ -348,6 +380,7 @@
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</pluginManagement>

5
telegrambots/src/main/java/module-info.java
View File

@ -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;
}

2
telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/BrotliEncoder.java
View File

@ -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;

2
telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/CompressionEncoder.java
View File

@ -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;