diff --git a/Dockerfile b/Dockerfile
index 0690a346..74764c72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM sismics/ubuntu-jetty:9.3.11
+FROM sismics/ubuntu-jetty:9.4.12
MAINTAINER b.gamard@sismics.com
RUN apt-get update && apt-get -y -q install ffmpeg mediainfo tesseract-ocr tesseract-ocr-fra tesseract-ocr-ita tesseract-ocr-kor tesseract-ocr-rus tesseract-ocr-ukr tesseract-ocr-spa tesseract-ocr-ara tesseract-ocr-hin tesseract-ocr-deu tesseract-ocr-pol tesseract-ocr-jpn tesseract-ocr-por tesseract-ocr-tha tesseract-ocr-jpn tesseract-ocr-chi-sim tesseract-ocr-chi-tra && \
apt-get clean && rm -rf /var/lib/apt/lists/*
# Remove the embedded javax.mail jar from Jetty
-RUN rm -f /opt/jetty/lib/jndi/javax.mail.glassfish-*.jar
+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
diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java b/docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java
index 45219af3..1bb50227 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java
@@ -39,7 +39,6 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.NoLockFactory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.store.SimpleFSDirectory;
-import org.apache.lucene.util.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -110,13 +109,7 @@ public class LuceneIndexingHandler implements IndexingHandler {
log.info("Checking index health and version");
try (CheckIndex checkIndex = new CheckIndex(directory)) {
CheckIndex.Status status = checkIndex.checkIndex();
- if (status.clean) {
- for (CheckIndex.Status.SegmentInfoStatus segmentInfo : status.segmentInfos) {
- if (!segmentInfo.version.onOrAfter(Version.LATEST)) {
- throw new Exception("Index is old (" + segmentInfo.version + ")");
- }
- }
- } else {
+ if (!status.clean) {
throw new Exception("Index is dirty");
}
}
@@ -352,7 +345,7 @@ public class LuceneIndexingHandler implements IndexingHandler {
return;
}
- FuzzySuggester suggester = new FuzzySuggester(new StandardAnalyzer());
+ FuzzySuggester suggester = new FuzzySuggester(directory, "", new StandardAnalyzer());
LuceneDictionary dictionary = new LuceneDictionary(directoryReader, "title");
suggester.build(dictionary);
int lastIndex = search.lastIndexOf(' ');
diff --git a/docs-core/src/main/java/com/sismics/util/ImageUtil.java b/docs-core/src/main/java/com/sismics/util/ImageUtil.java
index 4a61e625..0d54718d 100644
--- a/docs-core/src/main/java/com/sismics/util/ImageUtil.java
+++ b/docs-core/src/main/java/com/sismics/util/ImageUtil.java
@@ -73,11 +73,12 @@ public class ImageUtil {
* @param email Email
* @return Gravatar hash
*/
+ @SuppressWarnings("deprecation") // Gravatar uses MD5, nothing we can do about it
public static String computeGravatar(String email) {
if (email == null) {
return null;
}
-
+
return Hashing.md5().hashString(
email.trim().toLowerCase(), Charsets.UTF_8)
.toString();
diff --git a/docs-web-common/src/main/java/com/sismics/security/AnonymousPrincipal.java b/docs-web-common/src/main/java/com/sismics/security/AnonymousPrincipal.java
index 5e137f30..4200cf25 100644
--- a/docs-web-common/src/main/java/com/sismics/security/AnonymousPrincipal.java
+++ b/docs-web-common/src/main/java/com/sismics/security/AnonymousPrincipal.java
@@ -1,10 +1,9 @@
package com.sismics.security;
-import java.util.Set;
-
+import com.google.common.collect.Sets;
import org.joda.time.DateTimeZone;
-import jersey.repackaged.com.google.common.collect.Sets;
+import java.util.Set;
/**
* Anonymous principal.
diff --git a/docs-web-common/src/main/java/com/sismics/util/filter/SecurityFilter.java b/docs-web-common/src/main/java/com/sismics/util/filter/SecurityFilter.java
index 11d05949..1aacbb9b 100644
--- a/docs-web-common/src/main/java/com/sismics/util/filter/SecurityFilter.java
+++ b/docs-web-common/src/main/java/com/sismics/util/filter/SecurityFilter.java
@@ -1,5 +1,6 @@
package com.sismics.util.filter;
+import com.google.common.collect.Sets;
import com.sismics.docs.core.constant.Constants;
import com.sismics.docs.core.dao.GroupDao;
import com.sismics.docs.core.dao.RoleBaseFunctionDao;
@@ -8,7 +9,6 @@ import com.sismics.docs.core.dao.dto.GroupDto;
import com.sismics.docs.core.model.jpa.User;
import com.sismics.security.AnonymousPrincipal;
import com.sismics.security.UserPrincipal;
-import jersey.repackaged.com.google.common.collect.Sets;
import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/docs-web/pom.xml b/docs-web/pom.xml
index e3964e74..b5eb7f28 100644
--- a/docs-web/pom.xml
+++ b/docs-web/pom.xml
@@ -41,6 +41,11 @@
org.glassfish.jersey.media
jersey-media-multipart
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+
diff --git a/pom.xml b/pom.xml
index eeae33e3..5deb269f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,52 +16,50 @@
UTF-8
- 1.10
+ 1.18
2.6
- 2.4
+ 2.6
1.5
- 2.3.23
+ 2.3.28
1.4
- 19.0
+ 26.0-jre
1.2.16
1.6.4
1.6.6
4.12
- 1.4.191
- 2.22.2
- 1.1.2
+ 1.4.197
+ 2.27
+ 1.1.3
0.3m
- 5.5.0
+ 7.5.0
4.2
2.0.12
1.54
- 2.9.2
- 5.1.0.Final
- 3.1.0
+ 2.10
+ 5.3.7.Final
+ 4.0.1
2.0.1
4.2.1
3.3.2
1.6.5
1.3.0
- 42.2.2
+ 42.2.5
1.2
- 1.5.7
- 1.5.6
- 1.11.2
+ 1.5.8
+ 1.6.2
+ 1.11.3
3.11.0
- 9.3.11.v20160721
- 9.3.11.v20160721
- 9.3.11.v20160721
+ 9.4.12.v20180830
+ 9.4.12.v20180830
+ 9.4.12.v20180830
1.8
- 2.10
- 2.6
- 2.7
- 2.6
- 2.19.1
- 9.3.11.v20160721
+ 3.1.0
+ 3.2.2
+ 2.22.1
+ 9.4.12.v20180830
@@ -92,28 +90,16 @@
org.apache.maven.plugins
- maven-dependency-plugin
- ${org.apache.maven.plugins.maven-dependency-plugin.version}
+ maven-war-plugin
+ ${org.apache.maven.plugins.maven-war-plugin.version}
-
+
org.apache.maven.plugins
maven-jar-plugin
${org.apache.maven.plugins.maven-jar-plugin.version}
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- ${org.apache.maven.plugins.maven-resources-plugin.version}
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
- ${org.apache.maven.plugins.maven-war-plugin.version}
-
-
+
org.apache.maven.plugins
maven-surefire-plugin
@@ -285,6 +271,12 @@
${org.glassfish.jersey.version}
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ ${org.glassfish.jersey.version}
+
+
org.glassfish.jersey.core
jersey-client