Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Sep 13, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fc118c
build(dependencies): bump f!f version to 8.2.0-20240711.042331
MLenterman Jul 19, 2024
49d4a89
fix: replace restoreElementToMove with replacerPipe due to elementToM…
MLenterman Jul 22, 2024
e5d45c6
build(dependencies): bump f!f version to 8.3.0-20240910.042339
MLenterman Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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

Check warning on line 4 in Dockerfile

View workflow job for this annotation

GitHub Actions / ci / docker-ci / build

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

# Copy dependencies
COPY --chown=tomcat lib/server/* /usr/local/tomcat/lib/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.java8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.zaakbrug.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion frank-runner.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5,106 changes: 3,375 additions & 1,731 deletions src/main/FrankConfig.xsd
View file
Open in desktop

Large diffs are not rendered by default.

5,106 changes: 3,375 additions & 1,731 deletions src/main/configurations/FrankConfig.xsd
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/main/configurations/Translate/Configuration_PutZgwZaakDocument.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 7 additions & 4 deletions src/main/configurations/Translate/Configuration_Zaken_PostZgwZaakInformatieObject.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading