Merge pull request #46 from Sudwest-Fryslan/main

Merge from main

.github/workflows/ci-build.yml

@@ -72,31 +72,51 @@ jobs:
     -
       name: Update BuildInfo.properties if there is a version
       run: /bin/bash .github/workflows/writeBuildInfo.sh ${{ needs.analyze-commits.outputs.release-version }}
-    - 
+    -
+      name: Make JAR of configuration
+      run: jar cvf /tmp/WebformulierenVerwerker.jar -C configurations WebformulierenVerwerker
+    -
       name: "🔧 setup node"
       uses: actions/setup-node@v2.1.5
       with:
         node-version: 18.x
     - 
       name: Install dependencies
       run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits
-    - 
+    -
       name: Semantic Release
       run: "semantic-release"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    -
+      name: Pull commit that holds the newly created tag - if applicable
+      run: git pull origin main
+      if: github.ref == 'refs/heads/main'
+    -
+      name: Release on GitHub
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: v${{ needs.analyze-commits.outputs.release-version }}
+        files: /tmp/WebformulierenVerwerker.jar
+      if: >- 
+        (startsWith(github.ref, 'refs/tags/') ||
+            github.ref == 'refs/heads/main') &&
+            github.event_name == 'push' &&
+            needs.analyze-commits.outputs.release-version != '' &&
+            needs.analyze-commits.outputs.release-version != null
 
   publish-docker:
     runs-on: ubuntu-latest
     needs:
     - release
     - analyze-commits
     if: >- 
