fess-parent 15.0.0-SNAPSHOT

codelibs · Oct 17, 2024 · e8944da · e8944da
2 parents c26171f + 9f56ad5
commit e8944da
Show file tree

Hide file tree

Showing 296 changed files with 951 additions and 791 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,14 +16,14 @@ on:
 
 jobs:
  build:
- runs-on: ubuntu-latest
+ runs-on: macos-14
  timeout-minutes: 15
  steps:
  - uses: actions/checkout@v4
- - name: Set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v4
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  - uses: actions/cache@v4
  with:

diff --git a/deps.xml b/deps.xml
@@ -24,13 +24,13 @@
  <mkdir dir="${suggest.dir}/lib" />
  <delete dir="${thumbnail.dir}/lib" />
  <mkdir dir="${thumbnail.dir}/lib" />
- <!-- javax.annotation-api -->
+ <!-- annotation-api -->
  <antcall target="install.env.jar">
  <param name="repo.url" value="${maven.release.repo.url}" />
- <param name="jar.groupId" value="javax/annotation" />
- <param name="jar.artifactId" value="javax.annotation-api" />
- <param name="jar.version" value="1.3.2" />
- <param name="file.version" value="1.3.2" />
+ <param name="jar.groupId" value="jakarta/annotation" />
+ <param name="jar.artifactId" value="jakarta.annotation-api" />
+ <param name="jar.version" value="2.1.1" />
+ <param name="file.version" value="2.1.1" />
  </antcall>
  <!-- kopf -->
  <get dest="${target.dir}/kopf.zip">
@@ -43,14 +43,15 @@
  </patternset>
  <cutdirsmapper dirs="2" />
  </unzip>
- <!-- fess-script-groovy -->
+ <!-- 
  <antcall target="install.plugin.jar">
- <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="repo.url" value="${maven.snapshot.repo.url}" />
  <param name="jar.groupId" value="org/codelibs/fess" />
- <param name="jar.artifactId" value="fess-script-groovy" />
- <param name="jar.version" value="14.17.0" />
- <param name="file.version" value="14.17.0" />
+ <param name="jar.artifactId" value="fess-script-ognl" />
+ <param name="jar.version" value="15.0.0" />
+ <param name="file.version" value="15.0.0" />
  </antcall>
+ -->
  </target>
 
  <target name="install.env.jar">

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.17.0" />
+ <property name="opensearch.plugin.version" value="2.17.0" />
 
  <target name="install.modules">
  <mkdir dir="${target.dir}" />
@@ -19,62 +19,62 @@
  <param name="module.groupId" value="org/codelibs/opensearch/module" />
  <param name="module.name.prefix" value="" />
  <param name="module.name" value="analysis-common" />
- <param name="module.version" value="${opensearch.version}" />
- <param name="module.zip.version" value="${opensearch.version}" />
+ <param name="module.version" value="${opensearch.plugin.version}" />
+ <param name="module.zip.version" value="${opensearch.plugin.version}" />
  </antcall>
  <!-- geo -->
  <antcall target="install.module">
  <param name="repo.url" value="${maven.release.repo.url}" />
  <param name="module.groupId" value="org/codelibs/opensearch/module" />
  <param name="module.name.prefix" value="" />
  <param name="module.name" value="geo" />
- <param name="module.version" value="${opensearch.version}" />
- <param name="module.zip.version" value="${opensearch.version}" />
+ <param name="module.version" value="${opensearch.plugin.version}" />
+ <param name="module.zip.version" value="${opensearch.plugin.version}" />
  </antcall>
  <!-- lang-expression -->
  <antcall target="install.module">
  <param name="repo.url" value="${maven.release.repo.url}" />
  <param name="module.groupId" value="org/codelibs/opensearch/module" />
  <param name="module.name.prefix" value="" />
  <param name="module.name" value="lang-expression" />
- <param name="module.version" value="${opensearch.version}" />
- <param name="module.zip.version" value="${opensearch.version}" />
+ <param name="module.version" value="${opensearch.plugin.version}" />
+ <param name="module.zip.version" value="${opensearch.plugin.version}" />
  </antcall>
  <!-- lang-painless -->
  <antcall target="install.module">
  <param name="repo.url" value="${maven.release.repo.url}" />
  <param name="module.groupId" value="org/codelibs/opensearch/module" />
  <param name="module.name.prefix" value="" />
  <param name="module.name" value="lang-painless" />
