diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java index cfd80cd0349c3c95d69cecf3a0240c56ce9c4d18..d215d0fdee0c95edf0a6848aeb0bf5c707945165 100644 --- a/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java +++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java @@ -28,7 +28,6 @@ import lombok.extern.slf4j.Slf4j; import net.jami.jams.ca.JamsCA; import net.jami.jams.ca.workers.X509Worker; import net.jami.jams.common.objects.requests.RevocationRequest; -import net.jami.jams.common.serialization.fs.FileStorage; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.CRLReason; import org.bouncycastle.cert.X509CRLHolder; @@ -36,7 +35,6 @@ import org.bouncycastle.cert.X509v2CRLBuilder; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import java.io.File; -import java.io.SyncFailedException; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.Date; diff --git a/jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java b/jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java index 718a4ab9ce890d11b1393996c069f81083fecdc9..9c6d99d0f6a7d3478729056e88d00dff3fea8907 100644 --- a/jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java +++ b/jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java @@ -29,10 +29,8 @@ import ezvcard.VCardVersion; import ezvcard.parameter.EmailType; import ezvcard.parameter.ImageType; import ezvcard.parameter.TelephoneType; -import ezvcard.property.Organization; import ezvcard.property.Photo; import ezvcard.property.StructuredName; -import ezvcard.property.Telephone; import lombok.Getter; import lombok.Setter; import org.bouncycastle.util.encoders.Base64; diff --git a/jams-server/pom.xml b/jams-server/pom.xml index 1d0134ccddd6a2d22663c3d5eb9a77970250bfd9..279ea341417a2c2a29a674371fd49d8f9db0741e 100644 --- a/jams-server/pom.xml +++ b/jams-server/pom.xml @@ -65,23 +65,6 @@ <build> <plugins> - <plugin> - <groupId>net.wasdev.maven.plugins</groupId> - <artifactId>swaggerdocgen-maven-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - <configuration> - <warFile>${project.build.directory}/jams-server-2.0.jar</warFile> - <outputFile>${project.build.directory}/swagger.json</outputFile> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java index 1cf9e9d2da870777d8e6b1523bbb2ffc4919e8a0..8cbc6cb1cf87ac037a440bc70e3085adcdc70fb9 100644 --- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java +++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java @@ -31,7 +31,6 @@ import org.apache.catalina.startup.Tomcat; import org.apache.catalina.webresources.DirResourceSet; import org.apache.catalina.webresources.JarResourceSet; import org.apache.catalina.webresources.StandardRoot; -import org.apache.catalina.webresources.WarResourceSet; import org.apache.tomcat.util.descriptor.web.ErrorPage; import java.awt.*; diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java index e129305eb1b2fe4b9ddba6d6c0cd53a62daecbdc..36af1dabe4d5c700761d728258b5430bcde5f01b 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java @@ -24,15 +24,12 @@ package net.jami.jams.server.servlets; import com.jsoniter.JsonIterator; import com.jsoniter.output.JsonStream; -import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import net.jami.jams.common.authmodule.AuthTokenResponse; -import net.jami.jams.common.objects.user.UserProfile; import net.jami.jams.server.servlets.api.auth.login.LoginRequest; -import net.minidev.json.JSONObject; import java.io.IOException; import java.security.cert.X509Certificate; diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java index af847d6ed7014ec19c486de2b4499d36d2186d28..7c9d6780c0cd08d4104db559198487ec4848a06c 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java @@ -39,7 +39,6 @@ import net.jami.jams.common.objects.user.AccessLevel; import net.jami.jams.common.objects.user.User; import java.io.IOException; -import java.util.List; import static net.jami.jams.server.Server.dataStore; import static net.jami.jams.server.servlets.api.auth.login.AuthRequestProcessor.processUsernamePasswordAuth;