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

#2788 Update dependencies and configurations to latest versions

Browse source
This commit is contained in:
Shinsuke Sugaya 2024-07-29 11:54:01 +09:00
parent e55ecd72fe
commit ecba9f365c
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dbflute.xml
View file

@ -2,7 +2,7 @@
<project name="dbflute" basedir=".">
<property name="mydbflute.dir" value="${basedir}/mydbflute" />
<property name="target.dir" value="${basedir}/target" />
<property name="branch.name" value="fess-14.12" />
<property name="branch.name" value="fess-14.15" />
<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
<target name="mydbflute.check">

2
module.xml
View file

@ -6,7 +6,7 @@
<!-- Maven Repository -->
<property name="maven.snapshot.repo.url" value="https://maven.codelibs.org/" />
<property name="maven.release.repo.url" value="https://maven.codelibs.org/" />
<property name="opensearch.version" value="2.12.0" />
<property name="opensearch.version" value="2.15.0" />
<target name="install.modules">
<mkdir dir="${target.dir}" />

16
plugin.xml
View file

@ -17,8 +17,8 @@
<param name="plugin.groupId" value="org/codelibs/opensearch" />
<param name="plugin.name.prefix" value="opensearch-" />
<param name="plugin.name" value="analysis-extension" />
<param name="plugin.version" value="2.12.0" />
<param name="plugin.zip.version" value="2.12.0" />
<param name="plugin.version" value="2.15.0" />
<param name="plugin.zip.version" value="2.15.0" />
</antcall>
<!-- analysis-fess -->
<antcall target="install.plugin">
@ -26,8 +26,8 @@
<param name="plugin.groupId" value="org/codelibs/opensearch" />
<param name="plugin.name.prefix" value="opensearch-" />
<param name="plugin.name" value="analysis-fess" />
<param name="plugin.version" value="2.12.0" />
<param name="plugin.zip.version" value="2.12.0" />
<param name="plugin.version" value="2.15.0" />
<param name="plugin.zip.version" value="2.15.0" />
</antcall>
<!-- configsync -->
<antcall target="install.plugin">
@ -35,8 +35,8 @@
<param name="plugin.groupId" value="org/codelibs/opensearch" />
<param name="plugin.name.prefix" value="opensearch-" />
<param name="plugin.name" value="configsync" />
<param name="plugin.version" value="2.12.0" />
<param name="plugin.zip.version" value="2.12.0" />
<param name="plugin.version" value="2.15.0" />
<param name="plugin.zip.version" value="2.15.0" />
</antcall>
<!-- minhash -->
<antcall target="install.plugin">
@ -44,8 +44,8 @@
<param name="plugin.groupId" value="org/codelibs/opensearch" />
<param name="plugin.name.prefix" value="opensearch-" />
<param name="plugin.name" value="minhash" />
<param name="plugin.version" value="2.12.0" />
<param name="plugin.zip.version" value="2.12.0" />
<param name="plugin.version" value="2.15.0" />
<param name="plugin.zip.version" value="2.15.0" />
</antcall>
<antcall target="remove.jars" />

4
pom.xml
View file

@ -1360,7 +1360,7 @@
<!-- fileupload -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-jakarta</artifactId>
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
@ -1548,7 +1548,7 @@
</dependency>
<dependency>
<groupId>org.dbflute.utflute</groupId>
<artifactId>utflute-lastaflute-jakarta</artifactId>
<artifactId>utflute-lastaflute</artifactId>
<version>${utflute.version}</version>
<scope>test</scope>
</dependency>

2
src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java
View file

@ -29,7 +29,7 @@ import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException;
import org.apache.commons.fileupload2.core.FileUploadException;
import org.apache.commons.fileupload2.jakarta.JakartaServletDiskFileUpload;
import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;

4
src/main/webapp/WEB-INF/web.xml
View file

@ -17,7 +17,7 @@
<web-app 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_6_0.xsd"
web-app_6_0.xsd"
version="6.0">
<!-- ================================================================================= -->
@ -119,7 +119,7 @@
<!-- Servlet Listener -->
<!-- ================ -->
<listener>
<listener-class>org.apache.commons.fileupload2.jakarta.JakartaFileCleaner</listener-class>
<listener-class>org.apache.commons.fileupload2.jakarta.servlet6.JakartaFileCleaner</listener-class>
</listener>
<!-- ================================================================================= -->