- <param name="module.version" value="${opensearch.version}" />
- <param name="module.zip.version" value="${opensearch.version}" />
+ <param name="module.version" value="${opensearch.plugin.version}" />
+ <param name="module.zip.version" value="${opensearch.plugin.version}" />
  </antcall>
  <!-- mapper-extras -->
  <antcall target="install.module">
  <param name="repo.url" value="${maven.release.repo.url}" />
  <param name="module.groupId" value="org/codelibs/opensearch/module" />
  <param name="module.name.prefix" value="" />
  <param name="module.name" value="mapper-extras" />
- <param name="module.version" value="${opensearch.version}" />
- <param name="module.zip.version" value="${opensearch.version}" />
+ <param name="module.version" value="${opensearch.plugin.version}" />
+ <param name="module.zip.version" value="${opensearch.plugin.version}" />
  </antcall>
  <!-- reindex -->
  <antcall target="install.module">
  <param name="repo.url" value="${maven.release.repo.url}" />
  <param name="module.groupId" value="org/codelibs/opensearch/module" />
  <param name="module.name.prefix" value="" />
  <param name="module.name" value="reindex" />
- <param name="module.version" value="${opensearch.version}" />
- <param name="module.zip.version" value="${opensearch.version}" />
+ <param name="module.version" value="${opensearch.plugin.version}" />
+ <param name="module.zip.version" value="${opensearch.plugin.version}" />
  </antcall>
  <!-- transport-netty4 -->
  <antcall target="install.module">
  <param name="repo.url" value="${maven.release.repo.url}" />
  <param name="module.groupId" value="org/codelibs/opensearch/module" />
  <param name="module.name.prefix" value="" />
  <param name="module.name" value="transport-netty4" />
- <param name="module.version" value="${opensearch.version}" />
- <param name="module.zip.version" value="${opensearch.version}" />
+ <param name="module.version" value="${opensearch.plugin.version}" />
+ <param name="module.zip.version" value="${opensearch.plugin.version}" />
  </antcall>
 
  <antcall target="remove.jars" />

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <artifactId>fess</artifactId>
- <version>14.18.0-SNAPSHOT</version>
+ <version>15.0.0-SNAPSHOT</version>
  <packaging>war</packaging>
  <name>Fess</name>
  <description>Fess is Full tExt Search System.</description>
@@ -30,7 +30,7 @@
  <parent>
  <groupId>org.codelibs.fess</groupId>
  <artifactId>fess-parent</artifactId>
- <version>14.18.0-SNAPSHOT</version>
+ <version>15.0.0-SNAPSHOT</version>
  <relativePath />
  </parent>
  <properties>
@@ -944,16 +944,31 @@
 
  <!-- J2EE -->
  <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>${jstl.version}</version>
- <!-- contains taglibs.standard -->
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>${jakarta.jstl.api.version}</version>
  <!-- <scope>provided</scope> -->
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+ <!-- contains taglibs.standard -->
+ <version>${jakarta.jstl.version}</version>
  </dependency>
  <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <version>${javax.transaction.api.version}</version>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jakarta.transaction.api.version}</version>
  </dependency>
  <dependency>
  <groupId>org.glassfish.jersey.core</groupId>
@@ -1319,7 +1334,7 @@
  <version>${okhttp.version}</version>
  </dependency>
  <dependency>
- <groupId>com.onelogin</groupId>
+ <groupId>org.codelibs</groupId>
  <artifactId>java-saml</artifactId>
  <version>${java.saml.version}</version>
  <exclusions>
@@ -1349,8 +1364,8 @@
 
  <!-- fileupload -->
  <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
  <version>${commons.fileupload.version}</version>
  </dependency>
 
@@ -1511,6 +1526,13 @@
  <scope>provided</scope>
  </dependency>
 
+ <!-- groovy -->
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+
  <!-- test -->
  <dependency>
  <groupId>junit</groupId>
@@ -1558,11 +1580,5 @@
  </exclusion>
  </exclusions>
  </dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- <scope>test</scope>
- </dependency>
  </dependencies>
 </project>
