build(dependencies): bump f!f version to 7.9-20231006.001807

wearefrank · Oct 11, 2023 · 4698786 · 4698786
1 parent 1f8f820
commit 4698786
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 69 deletions.
diff --git 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: `<major>.<minor>-<date>.<build>`. 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: `<major>.<minor>-<date>.<build>`. 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:-<new tag>}

diff --git 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
@@ -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
@@ -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
@@ -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
+ff.version=7.9-20231006.001807
diff --git a/src/main/FrankConfig.xsd b/src/main/FrankConfig.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="7.9-20230905.223421">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="7.9-20231006.001807">
   <xs:element name="Configuration">
     <xs:annotation>
       <xs:documentation>Container of Adapters that belong together.
@@ -171,7 +171,9 @@
     </xs:sequence>
     <xs:attribute name="name" type="xs:string">
       <xs:annotation>
-        <xs:documentation>Name of the Receiver as known to the Adapter</xs:documentation>
+        <xs:documentation>Sets the name of the Receiver, as known to the Adapter.
+ If the listener implements the name interface and &lt;code&gt;getName()&lt;/code&gt;
+ of the listener is empty, the name of this object is given to the listener.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="onError">
@@ -194,7 +196,7 @@
     </xs:attribute>
     <xs:attribute name="pollInterval" type="frankInt">
       <xs:annotation>
-        <xs:documentation>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</xs:documentation>
+        <xs:documentation>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</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="startTimeout" type="frankInt">
@@ -272,12 +274,12 @@
     </xs:attribute>
     <xs:attribute name="elementToMove" type="xs:string">
       <xs:annotation>
-        <xs:documentation>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: + &lt;code&gt;elementToMoveSessionKey&lt;/code&gt; + }</xs:documentation>
+        <xs:documentation>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: + &lt;code&gt;elementToMoveSessionKey&lt;/code&gt; + }</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="elementToMoveSessionKey" type="xs:string">
       <xs:annotation>
-        <xs:documentation>(Only used when &lt;code&gt;elementToMove&lt;/code&gt; is set) Name of the session key under which the character data is stored Default: ref_ + the name of the element</xs:documentation>
+        <xs:documentation>(Only used when &lt;code&gt;elementToMove&lt;/code&gt; or &lt;code&gt;elementToMoveChain&lt;/code&gt; is set) Name of the session key wherein the character data is stored Default: ref_ + the name of the element</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="elementToMoveChain" type="xs:string">
@@ -311,7 +313,7 @@
     </xs:attribute>
     <xs:attribute name="numberOfExceptionsCaughtWithoutMessageBeingReceivedThreshold" type="frankInt">
       <xs:annotation>
-        <xs:documentation>Number of connection attemps to put the adapter in warning status Default: 5</xs:documentation>
+        <xs:documentation>Number of connection attempts to put the adapter in warning status Default: 5</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute ref="transactionTimeout" />
@@ -1453,18 +1455,6 @@
           </xs:complexContent>
         </xs:complexType>
       </xs:element>
-      <xs:element name="JmsListenerBaseListener">
-        <xs:annotation>
-          <xs:documentation>Common baseclass for Pulling and Pushing JMS Listeners.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType>
-          <xs:complexContent>
-            <xs:extension base="JmsListenerBaseType">
-              <xs:attribute name="elementRole" type="xs:string" fixed="listener" use="prohibited" />
-            </xs:extension>
-          </xs:complexContent>
-        </xs:complexType>
-      </xs:element>
       <xs:element name="MessageStoreListener">
         <xs:annotation>
           <xs:documentation>Read messages from the IBISSTORE database table previously stored by a
@@ -2113,11 +2103,6 @@
     <xs:attribute ref="lookupDestination" />
     <xs:attributeGroup ref="JndiBaseDeclaredAttributeGroup" />
   </xs:attributeGroup>
-  <xs:complexType name="JmsListenerBaseType">
-    <xs:group ref="JmsListenerBaseDeclaredChildGroup" />
-    <xs:attributeGroup ref="JmsListenerBaseCumulativeAttributeGroup" />
-    <xs:attribute name="className" type="xs:string" fixed="nl.nn.adapterframework.jms.JmsListenerBase" use="prohibited" />
-  </xs:complexType>
   <xs:group name="JmsListenerBaseDeclaredChildGroup">
     <xs:sequence>
       <xs:element name="Param" minOccurs="0" maxOccurs="unbounded" type="ParamType" />
@@ -4107,7 +4092,7 @@
    &lt;li&gt;Define a Receiver with a JavaListener&lt;/li&gt;
    &lt;li&gt;Set the attribute &lt;code&gt;serviceName&lt;/code&gt; to &lt;i&gt;yourExternalServiceName&lt;/i&gt;&lt;/li&gt;
  &lt;/ul&gt;
- N.B. Please make sure that the IbisServiceDispatcher-1.1.jar is present on the class path of the server.</xs:documentation>
+ N.B. Please make sure that the IbisServiceDispatcher-1.4.jar or newer is present on the class path of the server.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
           <xs:complexContent>
