Closes #668: upgrade jetty/servlet-api/jersey

Dockerfile

@@ -1,4 +1,4 @@
-FROM sismics/ubuntu-jetty:9.4.51
+FROM sismics/ubuntu-jetty:11.0.14
 LABEL maintainer="b.gamard@sismics.com"
 
 RUN apt-get update && \
@@ -34,9 +34,6 @@ RUN apt-get update && \
     tesseract-ocr-vie && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Remove the embedded javax.mail jar from Jetty
-RUN rm -f /opt/jetty/lib/mail/javax.mail.glassfish-*.jar
-
 ADD docs.xml /opt/jetty/webapps/docs.xml
 ADD docs-web/target/docs-web-*.war /opt/jetty/webapps/docs.war
 

docs-core/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.sismics.docs</groupId>
     <artifactId>docs-parent</artifactId>
     <version>1.12-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
     <!-- Persistence layer dependencies -->
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
+      <artifactId>hibernate-core-jakarta</artifactId>
     </dependency>
     
     <dependency>
@@ -63,8 +63,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>javax.json</artifactId>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
     </dependency>
 
     <dependency>
@@ -190,25 +190,6 @@
       <artifactId>postgresql</artifactId>
     </dependency>
 
-    <!-- JDK 11 JAXB dependencies -->
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>

docs-core/src/main/java/com/sismics/docs/core/dao/AclDao.java

@@ -10,8 +10,8 @@ import com.sismics.docs.core.util.AuditLogUtil;
 import com.sismics.docs.core.util.SecurityUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

docs-core/src/main/java/com/sismics/docs/core/dao/AuditLogDao.java

@@ -12,7 +12,7 @@ import com.sismics.docs.core.util.jpa.QueryParam;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.sql.Timestamp;
 import java.util.*;
 

docs-core/src/main/java/com/sismics/docs/core/dao/AuthenticationTokenDao.java

@@ -4,8 +4,8 @@ import com.sismics.docs.core.model.jpa.AuthenticationToken;
 import com.sismics.util.context.ThreadLocalContext;
 import org.joda.time.DateTime;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

docs-core/src/main/java/com/sismics/docs/core/dao/CommentDao.java

@@ -6,9 +6,9 @@ import com.sismics.docs.core.model.jpa.Comment;
 import com.sismics.docs.core.util.AuditLogUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;

docs-core/src/main/java/com/sismics/docs/core/dao/ConfigDao.java

