From 1aa21c376240a06aacea3bb9b01389817d01ebc4 Mon Sep 17 00:00:00 2001
From: bgamard <b.gamard@sismics.com>
Date: Sun, 19 Mar 2023 14:28:22 +0100
Subject: [PATCH] bump dependencies

---
 docs-core/pom.xml                             |  9 +--
 .../docs/core/service/InboxService.java       |  2 +-
 .../sismics/docs/core/util/DirectoryUtil.java |  2 +-
 .../com/sismics/docs/core/util/FileUtil.java  |  2 +-
 .../com/sismics/util/log4j/LogCriteria.java   |  2 +-
 docs-web-common/pom.xml                       | 11 +--
 .../com/sismics/rest/util/ValidationUtil.java |  2 +-
 docs-web/pom.xml                              | 15 +---
 .../docs/rest/resource/AppResource.java       |  2 +-
 .../docs/rest/resource/DocumentResource.java  |  2 +-
 .../docs/rest/resource/TagResource.java       |  2 +-
 .../docs/rest/resource/UserResource.java      |  2 +-
 .../com/sismics/docs/rest/TestSecurity.java   |  2 +-
 pom.xml                                       | 74 ++++++++-----------
 14 files changed, 47 insertions(+), 82 deletions(-)

diff --git a/docs-core/pom.xml b/docs-core/pom.xml
index 9911cd33..eac646db 100644
--- a/docs-core/pom.xml
+++ b/docs-core/pom.xml
@@ -48,8 +48,8 @@
     </dependency>
     
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
 
     <dependency>
@@ -122,11 +122,6 @@
       <artifactId>lucene-highlighter</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>javax.mail</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
diff --git a/docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java b/docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java
index 1b463266..7b20dde1 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java
@@ -18,7 +18,7 @@ import com.sismics.docs.core.util.TransactionUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.EmailUtil;
 import com.sismics.util.context.ThreadLocalContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/DirectoryUtil.java b/docs-core/src/main/java/com/sismics/docs/core/util/DirectoryUtil.java
index be941c28..1c335ed6 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/util/DirectoryUtil.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/util/DirectoryUtil.java
@@ -5,7 +5,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.sismics.util.EnvironmentUtil;
 
diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java b/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java
index 7652c743..0598b729 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java
@@ -16,7 +16,7 @@ import com.sismics.util.Scalr;
 import com.sismics.util.context.ThreadLocalContext;
 import com.sismics.util.io.InputStreamReaderThread;
 import com.sismics.util.mime.MimeTypeUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/docs-core/src/main/java/com/sismics/util/log4j/LogCriteria.java b/docs-core/src/main/java/com/sismics/util/log4j/LogCriteria.java
index d8e4a90e..c28a31a6 100644
--- a/docs-core/src/main/java/com/sismics/util/log4j/LogCriteria.java
+++ b/docs-core/src/main/java/com/sismics/util/log4j/LogCriteria.java
@@ -1,6 +1,6 @@
 package com.sismics.util.log4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Level;
 
 /**
diff --git a/docs-web-common/pom.xml b/docs-web-common/pom.xml
index 12149157..be1aadcf 100644
--- a/docs-web-common/pom.xml
+++ b/docs-web-common/pom.xml
@@ -34,8 +34,8 @@
       
     <!-- Other external dependencies -->
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     
     <dependency>
@@ -53,17 +53,12 @@
       <artifactId>log4j</artifactId>
     </dependency>
   
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
-  
+
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/docs-web-common/src/main/java/com/sismics/rest/util/ValidationUtil.java b/docs-web-common/src/main/java/com/sismics/rest/util/ValidationUtil.java
index 0c5a279d..a1fc6831 100644
--- a/docs-web-common/src/main/java/com/sismics/rest/util/ValidationUtil.java
+++ b/docs-web-common/src/main/java/com/sismics/rest/util/ValidationUtil.java
@@ -2,7 +2,7 @@ package com.sismics.rest.util;
 
 import com.google.common.base.Strings;
 import com.sismics.rest.exception.ClientException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 
 import java.text.MessageFormat;
diff --git a/docs-web/pom.xml b/docs-web/pom.xml
index fa9ffc33..41c77194 100644
--- a/docs-web/pom.xml
+++ b/docs-web/pom.xml
@@ -49,8 +49,8 @@
       
     <!-- Other external dependencies -->
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     
     <dependency>
@@ -68,17 +68,6 @@
       <artifactId>log4j</artifactId>
     </dependency>
   
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java
index 2f397b1e..f64b2d2b 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/AppResource.java
@@ -27,7 +27,7 @@ import com.sismics.util.context.ThreadLocalContext;
 import com.sismics.util.log4j.LogCriteria;
 import com.sismics.util.log4j.LogEntry;
 import com.sismics.util.log4j.MemoryAppender;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Appender;
 import org.apache.log4j.Level;
 import org.slf4j.Logger;
diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
index 78f8751f..43742756 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
@@ -34,7 +34,7 @@ import com.sismics.util.JsonUtil;
 import com.sismics.util.context.ThreadLocalContext;
 import com.sismics.util.mime.MimeType;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.joda.time.DateTime;
diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/TagResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/TagResource.java
index 92485097..f44283e1 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/TagResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/TagResource.java
@@ -14,7 +14,7 @@ import com.sismics.rest.exception.ClientException;
 import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.rest.util.AclUtil;
 import com.sismics.rest.util.ValidationUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java
index 23301dd7..87dfe962 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java
@@ -30,7 +30,7 @@ import com.sismics.util.context.ThreadLocalContext;
 import com.sismics.util.filter.TokenBasedSecurityFilter;
 import com.sismics.util.totp.GoogleAuthenticator;
 import com.sismics.util.totp.GoogleAuthenticatorKey;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java b/docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java
index 602415a3..07001614 100644
--- a/docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java
+++ b/docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java
@@ -9,7 +9,7 @@ import javax.ws.rs.core.Response.Status;
 import com.sismics.util.filter.HeaderBasedSecurityFilter;
 import org.junit.Assert;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
 import com.sismics.util.filter.TokenBasedSecurityFilter;
diff --git a/pom.xml b/pom.xml
index 5ba6666b..91a4510c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,51 +16,49 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Dependencies version (external) -->
-    <org.apache.commons.commons-compress.version>1.18</org.apache.commons.commons-compress.version>
-    <commons-lang.commons-lang.version>2.6</commons-lang.commons-lang.version>
-    <commons-io.commons-io.version>2.6</commons-io.commons-io.version>
+    <org.apache.commons.commons-compress.version>1.22</org.apache.commons.commons-compress.version>
+    <org.apache.commons.commons-lang3.version>3.12.0</org.apache.commons.commons-lang3.version>
+    <commons-io.commons-io.version>2.11.0</commons-io.commons-io.version>
     <org.apache.commons.commons-email.version>1.5</org.apache.commons.commons-email.version>
-    <org.freemarker.freemarker.version>2.3.30</org.freemarker.freemarker.version>
-    <commons-dbcp.version>1.4</commons-dbcp.version>
-    <com.google.guava.guava.version>30.1-jre</com.google.guava.guava.version>
+    <org.freemarker.freemarker.version>2.3.32</org.freemarker.freemarker.version>
+    <com.google.guava.guava.version>31.1-jre</com.google.guava.guava.version>
     <log4j.log4j.version>1.2.17</log4j.log4j.version>
     <org.slf4j.version>1.7.30</org.slf4j.version>
     <org.slf4j.jcl-over-slf4j.version>1.7.30</org.slf4j.jcl-over-slf4j.version>
     <org.slf4j.jul-to-slf4j.version>1.7.30</org.slf4j.jul-to-slf4j.version>
-    <junit.junit.version>4.13.1</junit.junit.version>
-    <com.h2database.h2.version>1.4.199</com.h2database.h2.version>
-    <org.glassfish.jersey.version>2.33</org.glassfish.jersey.version>
+    <junit.junit.version>4.13.2</junit.junit.version>
+    <com.h2database.h2.version>1.4.200</com.h2database.h2.version>
+    <org.glassfish.jersey.version>2.39</org.glassfish.jersey.version>
     <org.glassfish.javax.json.version>1.1.4</org.glassfish.javax.json.version>
-    <at.favre.lib.bcrypt.version>0.9.0</at.favre.lib.bcrypt.version>
+    <at.favre.lib.bcrypt.version>0.10.2</at.favre.lib.bcrypt.version>
     <org.apache.lucene.version>8.7.0</org.apache.lucene.version>
     <org.imgscalr.imgscalr-lib.version>4.2</org.imgscalr.imgscalr-lib.version>
-    <org.apache.pdfbox.pdfbox.version>2.0.22</org.apache.pdfbox.pdfbox.version>
-    <org.bouncycastle.bcprov-jdk15on.version>1.68</org.bouncycastle.bcprov-jdk15on.version>
-    <joda-time.joda-time.version>2.10.9</joda-time.joda-time.version>
-    <org.hibernate.hibernate.version>5.4.27.Final</org.hibernate.hibernate.version>
-    <javax.servlet.javax.servlet-api.version>4.0.1</javax.servlet.javax.servlet-api.version>
-    <fr.opensagres.xdocreport.version>2.0.2</fr.opensagres.xdocreport.version>
-    <net.java.dev.jna.jna.version>5.6.0</net.java.dev.jna.jna.version>
-    <com.twelvemonkeys.imageio.version>3.6.2</com.twelvemonkeys.imageio.version>
+    <org.apache.pdfbox.pdfbox.version>2.0.27</org.apache.pdfbox.pdfbox.version>
+    <org.bouncycastle.bcprov-jdk15on.version>1.70</org.bouncycastle.bcprov-jdk15on.version>
+    <joda-time.joda-time.version>2.12.2</joda-time.joda-time.version>
+    <org.hibernate.hibernate.version>5.6.15.Final</org.hibernate.hibernate.version>
+    <javax.servlet.javax.servlet-api.version>3.1.0</javax.servlet.javax.servlet-api.version>
+    <fr.opensagres.xdocreport.version>2.0.4</fr.opensagres.xdocreport.version>
+    <net.java.dev.jna.jna.version>5.13.0</net.java.dev.jna.jna.version>
+    <com.twelvemonkeys.imageio.version>3.9.4</com.twelvemonkeys.imageio.version>
     <com.levigo.jbig2.levigo-jbig2-imageio.version>2.0</com.levigo.jbig2.levigo-jbig2-imageio.version>
     <com.github.jai-imageio.jai-imageio-jpeg2000.version>1.4.0</com.github.jai-imageio.jai-imageio-jpeg2000.version>
-    <org.postgresql.postgresql.version>42.2.18</org.postgresql.postgresql.version>
+    <org.postgresql.postgresql.version>42.6.0</org.postgresql.postgresql.version>
     <org.subethamail.subethasmtp-wiser.version>1.2</org.subethamail.subethasmtp-wiser.version>
-    <com.icegreen.greenmail.version>1.5.8</com.icegreen.greenmail.version>
-    <com.sun.mail.javax.mail.version>1.6.2</com.sun.mail.javax.mail.version>
-    <org.jsoup.jsoup.version>1.13.1</org.jsoup.jsoup.version>
-    <com.squareup.okhttp3.okhttp.version>4.9.0</com.squareup.okhttp3.okhttp.version>
-    <org.apache.directory.api.api-all.version>2.0.1</org.apache.directory.api.api-all.version>
+    <com.icegreen.greenmail.version>1.6.14</com.icegreen.greenmail.version>
+    <org.jsoup.jsoup.version>1.15.4</org.jsoup.jsoup.version>
+    <com.squareup.okhttp3.okhttp.version>4.10.0</com.squareup.okhttp3.okhttp.version>
+    <org.apache.directory.api.api-all.version>2.1.2</org.apache.directory.api.api-all.version>
 
     <org.eclipse.jetty.jetty-server.version>9.4.51.v20230217</org.eclipse.jetty.jetty-server.version>
     <org.eclipse.jetty.jetty-webapp.version>9.4.51.v20230217</org.eclipse.jetty.jetty-webapp.version>
     <org.eclipse.jetty.jetty-servlet.version>9.4.51.v20230217</org.eclipse.jetty.jetty-servlet.version>
     
     <!-- Plugins version -->
-    <org.apache.maven.plugins.maven-antrun-plugin.version>3.0.0</org.apache.maven.plugins.maven-antrun-plugin.version>
-    <org.apache.maven.plugins.maven-jar-plugin.version>3.2.0</org.apache.maven.plugins.maven-jar-plugin.version>
-    <org.apache.maven.plugins.maven-war-plugin.version>3.3.1</org.apache.maven.plugins.maven-war-plugin.version>
-    <org.apache.maven.plugins.maven-surefire-plugin.version>3.0.0-M5</org.apache.maven.plugins.maven-surefire-plugin.version>
+    <org.apache.maven.plugins.maven-antrun-plugin.version>3.1.0</org.apache.maven.plugins.maven-antrun-plugin.version>
+    <org.apache.maven.plugins.maven-jar-plugin.version>3.3.0</org.apache.maven.plugins.maven-jar-plugin.version>
+    <org.apache.maven.plugins.maven-war-plugin.version>3.3.2</org.apache.maven.plugins.maven-war-plugin.version>
+    <org.apache.maven.plugins.maven-surefire-plugin.version>3.0.0</org.apache.maven.plugins.maven-surefire-plugin.version>
     <org.eclipse.jetty.jetty-maven-plugin.version>9.4.51.v20230217</org.eclipse.jetty.jetty-maven-plugin.version>
   </properties>
   
@@ -176,7 +174,7 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>${javax.servlet.javax.servlet-api.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
@@ -184,9 +182,9 @@
       </dependency>
             
       <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>${commons-lang.commons-lang.version}</version>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${org.apache.commons.commons-lang3.version}</version>
       </dependency>
 
       <dependency>
@@ -346,12 +344,6 @@
         <version>${org.hibernate.hibernate.version}</version>
       </dependency>
       
-      <dependency>
-        <groupId>commons-dbcp</groupId>
-        <artifactId>commons-dbcp</artifactId>
-        <version>${commons-dbcp.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.freemarker</groupId>
         <artifactId>freemarker</artifactId>
@@ -448,12 +440,6 @@
         <version>${com.icegreen.greenmail.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.sun.mail</groupId>
-        <artifactId>javax.mail</artifactId>
-        <version>${com.sun.mail.javax.mail.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>