From 46987867e57c4d6eb474ff5570bb0ea8296e9df8 Mon Sep 17 00:00:00 2001 From: Mike Erkemeij Date: Wed, 11 Oct 2023 15:02:25 +0200 Subject: [PATCH] build(dependencies): bump f!f version to 7.9-20231006.001807 --- CONTRIBUTING.md | 2 +- Dockerfile | 6 +- Dockerfile.java8 | 4 +- docker-compose.zaakbrug.dev.yml | 2 +- frank-runner.properties | 2 +- src/main/FrankConfig.xsd | 83 ++++++++++++------- src/main/configurations/FrankConfig.xsd | 83 ++++++++++++------- .../parameters/Parameter.java-orig | 2 +- 8 files changed, 115 insertions(+), 69 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0c9763196..e0cffb37e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ We like to stay up-to-date with the latest version of the Frank!Framework to get the latest features, improvements, bug fixes and security patches. For stability reasons we do not want to use the "latest" tag for this. Instead we periodically(~weekly) do a manual bump to the latest available snapshot build of Frank!Framework at that time. Mainly because we use custom code that needs to be manual checked and updated with changes made in the Frank!Framework. Execute the following steps when bumping the Frank!Framework version: -1. Look up the latest framework snapshot build on [DockerHub - Frank!Framework](https://hub.docker.com/r/wearefrank/frank-framework/tags). The format of the tag should be: `.-.`. For example: 7.9-20230907.223421. +1. Look up the latest framework snapshot build on [DockerHub - Frank!Framework](https://hub.docker.com/r/frankframework/frankframework/tags). The format of the tag should be: `.-.`. For example: 7.9-20230907.223421. 2. Replace the value of `FF_VERSION` in the `Dockerfile` with the new tag. 3. Replace the value of `FF_VERSION` in the `Dockerfile.java8` with the new tag. 4. Replace the default value for `FF_VERSION` under `services.zaakbrug.build.args` in `docker-compose.zaakbrug.dev.yml` with the new tag. NOTE: Watch out to not replace the '-' in front of the tag: ${FF_VERSION:-} diff --git a/Dockerfile b/Dockerfile index c0e262987..3598d8458 100644 --- a/Dockerfile +++ b/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-20230905.223421 +ARG FF_VERSION=7.9-20231006.001807 ARG GID=1000 ARG UID=1000 @@ -28,8 +28,8 @@ RUN set -eux && \ USER tomcat # Needed to created a valid "from" image when using ARG variable -# COPY "--from=docker.io/wearefrank/frank-framework:${FF_VERSION}" doesn't work -FROM docker.io/wearefrank/frank-framework:${FF_VERSION} AS ff-builder +# COPY "--from=docker.io/frankframework/frankframework:${FF_VERSION}" doesn't work +FROM docker.io/frankframework/frankframework:${FF_VERSION} AS ff-builder FROM base AS ff-base # Copy environment configuration diff --git a/Dockerfile.java8 b/Dockerfile.java8 index 6cf4ef154..de4852cdb 100644 --- a/Dockerfile.java8 +++ b/Dockerfile.java8 @@ -1,8 +1,8 @@ # 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-20230905.223421 +ARG FF_VERSION=7.9-20231006.001807 -FROM docker.io/wearefrank/frank-framework:${FF_VERSION} +FROM docker.io/frankframework/frankframework:${FF_VERSION} # TempFix TODO: Move this to the credentialprovider.properties ENV credentialFactory.class=nl.nn.credentialprovider.PropertyFileCredentialFactory diff --git a/docker-compose.zaakbrug.dev.yml b/docker-compose.zaakbrug.dev.yml index e0b51ac42..cb75cc8c4 100644 --- a/docker-compose.zaakbrug.dev.yml +++ b/docker-compose.zaakbrug.dev.yml @@ -17,7 +17,7 @@ services: build: context: . args: - FF_VERSION: ${FF_VERSION:-7.9-20230905.223421} + FF_VERSION: ${FF_VERSION:-7.9-20231006.001807} image: wearefrank/zaakbrug:latest container_name: zaakbrug.dev environment: diff --git a/frank-runner.properties b/frank-runner.properties index 3027a8d48..00de3bfe0 100644 --- a/frank-runner.properties +++ b/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-20230905.223421 \ No newline at end of file +ff.version=7.9-20231006.001807 \ No newline at end of file diff --git a/src/main/FrankConfig.xsd b/src/main/FrankConfig.xsd index 077f89a73..9de11442f 100644 --- a/src/main/FrankConfig.xsd +++ b/src/main/FrankConfig.xsd @@ -1,5 +1,5 @@ - + Container of Adapters that belong together. @@ -171,7 +171,9 @@ - Name of the Receiver as known to the Adapter + Sets the name of the Receiver, as known to the Adapter. + If the listener implements the name interface and <code>getName()</code> + of the listener is empty, the name of this object is given to the listener. @@ -194,7 +196,7 @@ - The number of seconds waited after an unsuccesful poll attempt before another poll attempt is made. Only for polling listeners, not for e.g. ifsa, jms, webservice or javaListeners Default: 10 + The number of seconds waited after an unsuccessful poll attempt, before another poll attempt is made. Only for polling listeners, not for e.g. ifsa, jms, webservice or javaListeners Default: 10 @@ -272,12 +274,12 @@ - If set, the character data in this element is stored under a session key and in the message replaced by a reference to this session key: {sessionkey: + <code>elementToMoveSessionKey</code> + } + If set, the character data in this XML element is stored inside a session key and in the message it is replaced by a reference to this session key: {sessionKey: + <code>elementToMoveSessionKey</code> + } - (Only used when <code>elementToMove</code> is set) Name of the session key under which the character data is stored Default: ref_ + the name of the element + (Only used when <code>elementToMove</code> or <code>elementToMoveChain</code> is set) Name of the session key wherein the character data is stored Default: ref_ + the name of the element @@ -311,7 +313,7 @@ - Number of connection attemps to put the adapter in warning status Default: 5 + Number of connection attempts to put the adapter in warning status Default: 5 @@ -1453,18 +1455,6 @@ - - - Common baseclass for Pulling and Pushing JMS Listeners. - - - - - - - - - Read messages from the IBISSTORE database table previously stored by a @@ -2113,11 +2103,6 @@ - - - - - @@ -4107,7 +4092,7 @@ <li>Define a Receiver with a JavaListener</li> <li>Set the attribute <code>serviceName</code> to <i>yourExternalServiceName</i></li> </ul> - N.B. Please make sure that the IbisServiceDispatcher-1.1.jar is present on the class path of the server. + N.B. Please make sure that the IbisServiceDispatcher-1.4.jar or newer is present on the class path of the server. @@ -8815,7 +8800,7 @@ <li>Define a Receiver with a JavaListener</li> <li>Set the attribute <code>serviceName</code> to <i>yourExternalServiceName</i></li> </ul> - N.B. Please make sure that the IbisServiceDispatcher-1.1.jar is present on the class path of the server. + N.B. Please make sure that the IbisServiceDispatcher-1.4.jar or newer is present on the class path of the server. @@ -12909,7 +12894,7 @@ - Pipe that compares lexicographically two strings. + Pipe that lexicographically compares two strings, that must NOT be empty. @@ -13614,6 +13599,18 @@ + + + Creates a JWT with a shared secret using the HmacSHA256 algorithm. + + + + + + + + + Transforms between ascii and an XML representation. @@ -15201,7 +15198,7 @@ - name of the sessionkey that holds a stream to the certificate of the issuer who signed the crl. the steam is closed after reading + Name of the sessionKey that holds the certificate of the issuer who signed the CRL. @@ -15886,6 +15883,32 @@ + + + + + + + + + Alias for the SharedSecret to be used when signing the JWT (using the HmacSHA256 algorithm) + + + + + Shared secret to be used when signing the JWT (using the HmacSHA256 algorithm) + + + + + JWT expirationTime in seconds, 0 to disable Default: 600 + + + + + + + @@ -17664,7 +17687,7 @@ - message to be send into the pipeline + message to be sent into the pipeline @@ -19928,7 +19951,7 @@ - If set, the character data in this element is stored under a session key and in the message replaced by a reference to this session key: {sessionkey: + <code>elementToMoveSessionKey</code> + } + If set, the character data in this element is stored under a session key and in the message replaced by a reference to this session key: {sessionKey: + <code>elementToMoveSessionKey</code> + } @@ -20005,7 +20028,7 @@ - Ignore namespaces in the input message which are unknown. If the XSD used has elementFormDefault=unqualified, it is necessary to set this to true. Be aware, however, that + Ignore namespaces in the input message which are unknown. If the XSD used has elementFormDefault=unqualified, it is necessary to set this to true. Be aware, however, that this will inhibit the validator to detect validation failures of namespaceless subelements of the SoapBody. Default: true when <code>schema</code> or <code>noNamespaceSchemaLocation</code> is used, false otherwise diff --git a/src/main/configurations/FrankConfig.xsd b/src/main/configurations/FrankConfig.xsd index 077f89a73..9de11442f 100644 --- a/src/main/configurations/FrankConfig.xsd +++ b/src/main/configurations/FrankConfig.xsd @@ -1,5 +1,5 @@ - + Container of Adapters that belong together. @@ -171,7 +171,9 @@ - Name of the Receiver as known to the Adapter + Sets the name of the Receiver, as known to the Adapter. + If the listener implements the name interface and <code>getName()</code> + of the listener is empty, the name of this object is given to the listener. @@ -194,7 +196,7 @@ - The number of seconds waited after an unsuccesful poll attempt before another poll attempt is made. Only for polling listeners, not for e.g. ifsa, jms, webservice or javaListeners Default: 10 + The number of seconds waited after an unsuccessful poll attempt, before another poll attempt is made. Only for polling listeners, not for e.g. ifsa, jms, webservice or javaListeners Default: 10 @@ -272,12 +274,12 @@ - If set, the character data in this element is stored under a session key and in the message replaced by a reference to this session key: {sessionkey: + <code>elementToMoveSessionKey</code> + } + If set, the character data in this XML element is stored inside a session key and in the message it is replaced by a reference to this session key: {sessionKey: + <code>elementToMoveSessionKey</code> + } - (Only used when <code>elementToMove</code> is set) Name of the session key under which the character data is stored Default: ref_ + the name of the element + (Only used when <code>elementToMove</code> or <code>elementToMoveChain</code> is set) Name of the session key wherein the character data is stored Default: ref_ + the name of the element @@ -311,7 +313,7 @@ - Number of connection attemps to put the adapter in warning status Default: 5 + Number of connection attempts to put the adapter in warning status Default: 5 @@ -1453,18 +1455,6 @@ - - - Common baseclass for Pulling and Pushing JMS Listeners. - - - - - - - - - Read messages from the IBISSTORE database table previously stored by a @@ -2113,11 +2103,6 @@ - - - - - @@ -4107,7 +4092,7 @@ <li>Define a Receiver with a JavaListener</li> <li>Set the attribute <code>serviceName</code> to <i>yourExternalServiceName</i></li> </ul> - N.B. Please make sure that the IbisServiceDispatcher-1.1.jar is present on the class path of the server. + N.B. Please make sure that the IbisServiceDispatcher-1.4.jar or newer is present on the class path of the server. @@ -8815,7 +8800,7 @@ <li>Define a Receiver with a JavaListener</li> <li>Set the attribute <code>serviceName</code> to <i>yourExternalServiceName</i></li> </ul> - N.B. Please make sure that the IbisServiceDispatcher-1.1.jar is present on the class path of the server. + N.B. Please make sure that the IbisServiceDispatcher-1.4.jar or newer is present on the class path of the server. @@ -12909,7 +12894,7 @@ - Pipe that compares lexicographically two strings. + Pipe that lexicographically compares two strings, that must NOT be empty. @@ -13614,6 +13599,18 @@ + + + Creates a JWT with a shared secret using the HmacSHA256 algorithm. + + + + + + + + + Transforms between ascii and an XML representation. @@ -15201,7 +15198,7 @@ - name of the sessionkey that holds a stream to the certificate of the issuer who signed the crl. the steam is closed after reading + Name of the sessionKey that holds the certificate of the issuer who signed the CRL. @@ -15886,6 +15883,32 @@ + + + + + + + + + Alias for the SharedSecret to be used when signing the JWT (using the HmacSHA256 algorithm) + + + + + Shared secret to be used when signing the JWT (using the HmacSHA256 algorithm) + + + + + JWT expirationTime in seconds, 0 to disable Default: 600 + + + + + + + @@ -17664,7 +17687,7 @@ - message to be send into the pipeline + message to be sent into the pipeline @@ -19928,7 +19951,7 @@ - If set, the character data in this element is stored under a session key and in the message replaced by a reference to this session key: {sessionkey: + <code>elementToMoveSessionKey</code> + } + If set, the character data in this element is stored under a session key and in the message replaced by a reference to this session key: {sessionKey: + <code>elementToMoveSessionKey</code> + } @@ -20005,7 +20028,7 @@ - Ignore namespaces in the input message which are unknown. If the XSD used has elementFormDefault=unqualified, it is necessary to set this to true. Be aware, however, that + Ignore namespaces in the input message which are unknown. If the XSD used has elementFormDefault=unqualified, it is necessary to set this to true. Be aware, however, that this will inhibit the validator to detect validation failures of namespaceless subelements of the SoapBody. Default: true when <code>schema</code> or <code>noNamespaceSchemaLocation</code> is used, false otherwise diff --git a/src/main/java/nl/nn/adapterframework/parameters/Parameter.java-orig b/src/main/java/nl/nn/adapterframework/parameters/Parameter.java-orig index 5d24eec47..6eeb5ed26 100644 --- a/src/main/java/nl/nn/adapterframework/parameters/Parameter.java-orig +++ b/src/main/java/nl/nn/adapterframework/parameters/Parameter.java-orig @@ -1123,4 +1123,4 @@ public class Parameter implements IConfigurable, IWithParameters { public void setMode(ParameterMode mode) { this.mode = mode; } -} +} \ No newline at end of file