@@ -8815,7 +8800,7 @@
    &lt;li&gt;Define a Receiver with a JavaListener&lt;/li&gt;
    &lt;li&gt;Set the attribute &lt;code&gt;serviceName&lt;/code&gt; to &lt;i&gt;yourExternalServiceName&lt;/i&gt;&lt;/li&gt;
  &lt;/ul&gt;
- N.B. Please make sure that the IbisServiceDispatcher-1.1.jar is present on the class path of the server.</xs:documentation>
+ N.B. Please make sure that the IbisServiceDispatcher-1.4.jar or newer is present on the class path of the server.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
           <xs:complexContent>
@@ -12909,7 +12894,7 @@
       </xs:element>
       <xs:element name="CompareStringPipe">
         <xs:annotation>
-          <xs:documentation>Pipe that compares lexicographically two strings.</xs:documentation>
+          <xs:documentation>Pipe that lexicographically compares two strings, that must NOT be empty.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
           <xs:complexContent>
@@ -13614,6 +13599,18 @@
           </xs:complexContent>
         </xs:complexType>
       </xs:element>
+      <xs:element name="JwtPipe">
+        <xs:annotation>
+          <xs:documentation>Creates a JWT with a shared secret using the HmacSHA256 algorithm.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:complexContent>
+            <xs:extension base="JwtPipeType">
+              <xs:attribute name="elementRole" type="xs:string" fixed="pipe" use="prohibited" />
+            </xs:extension>
+          </xs:complexContent>
+        </xs:complexType>
+      </xs:element>
       <xs:element name="LabelFormatPipe">
         <xs:annotation>
           <xs:documentation>Transforms between ascii and an XML representation.
@@ -15201,7 +15198,7 @@
   <xs:attributeGroup name="CrlPipeDeclaredAttributeGroup">
     <xs:attribute name="issuerSessionKey" type="xs:string">
       <xs:annotation>
-        <xs:documentation>name of the sessionkey that holds a stream to the certificate of the issuer who signed the crl. the steam is closed after reading</xs:documentation>
+        <xs:documentation>Name of the sessionKey that holds the certificate of the issuer who signed the CRL.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
@@ -15886,6 +15883,32 @@
     <xs:attributeGroup ref="XsltPipeDeclaredAttributeGroup" />
     <xs:attributeGroup ref="StreamingPipeCumulativeAttributeGroup" />
   </xs:attributeGroup>
+  <xs:complexType name="JwtPipeType">
+    <xs:group ref="AbstractPipeDeclaredChildGroup" />
+    <xs:attributeGroup ref="JwtPipeCumulativeAttributeGroup" />
+    <xs:attribute name="className" type="xs:string" fixed="nl.nn.adapterframework.pipes.JwtPipe" use="prohibited" />
+  </xs:complexType>
+  <xs:attributeGroup name="JwtPipeDeclaredAttributeGroup">
+    <xs:attribute name="authAlias" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Alias for the SharedSecret to be used when signing the JWT (using the HmacSHA256 algorithm)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sharedSecret" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Shared secret to be used when signing the JWT (using the HmacSHA256 algorithm)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="expirationTime" type="frankInt">
+      <xs:annotation>
+        <xs:documentation>JWT expirationTime in seconds, 0 to disable Default: 600</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="JwtPipeCumulativeAttributeGroup">
+    <xs:attributeGroup ref="JwtPipeDeclaredAttributeGroup" />
+    <xs:attributeGroup ref="FixedForwardPipeCumulativeAttributeGroup" />
+  </xs:attributeGroup>
   <xs:complexType name="LabelFormatType">
     <xs:group ref="AbstractPipeDeclaredChildGroup" />
     <xs:attributeGroup ref="LabelFormatCumulativeAttributeGroup" />
@@ -17664,7 +17687,7 @@
     </xs:attribute>
     <xs:attribute name="message" type="xs:string">
       <xs:annotation>
-        <xs:documentation>message to be send into the pipeline</xs:documentation>
+        <xs:documentation>message to be sent into the pipeline</xs:documentation>
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
@@ -19928,7 +19951,7 @@
   </xs:attribute>
   <xs:attribute name="elementToMove" type="xs:string">
     <xs:annotation>
-      <xs:documentation>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: + &lt;code&gt;elementToMoveSessionKey&lt;/code&gt; + }</xs:documentation>
+      <xs:documentation>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: + &lt;code&gt;elementToMoveSessionKey&lt;/code&gt; + }</xs:documentation>
     </xs:annotation>
   </xs:attribute>
   <xs:attribute name="elementToMoveSessionKey" type="xs:string">
@@ -20005,7 +20028,7 @@
   </xs:attribute>
   <xs:attribute name="ignoreUnknownNamespaces" type="frankBoolean">
     <xs:annotation>
-      <xs:documentation>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 
+      <xs:documentation>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 &lt;code&gt;schema&lt;/code&gt; or &lt;code&gt;noNamespaceSchemaLocation&lt;/code&gt; is used, false otherwise</xs:documentation>
     </xs:annotation>
   </xs:attribute>