@@ -4,8 +4,8 @@ import com.sismics.docs.core.constant.ConfigType;
 import com.sismics.docs.core.model.jpa.Config;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 /**
  * Configuration parameter DAO.

docs-core/src/main/java/com/sismics/docs/core/dao/ContributorDao.java

@@ -4,8 +4,8 @@ import com.sismics.docs.core.dao.dto.ContributorDto;
 import com.sismics.docs.core.model.jpa.Contributor;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

docs-core/src/main/java/com/sismics/docs/core/dao/DocumentDao.java

@@ -7,10 +7,10 @@ import com.sismics.docs.core.model.jpa.Document;
 import com.sismics.docs.core.util.AuditLogUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;

docs-core/src/main/java/com/sismics/docs/core/dao/DocumentMetadataDao.java

@@ -5,8 +5,8 @@ import com.sismics.docs.core.dao.dto.DocumentMetadataDto;
 import com.sismics.docs.core.model.jpa.DocumentMetadata;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

docs-core/src/main/java/com/sismics/docs/core/dao/FileDao.java

@@ -5,9 +5,9 @@ import com.sismics.docs.core.model.jpa.File;
 import com.sismics.docs.core.util.AuditLogUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;

docs-core/src/main/java/com/sismics/docs/core/dao/GroupDao.java

@@ -12,9 +12,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.util.*;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/dao/MetadataDao.java

@@ -12,9 +12,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.util.*;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/dao/PasswordRecoveryDao.java

@@ -6,9 +6,9 @@ import com.sismics.util.context.ThreadLocalContext;
 import org.joda.time.DateTime;
 import org.joda.time.DurationFieldType;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.util.Date;
 import java.util.UUID;
 

docs-core/src/main/java/com/sismics/docs/core/dao/RelationDao.java

@@ -4,8 +4,8 @@ import com.sismics.docs.core.dao.dto.RelationDto;
 import com.sismics.docs.core.model.jpa.Relation;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.*;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/dao/RoleBaseFunctionDao.java

@@ -3,8 +3,8 @@ package com.sismics.docs.core.dao;
 import com.google.common.collect.Sets;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.Set;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/dao/RouteDao.java

@@ -11,7 +11,7 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.sql.Timestamp;
 import java.util.*;
 

docs-core/src/main/java/com/sismics/docs/core/dao/RouteModelDao.java

@@ -12,9 +12,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
 

docs-core/src/main/java/com/sismics/docs/core/dao/RouteStepDao.java

@@ -12,8 +12,8 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
 

docs-core/src/main/java/com/sismics/docs/core/dao/ShareDao.java

@@ -3,8 +3,8 @@ package com.sismics.docs.core.dao;
 import com.sismics.docs.core.model.jpa.Share;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.Date;
 import java.util.UUID;
 

docs-core/src/main/java/com/sismics/docs/core/dao/TagDao.java

@@ -13,9 +13,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.util.*;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/dao/UserDao.java

@@ -19,9 +19,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
 

docs-core/src/main/java/com/sismics/docs/core/dao/VocabularyDao.java

@@ -3,9 +3,9 @@ package com.sismics.docs.core.dao;
 import com.sismics.docs.core.model.jpa.Vocabulary;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.util.List;
 import java.util.UUID;
 

docs-core/src/main/java/com/sismics/docs/core/dao/WebhookDao.java

@@ -9,9 +9,9 @@ import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
 

docs-core/src/main/java/com/sismics/docs/core/dao/dto/RouteStepDto.java

@@ -3,8 +3,8 @@ package com.sismics.docs.core.dao.dto;
 import com.sismics.docs.core.constant.RouteStepType;
 import com.sismics.util.JsonUtil;
 
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
 
 /**
  * Route step DTO.

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Acl.java

@@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.AclType;
 import com.sismics.docs.core.constant.PermType;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/AuditLog.java

@@ -2,12 +2,12 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.AuditLogType;

docs-core/src/main/java/com/sismics/docs/core/model/jpa/AuthenticationToken.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/BaseFunction.java

@@ -1,9 +1,9 @@
 package com.sismics.docs.core.model.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Comment.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Config.java

@@ -1,11 +1,11 @@
 package com.sismics.docs.core.model.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.ConfigType;

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Contributor.java

@@ -1,9 +1,9 @@
 package com.sismics.docs.core.model.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Document.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/DocumentMetadata.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/DocumentTag.java

@@ -3,10 +3,10 @@ package com.sismics.docs.core.model.jpa;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/File.java

@@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import com.sismics.util.mime.MimeTypeUtil;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Group.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Metadata.java

@@ -3,7 +3,7 @@ package com.sismics.docs.core.model.jpa;
 import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.MetadataType;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/PasswordRecovery.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Relation.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Role.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/RoleBaseFunction.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Route.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/RouteModel.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/RouteStep.java

@@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.RouteStepTransition;
 import com.sismics.docs.core.constant.RouteStepType;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Share.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Tag.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/User.java

@@ -2,10 +2,10 @@ package com.sismics.docs.core.model.jpa;
 
 import com.google.common.base.MoreObjects;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/model/jpa/UserGroup.java

@@ -3,10 +3,10 @@ package com.sismics.docs.core.model.jpa;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Vocabulary.java

@@ -1,9 +1,9 @@
 package com.sismics.docs.core.model.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import com.google.common.base.MoreObjects;
 

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Webhook.java

@@ -3,7 +3,7 @@ package com.sismics.docs.core.model.jpa;
 import com.google.common.base.MoreObjects;
 import com.sismics.docs.core.constant.WebhookEvent;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/util/ActionUtil.java

@@ -9,7 +9,7 @@ import com.sismics.docs.core.util.action.RemoveTagAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 
 /**
  * Action utilities.

docs-core/src/main/java/com/sismics/docs/core/util/AuditLogUtil.java

@@ -6,7 +6,7 @@ import com.sismics.docs.core.model.jpa.AuditLog;
 import com.sismics.docs.core.model.jpa.Loggable;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
  * Audit log utilities.

docs-core/src/main/java/com/sismics/docs/core/util/MetadataUtil.java

@@ -10,9 +10,9 @@ import com.sismics.docs.core.dao.dto.MetadataDto;
 import com.sismics.docs.core.model.jpa.DocumentMetadata;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;

docs-core/src/main/java/com/sismics/docs/core/util/RoutingUtil.java

@@ -19,10 +19,10 @@ import com.sismics.docs.core.model.jpa.Document;
 import com.sismics.docs.core.model.jpa.RouteModel;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 import java.io.StringReader;
 import java.util.List;
 

docs-core/src/main/java/com/sismics/docs/core/util/TransactionUtil.java

@@ -5,8 +5,8 @@ import com.sismics.util.jpa.EMF;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 
 /**
  * Database transaction utils.

docs-core/src/main/java/com/sismics/docs/core/util/action/Action.java

@@ -2,7 +2,7 @@ package com.sismics.docs.core.util.action;
 
 import com.sismics.docs.core.dao.dto.DocumentDto;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 
 /**
  * Base action interface.

docs-core/src/main/java/com/sismics/docs/core/util/action/AddTagAction.java

@@ -6,7 +6,7 @@ import com.sismics.docs.core.dao.criteria.TagCriteria;
 import com.sismics.docs.core.dao.dto.DocumentDto;
 import com.sismics.docs.core.dao.dto.TagDto;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import java.util.List;
 import java.util.Set;
 

docs-core/src/main/java/com/sismics/docs/core/util/action/ProcessFilesAction.java

@@ -13,7 +13,7 @@ import com.sismics.util.context.ThreadLocalContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import java.nio.file.Path;
 import java.util.List;
 

docs-core/src/main/java/com/sismics/docs/core/util/action/RemoveTagAction.java

@@ -6,7 +6,7 @@ import com.sismics.docs.core.dao.criteria.TagCriteria;
 import com.sismics.docs.core.dao.dto.DocumentDto;
 import com.sismics.docs.core.dao.dto.TagDto;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import java.util.List;
 import java.util.Set;
 

docs-core/src/main/java/com/sismics/docs/core/util/action/TagAction.java

@@ -4,7 +4,7 @@ import com.sismics.docs.core.dao.TagDao;
 import com.sismics.docs.core.dao.criteria.TagCriteria;
 import com.sismics.docs.core.dao.dto.TagDto;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import java.util.List;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java

@@ -347,10 +347,8 @@ public class LuceneIndexingHandler implements IndexingHandler {
 
         criteriaList.add("d.DOC_DELETEDATE_D is null");
 
-        if (!criteriaList.isEmpty()) {
-            sb.append(" where ");
-            sb.append(Joiner.on(" and ").join(criteriaList));
-        }
+        sb.append(" where ");
+        sb.append(Joiner.on(" and ").join(criteriaList));
 
         // Perform the search
         QueryParam queryParam = new QueryParam(sb.toString(), parameterMap);

docs-core/src/main/java/com/sismics/docs/core/util/jpa/PaginatedLists.java

@@ -1,6 +1,6 @@
 package com.sismics.docs.core.util.jpa;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.util.List;
 
 /**

docs-core/src/main/java/com/sismics/docs/core/util/jpa/QueryUtil.java

@@ -2,8 +2,8 @@ package com.sismics.docs.core.util.jpa;
 
 import java.util.Map.Entry;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 
 import com.sismics.util.context.ThreadLocalContext;
 

docs-core/src/main/java/com/sismics/util/EmailUtil.java

@@ -17,9 +17,9 @@ import org.jsoup.Jsoup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.Multipart;

docs-core/src/main/java/com/sismics/util/JsonUtil.java

@@ -1,7 +1,7 @@
 package com.sismics.util;
 
-import javax.json.Json;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonValue;
 
 /**
  * JSON utilities.

docs-core/src/main/java/com/sismics/util/context/ThreadLocalContext.java

@@ -3,7 +3,7 @@ package com.sismics.util.context;
 import com.google.common.collect.Lists;
 import com.sismics.docs.core.model.context.AppContext;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Iterator;
 import java.util.List;
 

docs-core/src/main/java/com/sismics/util/jpa/EMF.java

@@ -8,8 +8,8 @@ import org.hibernate.service.ServiceRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

docs-core/src/test/java/com/sismics/docs/BaseTransactionalTest.java

@@ -5,8 +5,8 @@ import com.sismics.util.jpa.EMF;
 import org.junit.After;
 import org.junit.Before;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 
 /**
  * Base class of tests with a transactional context.

docs-web-common/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.sismics.docs</groupId>
     <artifactId>docs-parent</artifactId>
     <version>1.12-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
@@ -54,8 +54,8 @@
     </dependency>
   
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 

docs-web-common/src/main/java/com/sismics/rest/exception/ClientException.java

@@ -1,12 +1,11 @@
 package com.sismics.rest.exception;
 
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.json.Json;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.json.Json;
 
 /**
  * Jersey exception encapsulating an error from the client (BAD_REQUEST).
@@ -43,7 +42,7 @@ public class ClientException extends WebApplicationException {
      * @param message Human readable error message
      */
     public ClientException(String type, String message) {
-        super(Response.status(Status.BAD_REQUEST).entity(Json.createObjectBuilder()
+        super(Response.status(Response.Status.BAD_REQUEST).entity(Json.createObjectBuilder()
             .add("type", type)
             .add("message", message).build()).build());
     }

docs-web-common/src/main/java/com/sismics/rest/exception/ForbiddenClientException.java

@@ -1,9 +1,9 @@
 package com.sismics.rest.exception;
 
-import javax.json.Json;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.json.Json;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 /**
  * Unauthorized access to the resource exception.

docs-web-common/src/main/java/com/sismics/rest/exception/ServerException.java

@@ -1,9 +1,9 @@
 package com.sismics.rest.exception;
 
-import javax.json.Json;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.json.Json;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

docs-web-common/src/main/java/com/sismics/rest/util/AclUtil.java

@@ -6,9 +6,9 @@ import com.sismics.docs.core.dao.AclDao;
 import com.sismics.docs.core.dao.dto.AclDto;
 import com.sismics.util.JsonUtil;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 import java.util.List;
 
 /**

docs-web-common/src/main/java/com/sismics/rest/util/RestUtil.java

@@ -6,8 +6,8 @@ import com.sismics.docs.core.util.FileUtil;
 import com.sismics.rest.exception.ServerException;
 import com.sismics.util.JsonUtil;
 
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
 import java.io.IOException;
 import java.nio.file.Files;
 

docs-web-common/src/main/java/com/sismics/util/filter/CorsFilter.java

@@ -2,9 +2,9 @@ package com.sismics.util.filter;
 
 import com.sismics.util.EnvironmentUtil;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

docs-web-common/src/main/java/com/sismics/util/filter/HeaderBasedSecurityFilter.java

@@ -4,8 +4,8 @@ import com.google.common.base.Strings;
 import com.sismics.docs.core.dao.UserDao;
 import com.sismics.docs.core.model.jpa.User;
 
-import javax.servlet.FilterConfig;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * A header-based security filter that authenticates an user using the "X-Authenticated-User" request header as the user ID.

docs-web-common/src/main/java/com/sismics/util/filter/RequestContextFilter.java

@@ -6,6 +6,9 @@ import com.sismics.docs.core.util.TransactionUtil;
 import com.sismics.util.EnvironmentUtil;
 import com.sismics.util.context.ThreadLocalContext;
 import com.sismics.util.jpa.EMF;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.HttpHeaders;
 import org.apache.log4j.Level;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.RollingFileAppender;
@@ -13,11 +16,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 import java.io.IOException;
 import java.text.MessageFormat;
 

docs-web-common/src/main/java/com/sismics/util/filter/SecurityFilter.java

@@ -13,8 +13,8 @@ import org.joda.time.DateTimeZone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;

docs-web-common/src/main/java/com/sismics/util/filter/TokenBasedSecurityFilter.java

@@ -5,8 +5,8 @@ import com.sismics.docs.core.dao.UserDao;
 import com.sismics.docs.core.model.jpa.AuthenticationToken;
 import com.sismics.docs.core.model.jpa.User;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import java.text.MessageFormat;
 import java.util.Date;
 

docs-web-common/src/main/java/com/sismics/util/listener/IIOProviderContextListener.java

@@ -0,0 +1,78 @@
+package com.sismics.util.listener;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.imageio.ImageIO;
+import javax.imageio.spi.IIORegistry;
+import javax.imageio.spi.ServiceRegistry;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+
+/**
+ * Takes care of registering and de-registering local ImageIO plugins (service providers) for the servlet context.
+ * <p>
+ * Registers all available plugins on {@code contextInitialized} event, using {@code ImageIO.scanForPlugins()}, to make
+ * sure they are available to the current servlet context.
+ * De-registers all plugins which have the {@link Thread#getContextClassLoader() current thread's context class loader}
+ * as its class loader on {@code contextDestroyed} event, to avoid class/resource leak.
+ * </p>
+ * Copied from: <a href="https://github.com/haraldk/TwelveMonkeys/blob/master/servlet/src/main/java/com/twelvemonkeys/servlet/image/IIOProviderContextListener.java">https://github.com/haraldk/TwelveMonkeys</a>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: IIOProviderContextListener.java,v 1.0 14.02.12 21:53 haraldk Exp$
+ * @see ImageIO#scanForPlugins()
+ */
+public final class IIOProviderContextListener implements ServletContextListener {
+    
+    public void contextInitialized(final ServletContextEvent event) {
+        event.getServletContext().log("Scanning for locally installed ImageIO plugin providers");
+
+        // Registers all locally available IIO plugins.
+        ImageIO.scanForPlugins();
+    }
+
+    public void contextDestroyed(final ServletContextEvent event) {
+        ServletContext servletContext = event.getServletContext();
+
+        // De-register any locally registered IIO plugins. Relies on each web app having its own context class loader.
+        LocalFilter localFilter = new LocalFilter(Thread.currentThread().getContextClassLoader()); // scanForPlugins uses context class loader
+
+        IIORegistry registry = IIORegistry.getDefaultInstance();
+        Iterator<Class<?>> categories = registry.getCategories();
+
+        while (categories.hasNext()) {
+            deregisterLocalProvidersForCategory(registry, localFilter, categories.next(), servletContext);
+        }
+    }
+
+    private static <T> void deregisterLocalProvidersForCategory(IIORegistry registry, LocalFilter localFilter, Class<T> category, ServletContext context) {
+        Iterator<T> providers = registry.getServiceProviders(category, localFilter, false);
+
+        // Copy the providers, as de-registering while iterating over providers will lead to ConcurrentModificationExceptions.
+        List<T> providersCopy = new ArrayList<>();
+        while (providers.hasNext()) {
+            providersCopy.add(providers.next());
+        }
+
+        for (T provider : providersCopy) {
+            registry.deregisterServiceProvider(provider, category);
+            context.log(String.format("Unregistered locally installed provider class: %s", provider.getClass()));
+        }
+    }
+
+    static class LocalFilter implements ServiceRegistry.Filter {
+        private final ClassLoader loader;
+
+        public LocalFilter(ClassLoader loader) {
+            this.loader = loader;
+        }
+
+        public boolean filter(Object provider) {
+            return provider.getClass().getClassLoader() == loader;
+        }
+    }
+}

docs-web-common/src/test/java/com/sismics/docs/rest/BaseJerseyTest.java

@@ -20,8 +20,8 @@ import org.subethamail.wiser.WiserMessage;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.UriBuilder;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URI;
@@ -90,7 +90,7 @@ public abstract class BaseJerseyTest extends JerseyTest {
 
         httpServer = HttpServer.createSimpleServer(getClass().getResource("/").getFile(), "localhost", getPort());
         WebappContext context = new WebappContext("GrizzlyContext", "/docs");
-        context.addListener("com.twelvemonkeys.servlet.image.IIOProviderContextListener");
+        context.addListener("com.sismics.util.listener.IIOProviderContextListener");
         context.addFilter("requestContextFilter", RequestContextFilter.class)
                 .addMappingForUrlPatterns(null, "/*");
         context.addFilter("tokenBasedSecurityFilter", TokenBasedSecurityFilter.class)

docs-web-common/src/test/java/com/sismics/docs/rest/util/ClientUtil.java

@@ -8,13 +8,13 @@ import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart;
 import org.junit.Assert;
 
-import javax.json.JsonObject;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;

docs-web/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.sismics.docs</groupId>
     <artifactId>docs-parent</artifactId>
     <version>1.12-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
@@ -79,8 +79,9 @@
     </dependency>
     
     <dependency>
-      <groupId>com.twelvemonkeys.servlet</groupId>
-      <artifactId>servlet</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     
     <!-- Test dependencies -->

docs-web/src/dev/main/webapp/web-override.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app id="docs"
-  xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-  version="3.0"
-  metadata-complete="true"> 
-
+         xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+         version="5.0"
+         metadata-complete="true">
   <!-- Override init parameter to avoid nasty file locking issue on windows. -->
   <servlet>
     <servlet-name>default</servlet-name>

docs-web/src/main/java/com/sismics/docs/rest/resource/AclResource.java

@@ -21,11 +21,11 @@ import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.rest.util.ValidationUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.text.MessageFormat;
 import java.util.List;
 

docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java

@@ -33,13 +33,13 @@ import org.apache.log4j.Level;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;

docs-web/src/main/java/com/sismics/docs/rest/resource/AuditLogResource.java

@@ -13,14 +13,14 @@ import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.util.JsonUtil;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Audit log REST resources.

docs-web/src/main/java/com/sismics/docs/rest/resource/BaseResource.java

@@ -7,12 +7,13 @@ import com.sismics.security.IPrincipal;
 import com.sismics.security.UserPrincipal;
 import com.sismics.util.filter.SecurityFilter;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+
 import java.security.Principal;
 import java.util.List;
 import java.util.Set;

docs-web/src/main/java/com/sismics/docs/rest/resource/CommentResource.java

@@ -9,11 +9,11 @@ import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.rest.util.ValidationUtil;
 import com.sismics.util.ImageUtil;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 
 /**

docs-web/src/main/java/com/sismics/docs/rest/resource/DocsMessageBodyWriter.java

@@ -2,13 +2,13 @@ package com.sismics.docs.rest.resource;
 
 import org.glassfish.jersey.message.internal.ReaderWriter;
 
-import javax.json.JsonObject;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;

docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java

@@ -43,16 +43,16 @@ import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.DateTimeFormatterBuilder;
 import org.joda.time.format.DateTimeParser;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.internet.MimeMessage;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;

docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java

@@ -30,15 +30,15 @@ import com.sismics.util.mime.MimeType;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.*;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;

docs-web/src/main/java/com/sismics/docs/rest/resource/GroupResource.java

@@ -21,11 +21,11 @@ import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.rest.util.ValidationUtil;
 import com.sismics.util.JsonUtil;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Set;

docs-web/src/main/java/com/sismics/docs/rest/resource/MetadataResource.java

@@ -10,11 +10,11 @@ import com.sismics.docs.rest.constant.BaseFunction;
 import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.rest.util.ValidationUtil;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 
 /**

docs-web/src/main/java/com/sismics/docs/rest/resource/RouteModelResource.java

@@ -20,9 +20,9 @@ import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.rest.util.AclUtil;
 import com.sismics.rest.util.ValidationUtil;
 
-import javax.json.*;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.*;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.io.StringReader;
 import java.util.List;
 

docs-web/src/main/java/com/sismics/docs/rest/resource/RouteResource.java

@@ -18,9 +18,9 @@ import com.sismics.rest.exception.ClientException;
 import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.rest.util.ValidationUtil;
 
-import javax.json.*;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.*;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.io.StringReader;
 import java.util.List;
 

docs-web/src/main/java/com/sismics/docs/rest/resource/ShareResource.java

@@ -15,10 +15,10 @@ import com.sismics.rest.util.ValidationUtil;
 import com.sismics.util.JsonUtil;
 import com.sismics.util.context.ThreadLocalContext;
 
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.text.MessageFormat;
 import java.util.List;
 

docs-web/src/main/java/com/sismics/docs/rest/resource/TagResource.java

@@ -16,11 +16,11 @@ import com.sismics.rest.util.AclUtil;
 import com.sismics.rest.util.ValidationUtil;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Set;

docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java

@@ -17,11 +17,11 @@ import com.sismics.util.css.Selector;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
-import javax.json.*;
-import javax.ws.rs.*;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.json.*;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;