diff --git a/src/main/java/org/codelibs/fess/FessBoot.java b/src/main/java/org/codelibs/fess/FessBoot.java
@@ -30,6 +30,7 @@
 import org.apache.tomcat.util.http.CookieProcessorBase;
 import org.apache.tomcat.util.http.Rfc6265CookieProcessor;
 import org.apache.tomcat.util.net.SSLHostConfig;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.tomcat.valve.SuppressErrorReportValve;
 import org.codelibs.fess.tomcat.webresources.FessWebResourceRoot;
@@ -171,12 +172,16 @@ public void setupServerConfigIfNeeds(final BootLogger logger, final Tomcat serve
  connector.setProperty("SSLEnabled", "true");
  final SSLHostConfig sslHostConfig = new SSLHostConfig();
  sslHostConfig.setHostName("_default_");
- doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> sslHostConfig.setCertificateKeystoreFile(v));
- doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> sslHostConfig.setCertificateKeystorePassword(v));
- doSetupServerConfig(logger, props, "certificateKeyAlias", v -> sslHostConfig.setCertificateKeyAlias(v));
+ final SSLHostConfigCertificate certificate =
+ new SSLHostConfigCertificate(sslHostConfig, SSLHostConfigCertificate.Type.UNDEFINED);
+ doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> certificate.setCertificateKeystoreFile(v));
+ doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> certificate.setCertificateKeystorePassword(v));
+ doSetupServerConfig(logger, props, "certificateKeyAlias", v -> certificate.setCertificateKeyAlias(v));
  doSetupServerConfig(logger, props, "sslProtocol", v -> sslHostConfig.setSslProtocol(v));
  doSetupServerConfig(logger, props, "enabledProtocols", v -> sslHostConfig.setEnabledProtocols(v.trim().split(",")));
+ sslHostConfig.addCertificate(certificate);
  connector.addSslHostConfig(sslHostConfig);
+
  }
  });
  doSetupServerConfig(logger, props, "sameSiteCookies", value -> {

diff --git a/src/main/java/org/codelibs/fess/api/BaseApiManager.java b/src/main/java/org/codelibs/fess/api/BaseApiManager.java
@@ -20,14 +20,14 @@
 import java.io.PrintWriter;
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.codelibs.core.exception.IORuntimeException;
 import org.codelibs.fess.Constants;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public abstract class BaseApiManager implements WebApiManager {
 
  private static final String API_FORMAT_TYPE = "apiFormatType";

diff --git a/src/main/java/org/codelibs/fess/api/WebApiManager.java b/src/main/java/org/codelibs/fess/api/WebApiManager.java
@@ -17,10 +17,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public interface WebApiManager {
 

diff --git a/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java b/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java
@@ -19,7 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class WebApiManagerFactory {
 

diff --git a/src/main/java/org/codelibs/fess/api/WebApiRequest.java b/src/main/java/org/codelibs/fess/api/WebApiRequest.java
@@ -15,8 +15,8 @@
  */
 package org.codelibs.fess.api;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 public class WebApiRequest extends HttpServletRequestWrapper {
  protected String servletPath;

diff --git a/src/main/java/org/codelibs/fess/api/WebApiResponse.java b/src/main/java/org/codelibs/fess/api/WebApiResponse.java
@@ -18,11 +18,11 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
 import org.apache.commons.io.output.ByteArrayOutputStream;
 
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+
 public class WebApiResponse extends HttpServletResponseWrapper {
 
  public WebApiResponse(final HttpServletResponse response) {

diff --git a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java
@@ -23,14 +23,6 @@
 import java.util.Locale;
 import java.util.UUID;
 
-import javax.annotation.PostConstruct;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.catalina.connector.ClientAbortException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -49,6 +41,14 @@
 import org.lastaflute.web.servlet.request.RequestManager;
 import org.lastaflute.web.servlet.session.SessionManager;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SearchEngineApiManager extends BaseApiManager {
  private static final String ADMIN_SERVER = "/admin/server_";
 

diff --git a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
@@ -32,12 +32,6 @@
 import java.util.UUID;
 import java.util.function.Supplier;
 
-import javax.annotation.PostConstruct;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
@@ -83,6 +77,12 @@
 import org.lastaflute.web.util.LaResponseUtil;
 import org.opensearch.script.Script;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SearchApiManager extends BaseApiManager {
 
  private static final Logger logger = LogManager.getLogger(SearchApiManager.class);