0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update dependencies

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-05-17 18:28:12 +09:00
parent ec6c43851c
commit d93d21a874
5 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pom.xml
View file

@ -45,13 +45,13 @@
<!-- Partner Library -->
<slf4j.version>1.7.30</slf4j.version>
<log4j.version>2.11.1</log4j.version>
<jackson.version>2.10.2</jackson.version>
<jackson.version>2.10.4</jackson.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<asm.version>7.3.1</asm.version>
<tika.version>1.23</tika.version>
<groovy.version>3.0.0</groovy.version>
<minio.version>6.0.13</minio.version>
<okhttp.version>3.14.6</okhttp.version>
<asm.version>8.0.1</asm.version>
<tika.version>1.24.1</tika.version>
<groovy.version>3.0.3</groovy.version>
<minio.version>7.0.2</minio.version>
<okhttp.version>3.14.8</okhttp.version>
<!-- Crawler -->
<crawler.version>3.7.0-SNAPSHOT</crawler.version>
@ -65,7 +65,7 @@
<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
<!-- Tomcat -->
<tomcat.version>9.0.31</tomcat.version>
<tomcat.version>9.0.35</tomcat.version>
<tomcat.boot.version>0.7.4</tomcat.boot.version>
<!-- Testing -->
@ -1036,7 +1036,7 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.30</version>
<version>2.30.1</version>
<exclusions>
<exclusion>
<groupId>jakarta.annotation</groupId>
@ -1140,7 +1140,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.2-jre</version>
<version>29.0-jre</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.mojo</groupId>
@ -1167,7 +1167,7 @@
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
<version>1.30.5</version>
<version>1.30.6</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
@ -1182,17 +1182,17 @@
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>1.34.1</version>
<version>1.34.2</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
<version>1.34.1</version>
<version>1.34.2</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-xml</artifactId>
<version>1.34.1</version>
<version>1.34.2</version>
</dependency>
<dependency>
<groupId>org.codelibs</groupId>
@ -1227,12 +1227,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
<version>3.10</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>65.1</version>
<version>67.1</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
@ -1252,7 +1252,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>adal4j</artifactId>
<version>1.6.4</version>
<version>1.6.5</version>
<exclusions>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>

11
src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
View file

@ -43,7 +43,9 @@ import org.lastaflute.web.ruts.multipart.MultipartFormFile;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.servlet.request.stream.WrittenStreamOut;
import io.minio.ErrorCode;
import io.minio.MinioClient;
import io.minio.PutObjectOptions;
import io.minio.Result;
import io.minio.errors.ErrorResponseException;
import io.minio.messages.Item;
@ -160,8 +162,7 @@ public class AdminStorageAction extends FessAdminAction {
try (final InputStream in = uploadFile.getInputStream()) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final MinioClient minioClient = createClient(fessConfig);
minioClient.putObject(fessConfig.getStorageBucket(), objectName, in, (long) uploadFile.getFileSize(), null, null,
"application/octet-stream");
minioClient.putObject(fessConfig.getStorageBucket(), objectName, in, new PutObjectOptions((long) uploadFile.getFileSize(), -1));
} catch (final Exception e) {
throw new StorageException("Failed to upload " + objectName, e);
}
@ -207,7 +208,7 @@ public class AdminStorageAction extends FessAdminAction {
map.put("id", encodeId(objectName));
map.put("name", getName(objectName));
map.put("hashCode", item.hashCode());
map.put("size", item.objectSize());
map.put("size", item.size());
map.put("directory", item.isDir());
if (!item.isDir()) {
map.put("lastModified", item.lastModified());
@ -218,8 +219,8 @@ public class AdminStorageAction extends FessAdminAction {
}
}
} catch (final ErrorResponseException e) {
final String code = e.errorResponse().code();
if ("NoSuchBucket".equals(code)) {
final ErrorCode code = e.errorResponse().errorCode();
if (code == ErrorCode.NO_SUCH_BUCKET) {
final MinioClient minioClient = createClient(fessConfig);
try {
minioClient.makeBucket(fessConfig.getStorageBucket());

3
src/main/java/org/codelibs/fess/ds/DataStoreFactory.java
View file

@ -29,7 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@ -89,7 +88,7 @@ public class DataStoreFactory {
final Path xmlPath = fs.getPath("fess_ds++.xml");
try (InputStream is = Files.newInputStream(xmlPath)) {
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
factory.setFeature(org.codelibs.fess.crawler.Constants.FEATURE_SECURE_PROCESSING, true);
factory.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.LOAD_EXTERNAL_DTD_FEATURE, false);
final DocumentBuilder builder = factory.newDocumentBuilder();

3
src/main/java/org/codelibs/fess/helper/PluginHelper.java
View file

@ -35,7 +35,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@ -123,7 +122,7 @@ public class PluginHelper {
final String pluginMetaContent = getRepositoryContent(pluginUrl + "maven-metadata.xml");
try (final InputStream is = new ByteArrayInputStream(pluginMetaContent.getBytes(Constants.UTF_8_CHARSET))) {
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
factory.setFeature(Constants.FEATURE_SECURE_PROCESSING, true);
final DocumentBuilder builder = factory.newDocumentBuilder();
final Document document = builder.parse(is);
final NodeList nodeList = document.getElementsByTagName("version");

3
src/main/java/org/codelibs/fess/util/GsaConfigParser.java
View file

@ -26,7 +26,6 @@ import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.xml.XMLConstants;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@ -91,7 +90,7 @@ public class GsaConfigParser extends DefaultHandler {
public void parse(final InputSource is) {
try {
final SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
factory.setFeature(org.codelibs.fess.crawler.Constants.FEATURE_SECURE_PROCESSING, true);
final SAXParser parser = factory.newSAXParser();
parser.parse(is, this);
} catch (final Exception e) {