-      ${{ (startsWith(github.ref, 'refs/tags/') ||
+      (startsWith(github.ref, 'refs/tags/') ||
           github.ref == 'refs/heads/main') &&
-          github.event_name == 'push' }} &&
-          needs.analyze-commits.outputs.release-version != ''
+          github.event_name == 'push' &&
+          needs.analyze-commits.outputs.release-version != '' &&
+          needs.analyze-commits.outputs.release-version != null
     steps:
     -
       name: Show release version
@@ -127,3 +147,4 @@ jobs:
     -
       name: Push Docker image
       run: docker push ${{ vars.DOCKER_IMAGE_REPOSITORY }} --all-tags
+

.github/workflows/makeJar.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# This file is not used in a GitHub action. Use it to
+# make a release jar locally.
+jar cvf WebformulierenVerwerker.jar -C configurations WebformulierenVerwerker

.github/workflows/writeBuildInfo.sh

@@ -2,8 +2,10 @@
 
 if [[ -n $1 ]]; then
   echo "writeBuildInfo.sh - writing version $1"
-  echo "version=$1" > classes/BuildInfo.properties
+  echo "instance.version=$1" > classes/BuildInfo.properties
   echo "versionDate_ddmmyyyy=$(date +%d/%m/%Y)" >> classes/BuildInfo.properties
+  echo "configuration.version=$1" > configurations/WebformulierenVerwerker/BuildInfo.properties
+  echo "configuration.timestamp=$(date +%Y%m%d-%H%M%S)" >> configurations/WebformulierenVerwerker/BuildInfo.properties
 else
   echo "writeBuildInfo.sh - no version to write, leaving BuildInfo.properties unchanged"
 fi

.releaserc

@@ -18,7 +18,7 @@
           {"type": "test", "release": "patch"},
           {"type": "build", "release": "patch"},
           {"type": "ci", "release": "patch"},
-          {"type": "chore", "release": false}
+          {"type": "chore", "release": "patch"}
         ],
         "parserOpts": {
           "noteKeywords": [

CHANGELOG.md

@@ -1,5 +1,243 @@
 [![conventional commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org)
 
+## [6.2.14](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.13...v6.2.14) (2023-06-29)
+
+
+### 🐛 Bug Fixes
+
+* add tcpKeepAlive to psql url ([915ea03](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/915ea03b887365d4f07ade8749b4c4df39a63cb2))
+
+## [6.2.13](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.12...v6.2.13) (2023-06-29)
+
+
+### 🐛 Bug Fixes
+
+* add additional url parameters string to the psql resource ([4a40ebe](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/4a40ebe503db5cfdcbff3e66fc39d00e7fc82839))
+
+## [6.2.12](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.11...v6.2.12) (2023-06-28)
+
+
+### 🐛 Bug Fixes
+
+* restore Ladybug default values for truncating messages ([b0cbe6f](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/b0cbe6ff72ec2d1f95ff0c7c513e42e65eac19c7))
+
+## [6.2.11](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.10...v6.2.11) (2023-06-28)
+
+
+### 🧑‍💻 Code Refactoring
+
+* re-enable wrapper properly ([358d72a](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/358d72a836547e5202e4d9a31c7a6d79491db731))
+
+## [6.2.10](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.9...v6.2.10) (2023-06-28)
+
+
+### 🧑‍💻 Code Refactoring
+
+* deactivate wrapper ([9fc4501](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/9fc4501889fb89080b8f596f8b614da2fd45c164))
+
+## [6.2.9](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.8...v6.2.9) (2023-06-28)
+
+
+### 🐛 Bug Fixes
+
+* adjust incorrect xpathexpression ([f4b38bb](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/f4b38bbd9daa251567d1782804ac3652a072e0cf))
+
+## [6.2.8](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.7...v6.2.8) (2023-06-28)
+
+
+### 🐛 Bug Fixes
+
+* enable XA ([f147d41](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/f147d41924e37e6d46f19354c84a685454c3e02b))
+
+## [6.2.7](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.6...v6.2.7) (2023-06-28)
+
+
+### 🧑‍💻 Code Refactoring
+
+* attempt to send correct message to corsa ([a1a9b61](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/a1a9b61edc9607b6d99ffa23166eb1b700caba46))
+
+## [6.2.6](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.5...v6.2.6) (2023-06-27)
+
+
+### 🧑‍💻 Code Refactoring
+
+* remove sender 6 and 7 validators ([28c8feb](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/28c8febbdcbbd6f7b189e2940ec4d1783574358f))
+
+## [6.2.5](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.4...v6.2.5) (2023-06-27)
+
+
+### 🧑‍💻 Code Refactoring
+
+* add soapNamespace attribute ([8ba301b](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/8ba301b90261c0653c0109798594a7969ea5e72e))
+
+## [6.2.4](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.3...v6.2.4) (2023-06-27)
+
+
+### 🧑‍💻 Code Refactoring
+
+* change vertrouwelijkheid_cache query ([c107277](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/c107277f3cc18204418e9c46c65fec1f9ef8559b))
+
+## [6.2.3](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.2...v6.2.3) (2023-06-27)
+
+
+### 🧑‍💻 Code Refactoring
+
+* change CreateFileVersion XSLT ([0b2d785](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/0b2d785f49b1ac6a5dbb939aca566f7265dc72fc))
+
+## [6.2.2](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.1...v6.2.2) (2023-06-26)
+
+
+### 🤖 Build System
+
+* try to fix it ([a17498b](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/a17498b17b76ddd91b6af0b9fa5de701bd636209))
+
+## [6.2.1](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.2.0...v6.2.1) (2023-06-26)
+
+
+### 🤖 Build System
+
+* try to fix it ([a7b8003](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/a7b80034a834696d290a010c28445c9f1d3a1567))
+
+## [6.2.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.8...v6.2.0) (2023-06-26)
+
+
+### 🍕 Features
+
+* make release for upload in HIP ([87f747a](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/87f747a7b4f3234a8936976e4fea111ef46d0718))
+* make release for upload in hit ([b3ffa29](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/b3ffa2978917a7b4bfc44aca1e8e66981cfdd610))
+
+
+### 🤖 Build System
+
+* try to fix it ([40678a1](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/40678a15d11c7d14431625ea4539861a13820faf))
+
+## [6.1.8](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.7...v6.1.8) (2023-06-26)
+
+
+### 🐛 Bug Fixes
+
+* prevent unique primarykey error ([e17f58e](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/e17f58ec57f6516aa790f110b2c07d4f90bf9ebe))
+
+## [6.1.7](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.6...v6.1.7) (2023-06-26)
+
+
+### 🐛 Bug Fixes
+
+* incorrect obtaining of afzender value ([#40](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/issues/40)) ([b29080d](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/b29080d4825917c08417b5dcc3dda336f02e3952))
+* replace incorrect xpath ([#41](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/issues/41)) ([2f59a42](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/2f59a42cb6cdc4a789975df0a10850f010697b43))
+
+## [6.1.6](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.5...v6.1.6) (2023-06-23)
+
+
+### 🐛 Bug Fixes
+
+* allow CreatePerson to be called ([4f78865](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/4f78865bac6c024d597cd687c2695745e7222c64))
+
+## [6.1.5](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.4...v6.1.5) (2023-06-23)
+
+
+### 🐛 Bug Fixes
+
+* vertrouwelijkheid xpath error ([2757585](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/275758593bc64a9c22b0231b0fcc00cc8224131f))
+
+## [6.1.4](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.3...v6.1.4) (2023-06-23)
+
+
+### 🐛 Bug Fixes
+
+* correct database typing ([71e80e8](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/71e80e86c26d5b8b2a7e676351d9af91d7227d80))
+
+## [6.1.3](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.2...v6.1.3) (2023-06-23)
+
+
+### 🐛 Bug Fixes
+
+* show version in console ([a16f2fa](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/a16f2fa14d59dbccffcd3f32d37c1c82c90d8e1a))
+
+## [6.1.2](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.1...v6.1.2) (2023-06-23)
+
+
+### 🐛 Bug Fixes
+
+* adjust incorrect DATETIME format ([113e141](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/113e1414e8f409f40d67f9074cf940a3a6446298))
+
+## [6.1.1](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.1.0...v6.1.1) (2023-06-23)
+
+
+### 🐛 Bug Fixes
+
+* remove wrong datasource value ([1a6099d](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/1a6099dafcee6f5fffabe93e8525a21117ac91d4))
+
+## [6.1.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.0.2...v6.1.0) (2023-06-23)
+
+
+### 🍕 Features
+
+* implement vertrouwelijkheid cache ([#36](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/issues/36)) ([8abedd8](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/8abedd8f9552981b941b045c83fd9e355f78bb86))
+
+## [6.0.2](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.0.1...v6.0.2) (2023-06-22)
+
+
+### 🐛 Bug Fixes
+
+* CONTRIBUTING.md links ([f028902](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/f028902687f13043de050b30c13e409efd5c7a50))
+* CONTRIBUTING.md links ([f704734](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/f704734f5c1224f911b5bb9f948ae304fb6c2230))
+* CONTRIBUTING.md links ([ad50835](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/ad5083594a4f4dab1a199889e7c90d7bc1a7a8ae))
+
+## [6.0.1](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.0.0...v6.0.1) (2023-06-22)
+
+## [6.0.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v5.0.0...v6.0.0) (2023-06-22)
+
+
+### ⚠ BREAKING CHANGES
+
+* This is what breaks
+
+### chore
+
+* example of a chore that breaks ([9b1bb23](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/9b1bb23b8f145f3cf0394e5f70efc7bc9a6b81b6))
+
+## [5.0.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v4.0.0...v5.0.0) (2023-06-22)
+
+
+### ⚠ BREAKING CHANGES
+
+* This breaks
+
+Additional information about the breaking change
+
+### chore
+
+* the first chore ([12928e4](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/12928e4d896acb740b6eb762d515761067e94544))
+
+## [4.0.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v3.0.0...v4.0.0) (2023-06-22)
+
+
+### ⚠ BREAKING CHANGES
+
+* This is what breaks
+
+chore: We have some other chore
+
+### chore
+
+* testing a realistic breaking change ([23478ec](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/23478ec363e8d3484fa1e6bd2d57966b637ee153))
+
+## [3.0.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v2.2.8...v3.0.0) (2023-06-22)
+
+
+### ⚠ BREAKING CHANGES
+
+* the footer
+
+### chore
+
+* test breaking change ([994b9f3](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/994b9f396a39d89f4affcda8595b69c97d20f66d))
+
+## [2.2.8](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v2.2.7...v2.2.8) (2023-06-22)
+
+## [2.2.7](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v2.2.6...v2.2.7) (2023-06-22)
+
 ## [2.2.6](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v2.2.5...v2.2.6) (2023-06-21)
 
 

CONTRIBUTING.md

@@ -1,17 +1,37 @@
 # CI/CD
 
-Releases are created automatically by GitHub Actions, see [.githuv/ci_build.yml](.githuv/ci_build.yml). Here is a checklist for testing the CI/CD.
+Releases are created automatically by GitHub Actions, see [.github/workflows/ci-build.yml](.github/workflows/ci-build.yml).
+
+Please take care to write meaningful commit messages that result in meaningful entries in [CHANGELOG.md](CHANGELOG.md). Here is an example of the commit message for a breaking change:
+
+    chore: example of a chore that breaks
+
+    BREAKING: This is what breaks
+
+This commit message appears as follows in the release notes:
+
+![changeLogScreenshot.jpg](./changeLogScreenshot.jpg)
+
+A breaking change means that this version is not backwards compatible with the previous release. A breaking change should result in a major release (first number of semantic version is incremented). Please note the following:
+
+* The word BREAKING should appear on the last line of the commit message.
+* The word BREAKING is followed by a `:` and a description. This description appears in the release notes in a bullet that explains what is breaking.
+* The commit type (e.g. chore) is still relevant for breaking changes. This information appears in the release notes in the same way as a non-breaking change.
+* For non-breaking changes, omit the line with BREAKING and make a commit message like the first line shown.
+
+
+Here is a checklist for testing the CI/CD.
 
 * Testing goes best when you make hot fixes on the main branch. Check with the team that you are allowed to do this.
 * Do a commit on main that has a commit message starting with `fix:`. The following should happen:
   * The pipeline succeeds - this checks all authorizations are in place.
   * A commit with a message starting with `chore:` has been added automatically.
   * The extra commit updates files `classes/BuildInfo.properties` and `CHANGELOG.md`.
   * These files should have trustworthy contents - speaks for itself.
-  * On GitHub, there is a tag for the new version that starts with `v`. For example if the new release is `3.2.1` then the tag should be `v3.2.1`. You can get this tag using `git fetch v3.2.1` on the command line. After that, the new commit is in `FETCH_HEAD`, so you can check it out with `git checkout FETCH_HEAD`.
+  * On GitHub, there is a tag for the new version that starts with `v`. For example if the new release is `3.2.1` then the tag should be `v3.2.1`. You can get this tag using `git fetch origin` on the command line.
   * The docker image for the release has been created on http://www.dockerhub.com. The `latest` tag should have been updated - creation time should be the current time. Depending on the type of release, the `3.2.1`, the `3.2` or the `3` tags should be the current date.
   * Check on dockerhub that tags that should not have been updated do not have the current time as creation time.
   * Run the docker image using `docker run -p 8080:8080 wearefrank/webformulierenverwerker:3.2.1`. Check the name of the docker container you started using `docker ps -a`. Login to the docker container using `docker exec -it <container name> bash`. Check that `/opt/frank/resources/BuildInfo.property` contains the right version and the right date.
-* Check a breaking change like above. A commit message has a header, a body and a footer. Have the word `BREAKING` in the footer. This should update the major version.
-* Make a chore commit. Check that no release is made and that no docker image is pushed.
+* Check a breaking change like above. This should update the major version.
+* Do a commit with \[skip ci\] in the commit message. It should not make a release and it should not push a docker image.
 * Make a pull request. Check that no release is made and that no docker image is pushed.

Dockerfile

@@ -12,11 +12,13 @@ RUN javac \
       -verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
 RUN rm -rf /tmp/java
 
+# Copy database connection settings
+COPY --chown=tomcat context.xml /usr/local/tomcat/conf/Catalina/localhost/ROOT.xml
+
 # Copy Frank!
 COPY --chown=tomcat configurations/ /opt/frank/configurations/
 COPY --chown=tomcat tests/ /opt/frank/testtool/
 COPY --chown=tomcat classes/ /opt/frank/resources/
-COPY --chown=tomcat context.xml /usr/local/tomcat/conf/Catalina/localhost/ROOT.xml
 
 # Martijn May 2 2023: Copied from ZaakBrug and edited in a trivial way.
 HEALTHCHECK --interval=15s --timeout=5s --start-period=30s --retries=3 \

classes/BuildInfo.properties

@@ -1,2 +1,2 @@
-version=2.2.6
-versionDate_ddmmyyyy=21/06/2023
+instance.version=6.2.14
+versionDate_ddmmyyyy=29/06/2023