Index: lams_build/lib/xstream/xstream.module.xml =================================================================== diff -u -r5661c79b661c18221c0eb5e32fe7ec54110e5a65 -rab2f7c3e533151dd417f9e365dac97e84864b831 --- lams_build/lib/xstream/xstream.module.xml (.../xstream.module.xml) (revision 5661c79b661c18221c0eb5e32fe7ec54110e5a65) +++ lams_build/lib/xstream/xstream.module.xml (.../xstream.module.xml) (revision ab2f7c3e533151dd417f9e365dac97e84864b831) @@ -28,5 +28,6 @@ + \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rab2f7c3e533151dd417f9e365dac97e84864b831 --- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java (.../FileUtil.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java (.../FileUtil.java) (revision ab2f7c3e533151dd417f9e365dac97e84864b831) @@ -25,12 +25,16 @@ import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.ConversionException; +import com.thoughtworks.xstream.converters.extended.SqlTimestampConverter; import com.thoughtworks.xstream.io.xml.StaxDriver; import com.thoughtworks.xstream.security.AnyTypePermission; +import jakarta.mail.internet.MimeUtility; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; @@ -41,8 +45,6 @@ import org.hibernate.id.Configurable; import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.UUIDGenerator; -import org.hibernate.type.StandardBasicTypes; -import org.hibernate.type.Type; import org.hibernate.type.spi.TypeConfiguration; import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -55,17 +57,21 @@ import xyz.capybara.clamav.ClamavException; import xyz.capybara.clamav.commands.scan.result.ScanResult; -import jakarta.mail.internet.MimeUtility; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; - import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Paths; @@ -751,6 +757,7 @@ // allow parsing all classes conversionXml.addPermission(AnyTypePermission.ANY); conversionXml.ignoreUnknownElements(); + conversionXml.registerConverter(new SqlTimestampConverter()); ConversionException finalException = null; String lastFieldRemoved = ""; ToolContentVersionFilter contentFilter = null;