Merge branch 'feature_tomcat10' into develop

Jenkinsfile

@@ -18,9 +18,7 @@ pipeline {
       agent {
         docker {
           /* using a custom build image with a defined home directory for UID 1000 among other things */
-          image 'nexus.intranda.com:4443/maven:3.9.3-eclipse-temurin-17'
-          registryUrl 'https://nexus.intranda.com:4443'
-          registryCredentialsId 'jenkins-docker'
+          image 'maven:3-eclipse-temurin-21'
           args '-v $HOME/.m2:/var/maven/.m2:z -v $HOME/.config:/var/maven/.config -v $HOME/.sonar:/var/maven/.sonar -u 1000 -ti -e _JAVA_OPTIONS=-Duser.home=/var/maven -e MAVEN_CONFIG=/var/maven/.m2'
         }
       }

code_table_full.xhtml

@@ -71,26 +71,26 @@
 							styleClass="#{not item.active?'font-light':''}" />
 					</td>
 					<td>
-						<x:dataList var="intern"
+						<ui:repeat var="intern"
 							styleClass="#{not item.active?'font-light':''}"
 							rendered="#{item.benutzergruppenSize != 0}"
 							value="#{item.benutzergruppen}" layout="ordered list"
 							rowCountVar="rowCount" rowIndexVar="rowIndex">
 							<h:outputText value="#{intern.titel}" />
 							<h:outputText value=","
 								rendered="#{rowIndex + 1 lt rowCount}" />
-						</x:dataList>
+						</ui:repeat>
 					</td>
 					<td>
-						<x:dataList var="intern"
+						<ui:repeat var="intern"
 							styleClass="#{not item.active?'font-light':''}"
 							rendered="#{true}"
 							value="#{item.projekte}" layout="ordered list"
 							rowCountVar="rowCount" rowIndexVar="rowIndex">
 							<h:outputText value="#{intern.titel}" />
 							<h:outputText value=","
 								rendered="#{rowIndex + 1 lt rowCount}" />
-						</x:dataList>
+						</ui:repeat>
 					</td>
 					<td jsf:rendered="#{true}">
 						<h:outputText value="#{item.institution.shortName}"

pom.xml

@@ -4,7 +4,8 @@
     <parent>
         <groupId>io.goobi.workflow</groupId>
         <artifactId>workflow-base</artifactId>
-        <version>24.13-SNAPSHOT</version>
+        <version>25.02-SNAPSHOT</version>
+
         <relativePath/>
     </parent>
     <artifactId>workflow-core</artifactId>

src/main/java/de/sub/goobi/config/ConfigurationHelper.java

@@ -38,9 +38,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
@@ -54,6 +51,8 @@
 import de.sub.goobi.helper.FacesContextHelper;
 import de.sub.goobi.helper.FilesystemHelper;
 import de.sub.goobi.helper.Helper;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.http.HttpSession;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2

src/main/java/de/sub/goobi/config/GoobiJsfModuleConfig.java

@@ -24,11 +24,11 @@
  */
 package de.sub.goobi.config;
 
-import javax.enterprise.inject.Specializes;
-
 import org.apache.deltaspike.jsf.api.config.JsfModuleConfig;
 import org.apache.deltaspike.jsf.spi.scope.window.ClientWindowConfig;
 
+import jakarta.enterprise.inject.Specializes;
+
 @Specializes
 public class GoobiJsfModuleConfig extends JsfModuleConfig {
 

src/main/java/de/sub/goobi/converter/DocketConverter.java

@@ -1,5 +1,3 @@
-package de.sub.goobi.converter;
-
 /**
  * This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
  * 
@@ -25,16 +23,17 @@
  * library, you may extend this exception to your version of the library, but you are not obliged to do so. If you do not wish to do so, delete this
  * exception statement from your version.
  */
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.convert.FacesConverter;
+package de.sub.goobi.converter;
 
 import org.goobi.beans.Docket;
 
 import de.sub.goobi.helper.exceptions.DAOException;
 import de.sub.goobi.persistence.managers.DocketManager;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.convert.FacesConverter;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
@@ -47,11 +46,8 @@ public Docket getAsObject(FacesContext context, UIComponent component, String va
             return null;
         } else {
             try {
-                return DocketManager.getDocketById(Integer.valueOf(value));
-            } catch (NumberFormatException e) {
-                log.error(e);
-                return null;
-            } catch (DAOException e) {
+                return DocketManager.getDocketById(Integer.parseInt(value));
+            } catch (NumberFormatException | DAOException e) {
                 log.error(e);
                 return null;
             }

src/main/java/de/sub/goobi/converter/ProcessConverter.java

@@ -1,5 +1,3 @@
-package de.sub.goobi.converter;
-
 /**
  * This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
  * 
@@ -25,16 +23,16 @@
  * library, you may extend this exception to your version of the library, but you are not obliged to do so. If you do not wish to do so, delete this
  * exception statement from your version.
  */
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.convert.FacesConverter;
+package de.sub.goobi.converter;
 
 import org.goobi.beans.Process;
 
 import de.sub.goobi.persistence.managers.ProcessManager;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.convert.FacesConverter;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
@@ -47,7 +45,7 @@ public Process getAsObject(FacesContext context, UIComponent component, String v
             return null;
         } else {
             try {
-                return ProcessManager.getProcessById(Integer.valueOf(value));
+                return ProcessManager.getProcessById(Integer.parseInt(value));
             } catch (NumberFormatException e) {
                 log.error(e);
                 return null;

src/main/java/de/sub/goobi/converter/RectangleConverter.java

@@ -26,13 +26,13 @@
 
 import java.awt.geom.Rectangle2D;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
-
 import com.thoughtworks.xstream.converters.ConversionException;
 
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
+
 @FacesConverter("rectangleConverter")
 public class RectangleConverter implements Converter<Rectangle2D> {
 

src/main/java/de/sub/goobi/converter/RectangleCoordinateConverter.java

@@ -26,13 +26,13 @@
 
 import java.awt.geom.Rectangle2D;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
-
 import com.thoughtworks.xstream.converters.ConversionException;
 
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
+
 @FacesConverter("rectangleCoordinateConverter")
 public class RectangleCoordinateConverter implements Converter<Rectangle2D> {
 

src/main/java/de/sub/goobi/converter/StatisticsCalculationUnitConverter.java

@@ -1,5 +1,3 @@
-package de.sub.goobi.converter;
-
 /**
  * This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
  * 
@@ -25,14 +23,16 @@
  * library, you may extend this exception to your version of the library, but you are not obliged to do so. If you do not wish to do so, delete this
  * exception statement from your version.
  */
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.convert.FacesConverter;
+package de.sub.goobi.converter;
 
 import org.goobi.production.flow.statistics.enums.CalculationUnit;
 
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.convert.FacesConverter;
+
 /**
  * StatisticCalculationUnitConverter for statistics CalculationUnits as select-items in jsf-guis
  * 

src/main/java/de/sub/goobi/converter/StatisticsResultOutputConverter.java

@@ -1,5 +1,7 @@
 package de.sub.goobi.converter;
 
+import org.goobi.production.flow.statistics.enums.ResultOutput;
+
 /**
  * This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
  * 
@@ -25,13 +27,11 @@
  * library, you may extend this exception to your version of the library, but you are not obliged to do so. If you do not wish to do so, delete this
  * exception statement from your version.
  */
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.convert.FacesConverter;
-
-import org.goobi.production.flow.statistics.enums.ResultOutput;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.convert.FacesConverter;
 
 /**
  * StatisticOutputConverter for statistics ResultOutput as select-items in jsf-guis

src/main/java/de/sub/goobi/converter/StatisticsTimeUnitConverter.java

@@ -1,5 +1,3 @@
-package de.sub.goobi.converter;
-
 /**
  * This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
  * 
@@ -25,14 +23,16 @@
  * library, you may extend this exception to your version of the library, but you are not obliged to do so. If you do not wish to do so, delete this
  * exception statement from your version.
  */
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.convert.FacesConverter;
+package de.sub.goobi.converter;
 
 import org.goobi.production.flow.statistics.enums.TimeUnit;
 
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.convert.FacesConverter;
+
 /**
  * TimeUnitConverter for statistics TimeUnits as select-items in jsf-guis
  * 

src/main/java/de/sub/goobi/export/download/ExportMets.java

@@ -56,8 +56,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.spi.ImageReaderSpi;
@@ -117,6 +115,8 @@
 import de.sub.goobi.helper.exceptions.UghHelperException;
 import de.sub.goobi.metadaten.MetadatenHelper;
 import de.sub.goobi.metadaten.MetadatenImagesHelper;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import ugh.dl.ContentFile;

src/main/java/de/sub/goobi/export/download/ExportPdf.java

@@ -36,12 +36,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.UriBuilder;
-
 import org.goobi.beans.Process;
 
 import de.sub.goobi.config.ConfigurationHelper;
@@ -54,6 +48,11 @@
 import de.sub.goobi.helper.exceptions.SwapException;
 import de.sub.goobi.helper.exceptions.UghHelperException;
 import de.sub.goobi.helper.tasks.CreatePdfFromServletThread;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriBuilder;
 import lombok.extern.log4j.Log4j2;
 import ugh.exceptions.DocStructHasNoTypeException;
 import ugh.exceptions.MetadataTypeNotAllowedException;

src/main/java/de/sub/goobi/export/download/TiffHeader.java

@@ -28,17 +28,17 @@
 import java.io.IOException;
 import java.sql.SQLException;
 
-import javax.faces.context.FacesContext;
 import javax.naming.NamingException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 
 import org.goobi.beans.Masterpiece;
 import org.goobi.beans.Masterpieceproperty;
 import org.goobi.beans.Process;
 
 import de.sub.goobi.helper.FacesContextHelper;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Die Klasse TiffHeader dient zur Generierung einer Tiffheaderdatei *.conf
@@ -61,14 +61,14 @@ public TiffHeader(Process inProzess) {
             if (myWerkstueck.getEigenschaftenSize() > 0) {
                 for (Masterpieceproperty eig : myWerkstueck.getEigenschaftenList()) {
 
-                    if (eig.getTitel().equals("TifHeaderDocumentname")) {
+                    if ("TifHeaderDocumentname".equals(eig.getTitel())) {
                         this.tifHeaderDocumentname = eig.getWert();
                     }
-                    if (eig.getTitel().equals("TifHeaderImagedescription")) {
+                    if ("TifHeaderImagedescription".equals(eig.getTitel())) {
                         this.tifHeaderImagedescription = eig.getWert();
                     }
 
-                    if (eig.getTitel().equals("Artist")) {
+                    if ("Artist".equals(eig.getTitel())) {
                         this.artist = eig.getWert();
                     }
                 }

src/main/java/de/sub/goobi/forms/AdditionalField.java

@@ -32,10 +32,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.faces.model.SelectItem;
-
 import org.apache.commons.lang3.StringUtils;
 
+import jakarta.faces.model.SelectItem;
 import lombok.Getter;
 import lombok.Setter;