Upgrade dependencies & plugins version

axel3rd · Mar 28, 2022 · 408a7cf · 408a7cf
1 parent 01ce365
commit 408a7cf
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,14 +8,15 @@
     <version>1.9-SNAPSHOT</version>
     <name>MPG Coach Bot</name>
     <properties>
-        <goals>package</goals>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.class>org.blondin.mpg.Main</main.class>
         <jdk.version>1.8</jdk.version>
-        <jersey.version>2.35</jersey.version>
-        <jackson.version>2.13.1</jackson.version>
-        <slf4j.version>1.7.32</slf4j.version>
-        <log4j.version>2.17.1</log4j.version>
+        <jersey.version>3.0.4</jersey.version>
+        <jackson.version>2.13.2</jackson.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <log4j.version>2.17.2</log4j.version>
+        <!-- Goals for release plugin-->
+        <goals>package</goals>
     </properties>
     <scm>
         <connection>scm:git:https://github.com/axel3rd/mpg-coach-bot</connection>
@@ -26,15 +27,15 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.10.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.2.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>
@@ -204,7 +205,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.2.0</version>
+            <version>4.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/org/blondin/mpg/AbstractClient.java b/src/main/java/org/blondin/mpg/AbstractClient.java
@@ -17,16 +17,6 @@
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.ServiceUnavailableException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -42,6 +32,17 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.ServiceUnavailableException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+
 public abstract class AbstractClient {
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractClient.class);

diff --git a/src/main/java/org/blondin/mpg/out/InjuredSuspendedWrapperClient.java b/src/main/java/org/blondin/mpg/out/InjuredSuspendedWrapperClient.java
@@ -1,7 +1,5 @@
 package org.blondin.mpg.out;
 
-import javax.ws.rs.ServiceUnavailableException;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.blondin.mpg.config.Config;
 import org.blondin.mpg.out.model.OutType;
@@ -12,6 +10,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.ServiceUnavailableException;
+
 /**
  * Wrapper for:<br/>
  * - https://www.sportsgambler.com/injuries/football<br/>

diff --git a/src/main/java/org/blondin/mpg/root/MpgClient.java b/src/main/java/org/blondin/mpg/root/MpgClient.java
@@ -4,9 +4,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-
 import org.apache.commons.lang3.StringUtils;
 import org.blondin.mpg.AbstractClient;
 import org.blondin.mpg.config.Config;
@@ -21,6 +18,9 @@
 import org.blondin.mpg.root.model.Team;
 import org.blondin.mpg.root.model.UserSignIn;
 
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+
 /**
  * Client for https://www.mpgstats.fr/
  */

diff --git a/src/test/java/org/blondin/mpg/MainTest.java b/src/test/java/org/blondin/mpg/MainTest.java
@@ -17,9 +17,6 @@
 import java.util.Arrays;
 import java.util.Date;
 
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.core.Response;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -33,6 +30,9 @@
 import com.github.tomakehurst.wiremock.http.Fault;
 import com.github.tomakehurst.wiremock.stubbing.Scenario;
 
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.core.Response;
+
 public class MainTest extends AbstractMockTestClient {
 
     @Test

diff --git a/src/test/java/org/blondin/mpg/SslCertificateTest.java b/src/test/java/org/blondin/mpg/SslCertificateTest.java
@@ -8,15 +8,15 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
-import javax.ws.rs.ProcessingException;
-
 import org.blondin.mpg.config.Config;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 
+import jakarta.ws.rs.ProcessingException;
+
 public class SslCertificateTest {
 
     @Rule