Merge pull request #125 from wireapp/chore/cleanup-classpath

chore: cleanup classpath dependencies and finalize migration to jakarta
wireapp · Mar 13, 2024 · ed84d74 · ed84d74
2 parents e87c24d + 62f90c6
commit ed84d74
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.wire</groupId>
     <artifactId>lithium</artifactId>
-    <version>3.6.2</version>
+    <version>3.6.3</version>
     <name>Lithium</name>
     <description>Wire Bots SDK written in Java</description>
     <url>https://wire.com/</url>
@@ -34,6 +34,13 @@
             <organizationUrl>https://wire.com</organizationUrl>
             <timezone>UTC+01:00</timezone>
         </developer>
+        <developer>
+            <name>Yamil Medina</name>
+            <email>[email protected]</email>
+            <organization>Wire Swiss GmbH</organization>
+            <organizationUrl>https://wire.com</organizationUrl>
+            <timezone>UTC+01:00</timezone>
+        </developer>
     </developers>
 
     <scm>
@@ -59,7 +66,8 @@
         <maven.test.skip>true</maven.test.skip>
         <!-- BEFORE UPGRADING! VERIFY RUNTIME PG VERSION COMPATIBILITY -->
         <flyway.version>7.15.0</flyway.version>
-
+        <dropwizard.version>4.0.0</dropwizard.version>
+        <jakarta.version>2.1.1</jakarta.version>
     </properties>
 
     <repositories>
@@ -70,6 +78,18 @@
         </repository>
     </repositories>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.dropwizard</groupId>
+                <artifactId>dropwizard-bom</artifactId>
+                <version>${dropwizard.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>com.wire</groupId>
@@ -89,38 +109,57 @@
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>
-            <version>4.0.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-jdbi3</artifactId>
-            <version>4.0.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-client</artifactId>
-            <version>4.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.smoketurner</groupId>
-            <artifactId>dropwizard-swagger</artifactId>
-            <version>72e8441e4a</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>42.6.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
             <version>${flyway.version}</version>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.smoketurner</groupId>
+            <artifactId>dropwizard-swagger</artifactId>
+            <version>4.0.0-1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.13</version>
+        </dependency>
+
 
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-testing</artifactId>
-            <version>4.0.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/com/wire/lithium/API.java b/src/main/java/com/wire/lithium/API.java
@@ -30,6 +30,7 @@
 import com.wire.xenon.models.otr.*;
 import com.wire.xenon.tools.Logger;
 import com.wire.xenon.tools.Util;
+import jakarta.annotation.Nullable;
 import jakarta.ws.rs.NotSupportedException;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.Entity;
@@ -39,7 +40,6 @@
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.logging.LoggingFeature;
 
-import javax.annotation.Nullable;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URI;

diff --git a/src/main/java/com/wire/lithium/Configuration.java b/src/main/java/com/wire/lithium/Configuration.java
@@ -22,9 +22,9 @@
 import io.dropwizard.client.JerseyClientConfiguration;
 import io.dropwizard.db.DataSourceFactory;
 import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 
 /**
  * Application configuration class. Extend this class to add your custom configuration

diff --git a/src/main/java/com/wire/lithium/Server.java b/src/main/java/com/wire/lithium/Server.java
@@ -49,12 +49,12 @@
 import io.dropwizard.core.setup.Bootstrap;
 import io.dropwizard.core.setup.Environment;
 import io.dropwizard.servlets.tasks.Task;
+import jakarta.annotation.Nullable;
 import jakarta.ws.rs.client.Client;
 import org.flywaydb.core.Flyway;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.sqlobject.SqlObjectPlugin;
 
-import javax.annotation.Nullable;
 import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
 

diff --git a/src/main/java/com/wire/lithium/server/monitoring/AbstractJsonLayout.java b/src/main/java/com/wire/lithium/server/monitoring/AbstractJsonLayout.java
@@ -9,9 +9,9 @@
 import ch.qos.logback.core.spi.FilterReply;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.Nullable;
 import org.jboss.logging.MDC;
 
-import javax.annotation.Nullable;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;

diff --git a/src/main/java/com/wire/lithium/server/monitoring/MDCUtils.java b/src/main/java/com/wire/lithium/server/monitoring/MDCUtils.java
@@ -1,9 +1,9 @@
 package com.wire.lithium.server.monitoring;
 
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
 import org.slf4j.MDC;
 
-import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
 
 public class MDCUtils {
 

diff --git a/src/main/java/com/wire/lithium/server/monitoring/RequestMdcFactoryFilter.java b/src/main/java/com/wire/lithium/server/monitoring/RequestMdcFactoryFilter.java
@@ -1,11 +1,11 @@
 package com.wire.lithium.server.monitoring;
 
+import jakarta.annotation.Nullable;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerRequestFilter;
 import jakarta.ws.rs.ext.Provider;
 import org.slf4j.MDC;
 
-import javax.annotation.Nullable;
 import java.util.UUID;
 
 /**

diff --git a/src/main/java/com/wire/lithium/server/monitoring/VersionResource.java b/src/main/java/com/wire/lithium/server/monitoring/VersionResource.java
@@ -4,14 +4,14 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.RandomAccessFile;
 
 @Api

diff --git a/src/main/java/com/wire/lithium/server/resources/BotsResource.java b/src/main/java/com/wire/lithium/server/resources/BotsResource.java
@@ -38,8 +38,8 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.UUID;
 
 @Api

diff --git a/src/main/java/com/wire/lithium/server/resources/MessageResource.java b/src/main/java/com/wire/lithium/server/resources/MessageResource.java
@@ -35,9 +35,8 @@
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.UUID;
 import java.util.logging.Level;