#2788 Update dependencies and configurations to latest versions

codelibs · Jul 29, 2024 · ecba9f3 · ecba9f3
1 parent e55ecd7
commit ecba9f3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/dbflute.xml b/dbflute.xml
@@ -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">

diff --git a/module.xml b/module.xml
@@ -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}" />

diff --git a/plugin.xml b/plugin.xml
@@ -17,35 +17,35 @@
 			<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">
 			<param name="repo.url" value="${maven.release.repo.url}" />
 			<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">
 			<param name="repo.url" value="${maven.release.repo.url}" />
 			<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">
 			<param name="repo.url" value="${maven.release.repo.url}" />
 			<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" />

diff --git a/pom.xml b/pom.xml
@@ -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>

diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java
@@ -29,7 +29,7 @@
 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;

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -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>
 
   <!-- ================================================================================= -->