build(dependencies): bump-f!f-version-to-8.3.0-20240910.042339 (#425)

* build(dependencies): bump f!f version to 8.2.0-20240711.042331 * fix: replace restoreElementToMove with replacerPipe due to elementToMove not working on non-xml anymore * build(dependencies): bump f!f version to 8.3.0-20240910.042339 --------- Co-authored-by: MLenterman <[email protected]> Co-authored-by: MLenterman <[email protected]>
wearefrank · Sep 13, 2024 · 7ca3cb9 · 7ca3cb9
1 parent bbb1f0b
commit 7ca3cb9
Show file tree

Hide file tree

Showing 10 changed files with 6,774 additions and 3,483 deletions.
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=8.1.0-20240404.042328
+ARG FF_VERSION=8.3.0-20240910.042339
 FROM docker.io/frankframework/frankframework:${FF_VERSION} as ff-base
 
 # Copy dependencies

diff --git a/Dockerfile.java8 b/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=8.1.0-20240404.042328
+ARG FF_VERSION=8.3.0-20240910.042339
 
 FROM docker.io/frankframework/frankframework:${FF_VERSION}
 

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:-8.1.0-20240404.042328}
+        FF_VERSION: ${FF_VERSION:-8.3.0-20240910.042339}
     image: wearefrank/zaakbrug:${ZAAKBRUG_VERSION:-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=8.1.0-20240404.042328
+ff.version=8.3.0-20240910.042339
diff --git a/src/main/FrankConfig.xsd b/src/main/FrankConfig.xsd
diff --git a/src/main/configurations/FrankConfig.xsd b/src/main/configurations/FrankConfig.xsd
diff --git a/src/main/configurations/Translate/Configuration_PutZgwZaakDocument.xml b/src/main/configurations/Translate/Configuration_PutZgwZaakDocument.xml
@@ -33,17 +33,17 @@
             <ReplacerPipe
                 name="ReplaceBase64EncodedRefWithInhoudRef"
                 find="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
-                replace="{sessionKey:ref_inhoud}"
+                replace="?{ref_inhoud}"
                 >
                 <Forward name="success" path="SubstituteDocumentDataRef" />
             </ReplacerPipe>
 
-            <EchoPipe
+            <ReplacerPipe
                 name="SubstituteDocumentDataRef"
-                restoreMovedElements="true"
                 >
-                <Forward name="success" path="PutZaakDocument"/>
-            </EchoPipe>
+                <Param name="ref_inhoud" sessionKey="ref_inhoud" />
+                <Forward name="success" path="PutZaakDocument" />
+            </ReplacerPipe>
 
             <SenderPipe name="PutZaakDocument">
 				<HttpSender 

diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
@@ -196,17 +196,17 @@
             <ReplacerPipe
                 name="ReplaceBase64EncodedRefWithInhoudRef"
                 find="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
-                replace="{sessionKey:ref_inhoud}"
+                replace="?{ref_inhoud}"
                 >
                 <Forward name="success" path="SubstituteDocumentDataRef" />
             </ReplacerPipe>
 
-            <EchoPipe
+            <ReplacerPipe
                 name="SubstituteDocumentDataRef"
-                restoreMovedElements="true"
                 >
+                <Param name="ref_inhoud" sessionKey="ref_inhoud" />
                 <Forward name="success" path="EXIT" />
-            </EchoPipe>
+            </ReplacerPipe> 
 
             <!-- ERRORS -->
             <XsltPipe 

diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml
@@ -254,17 +254,17 @@
             <ReplacerPipe
                 name="ReplaceBase64EncodedRefWithInhoudRef"
                 find="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
-                replace="{sessionKey:ref_inhoud}"
+                replace="?{ref_inhoud}"
                 >
                 <Forward name="success" path="SubstituteDocumentDataRef" />
             </ReplacerPipe>
 
-            <EchoPipe
+            <ReplacerPipe
                 name="SubstituteDocumentDataRef"
-                restoreMovedElements="true"
                 >
+                <Param name="ref_inhoud" sessionKey="ref_inhoud" />
                 <Forward name="success" path="EXIT" />
-            </EchoPipe>
+            </ReplacerPipe> 
 
             <SoapWrapperPipe
                 name="WrapCheckOutZaakDocument_Di02Response"

diff --git a/src/main/configurations/Translate/Configuration_Zaken_PostZgwZaakInformatieObject.xml b/src/main/configurations/Translate/Configuration_Zaken_PostZgwZaakInformatieObject.xml
@@ -40,14 +40,17 @@
             <ReplacerPipe
                 name="ReplaceBase64EncodedRefWithInhoudRef"
                 find="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
-                replace="{sessionKey:ref_inhoud}"
+                replace="?{ref_inhoud}"
                 >
                 <Forward name="success" path="SubstituteDocumentDataRef" />
             </ReplacerPipe>
 
-            <EchoPipe name="SubstituteDocumentDataRef" restoreMovedElements="true">
-                <Forward name="success" path="PostZgwEnkelvoudigInformatieObjectSender"/>
-            </EchoPipe>            
+            <ReplacerPipe
+                name="SubstituteDocumentDataRef"
+                >
+                <Param name="ref_inhoud" sessionKey="ref_inhoud" />
+                <Forward name="success" path="PostZgwEnkelvoudigInformatieObjectSender" />
+            </ReplacerPipe>           
 
             <SenderPipe name="PostZgwEnkelvoudigInformatieObjectSender">
                 <HttpSender name="PostZgwEnkelvoudigInformatieObjectHttpSender"