build(dependencies): bump f!f version to 8.0-20231123.223429 (#203)

Dockerfile

@@ -1,6 +1,6 @@
 # Keep in sync with version in frank-runner.properties. Detailed instructions can be found in CONTRIBUTING.md.
 # Check whether java-orig files have changed in F!F and update custom code (java and java-orig files) accordingly
-ARG FF_VERSION=7.9-20231026.224138
+ARG FF_VERSION=8.0-20231123.223429
 ARG GID=1000
 ARG UID=1000
 
@@ -55,7 +55,7 @@ COPY --chown=tomcat src/main/resources/ /opt/frank/resources/
 COPY --chown=tomcat src/test/testtool/ /opt/frank/testtool/
 
 # Compile custom class
-FROM eclipse-temurin:8-jdk-jammy AS custom-code-builder
+FROM eclipse-temurin:11-jdk-jammy AS custom-code-builder
 
 COPY --from=ff-base /usr/local/tomcat/lib/ /usr/local/tomcat/lib/
 COPY --from=ff-base /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT

Dockerfile.java8

@@ -1,6 +1,6 @@
 # Keep in sync with version in frank-runner.properties. Detailed instructions can be found in CONTRIBUTING.md.
 # Check whether java-orig files have changed in F!F and update custom code (java and java-orig files) accordingly
-ARG FF_VERSION=7.9-20231026.224138
+ARG FF_VERSION=8.0-20231123.223429
 
 FROM docker.io/frankframework/frankframework:${FF_VERSION}
 

docker-compose.zaakbrug.dev.yml

@@ -17,7 +17,7 @@ services:
     build:
       context: .
       args:
-        FF_VERSION: ${FF_VERSION:-7.9-20231026.224138}
+        FF_VERSION: ${FF_VERSION-8.0-20231123.223429}
     image: wearefrank/zaakbrug:latest
     container_name: zaakbrug.dev
     environment:

frank-runner.properties

@@ -1,4 +1,4 @@
 classloader.type=ScanningDirectoryClassLoader
 
 # Keep in sync with version in Dockerfile. Detailed instructions can be found in CONTRIBUTING.md. 
-ff.version=7.9-20231026.224138
+ff.version=8.0-20231123.223429

src/main/java/nl/nn/adapterframework/parameters/Parameter.java

@@ -64,7 +64,7 @@
 import nl.nn.adapterframework.stream.Message;
 import nl.nn.adapterframework.util.AppConstants;
 import nl.nn.adapterframework.util.CredentialFactory;
-import nl.nn.adapterframework.util.DateUtils;
+import nl.nn.adapterframework.util.DateFormatUtils;
 import nl.nn.adapterframework.util.DomBuilderException;
 import nl.nn.adapterframework.util.EnumUtils;
 import nl.nn.adapterframework.util.Misc;
@@ -119,7 +119,7 @@ public class Parameter implements IConfigurable, IWithParameters {
 	public static final String TYPE_DATE_PATTERN="yyyy-MM-dd";
 	public static final String TYPE_TIME_PATTERN="HH:mm:ss";
 	public static final String TYPE_DATETIME_PATTERN="yyyy-MM-dd HH:mm:ss";
-	public static final String TYPE_TIMESTAMP_PATTERN=DateUtils.FORMAT_FULL_GENERIC;
+	public static final String TYPE_TIMESTAMP_PATTERN= DateFormatUtils.FORMAT_FULL_GENERIC;
 
 	public static final String FIXEDUID ="0a1b234c--56de7fa8_9012345678b_-9cd0";
 	public static final String FIXEDHOSTNAME ="MYHOST000012345";
@@ -377,7 +377,7 @@ private List<DefaultValueMethods> getDefaultValueMethodsList() {
 		return defaultValueMethodsList;
 	}
 
-	private Document transformToDocument(Source xmlSource, ParameterValueList pvl) throws ParameterException, TransformerException, IOException {
+	private Document transformToDocument(Source xmlSource, ParameterValueList pvl) throws TransformerException, IOException {
 		TransformerPool pool = getTransformerPool();
 		DOMResult transformResult = new DOMResult();
 		pool.transform(xmlSource,transformResult, pvl);
@@ -752,7 +752,7 @@ private Object getValueAsType(Object request, boolean namespaceAware) throws Par
 					}
 					Message finalRequestMessage = requestMessage;
 					LOG.debug("Parameter [{}] converting result [{}] from XML dateTime to Date", this::getName, () -> finalRequestMessage);
-					result = DateUtils.parseXmlDateTime(requestMessage.asString());
+					result = XmlUtils.parseXmlDateTime(requestMessage.asString());
 					break;
 				}
 				case NUMBER: {
@@ -847,15 +847,15 @@ private Object preFormatDateType(Object rawValue, String formatType, String patt
 			if (rawValue instanceof Date) {
 				return rawValue;
 			}
-			DateFormat df = new SimpleDateFormat(StringUtils.isNotEmpty(patternFormatString) ? patternFormatString : DateUtils.FORMAT_GENERICDATETIME);
+			DateFormat df = new SimpleDateFormat(StringUtils.isNotEmpty(patternFormatString) ? patternFormatString : DateFormatUtils.FORMAT_GENERICDATETIME);
 			try {
 				return df.parse(Message.asString(rawValue));
 			} catch (ParseException | IOException e) {
 				throw new ParameterException("Cannot parse ["+rawValue+"] as date", e);
 			}
 		}
 		if (rawValue instanceof Date) {
-			DateFormat df = new SimpleDateFormat(StringUtils.isNotEmpty(patternFormatString) ? patternFormatString : DateUtils.FORMAT_GENERICDATETIME);
+			DateFormat df = new SimpleDateFormat(StringUtils.isNotEmpty(patternFormatString) ? patternFormatString : DateFormatUtils.FORMAT_GENERICDATETIME);
 			return df.format(rawValue);
 		}
 		try {
@@ -910,7 +910,7 @@ private Object getValueForFormatting(ParameterValueList alreadyResolvedParameter
 					}
 					Object fixedDateTime = session.get(PutSystemDateInSession.FIXEDDATE_STUB4TESTTOOL_KEY);
 					if (fixedDateTime == null) {
-						DateFormat df = new SimpleDateFormat(DateUtils.FORMAT_GENERICDATETIME);
+						DateFormat df = new SimpleDateFormat(DateFormatUtils.FORMAT_GENERICDATETIME);
 						try {
 							fixedDateTime = df.parse(PutSystemDateInSession.FIXEDDATETIME);
 						} catch (ParseException e) {
@@ -1087,11 +1087,6 @@ public void setAuthAlias(String string) {
 	public void setUsername(String string) {
 		username = string;
 	}
-	@Deprecated
-	@ConfigurationWarning("Please use attribute username instead")
-	public void setUserName(String username) {
-		setUsername(username);
-	}
 
 	/** Default password that is used when a <code>pattern</code> containing {password} is specified */
 	public void setPassword(String string) {

src/main/java/nl/nn/adapterframework/parameters/Parameter.java-orig

@@ -58,7 +58,7 @@ import nl.nn.adapterframework.doc.EnumLabel;
 import nl.nn.adapterframework.pipes.PutSystemDateInSession;
 import nl.nn.adapterframework.stream.Message;
 import nl.nn.adapterframework.util.CredentialFactory;
-import nl.nn.adapterframework.util.DateUtils;
+import nl.nn.adapterframework.util.DateFormatUtils;
 import nl.nn.adapterframework.util.DomBuilderException;
 import nl.nn.adapterframework.util.EnumUtils;
 import nl.nn.adapterframework.util.Misc;
@@ -111,7 +111,7 @@ public class Parameter implements IConfigurable, IWithParameters {
 	public static final String TYPE_DATE_PATTERN="yyyy-MM-dd";
 	public static final String TYPE_TIME_PATTERN="HH:mm:ss";
 	public static final String TYPE_DATETIME_PATTERN="yyyy-MM-dd HH:mm:ss";
-	public static final String TYPE_TIMESTAMP_PATTERN=DateUtils.FORMAT_FULL_GENERIC;
+	public static final String TYPE_TIMESTAMP_PATTERN= DateFormatUtils.FORMAT_FULL_GENERIC;
 
 	public static final String FIXEDUID ="0a1b234c--56de7fa8_9012345678b_-9cd0";
 	public static final String FIXEDHOSTNAME ="MYHOST000012345";
@@ -369,7 +369,7 @@ public class Parameter implements IConfigurable, IWithParameters {
 		return defaultValueMethodsList;
 	}
 
-	private Document transformToDocument(Source xmlSource, ParameterValueList pvl) throws ParameterException, TransformerException, IOException {
+	private Document transformToDocument(Source xmlSource, ParameterValueList pvl) throws TransformerException, IOException {
 		TransformerPool pool = getTransformerPool();
 		DOMResult transformResult = new DOMResult();
 		pool.transform(xmlSource,transformResult, pvl);
@@ -700,7 +700,7 @@ public class Parameter implements IConfigurable, IWithParameters {
 					}
 					Message finalRequestMessage = requestMessage;
 					LOG.debug("Parameter [{}] converting result [{}] from XML dateTime to Date", this::getName, () -> finalRequestMessage);
-					result = DateUtils.parseXmlDateTime(requestMessage.asString());
+					result = XmlUtils.parseXmlDateTime(requestMessage.asString());
 					break;
 				}
 				case NUMBER: {
@@ -795,15 +795,15 @@ public class Parameter implements IConfigurable, IWithParameters {
 			if (rawValue instanceof Date) {
 				return rawValue;
 			}
-			DateFormat df = new SimpleDateFormat(StringUtils.isNotEmpty(patternFormatString) ? patternFormatString : DateUtils.FORMAT_GENERICDATETIME);
+			DateFormat df = new SimpleDateFormat(StringUtils.isNotEmpty(patternFormatString) ? patternFormatString : DateFormatUtils.FORMAT_GENERICDATETIME);
 			try {
 				return df.parse(Message.asString(rawValue));
 			} catch (ParseException | IOException e) {
 				throw new ParameterException("Cannot parse ["+rawValue+"] as date", e);
 			}
 		}
 		if (rawValue instanceof Date) {
-			DateFormat df = new SimpleDateFormat(StringUtils.isNotEmpty(patternFormatString) ? patternFormatString : DateUtils.FORMAT_GENERICDATETIME);
+			DateFormat df = new SimpleDateFormat(StringUtils.isNotEmpty(patternFormatString) ? patternFormatString : DateFormatUtils.FORMAT_GENERICDATETIME);
 			return df.format(rawValue);
 		}
 		try {
@@ -858,7 +858,7 @@ public class Parameter implements IConfigurable, IWithParameters {
 					}
 					Object fixedDateTime = session.get(PutSystemDateInSession.FIXEDDATE_STUB4TESTTOOL_KEY);
 					if (fixedDateTime == null) {
-						DateFormat df = new SimpleDateFormat(DateUtils.FORMAT_GENERICDATETIME);
+						DateFormat df = new SimpleDateFormat(DateFormatUtils.FORMAT_GENERICDATETIME);
 						try {
 							fixedDateTime = df.parse(PutSystemDateInSession.FIXEDDATETIME);
 						} catch (ParseException e) {
@@ -1035,11 +1035,6 @@ public class Parameter implements IConfigurable, IWithParameters {
 	public void setUsername(String string) {
 		username = string;
 	}
-	@Deprecated
-	@ConfigurationWarning("Please use attribute username instead")
-	public void setUserName(String username) {
-		setUsername(username);
-	}
 
 	/** Default password that is used when a <code>pattern</code> containing {password} is specified */
 	public void setPassword(String string) {