From 6155013d56548866c21ddb3e4665da95c8ab64fd Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Mon, 2 Sep 2024 16:48:55 +0300 Subject: [PATCH 1/2] Release cdoc2-java-ref-impl version 1.4.0 --- CHANGELOG.md | 23 +++++++++++++++++++++-- VERSIONING.md | 8 ++++++-- cdoc2-cli/pom.xml | 6 +++--- cdoc2-client/pom.xml | 4 ++-- cdoc2-lib/pom.xml | 8 ++++---- cdoc2-schema/pom.xml | 4 ++-- pom.xml | 2 +- prepare_release.sh | 4 ++++ 8 files changed, 43 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d0da57..1fda5dc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,29 @@ # Changelog -## [1.4.0] Key label formatting (2024-XX-XX) +## [1.4.0] Key label formatting (2024-09-02) + +### Features + +* Support for [machine-readable KeyLabel format](https://open-eid.github.io/CDOC2/1.1/02_protocol_and_cryptography_spec/appendix_d_keylabel/) + - When encrypting, then this formatted key label is enabled by default. Can be disabled by setting `ee.cyber.cdoc2.key-label.machine-readable-format.enabled=false` system property (`-D`) + - When decrypting, then both formatted and unformatted key label field versions are supported. + +### Bug Fixes + +* Fix cdoc2-cli encrypting functionality for SymmetricKey (`--secret` parameter). Bug was introduced with 1.1.0 release + - Rewrote symmetric key (secret) and password handling in cdoc2-cli/cdoc2-lib + - Bumped cdoc2-lib major version to `2.0.0`, as broken classes (`FormattedOptionParts`) were removed and replaced with a new ones (`LabeledPassword` and `LabeledSecret`) + - cdoc2-lib was not broken, when using `EncryptionKeyMaterial#fromSecret(SecretKey,String)` directly (without `FormattedOptionParts`) + - broken example cdoc2 files were removed from `test/testvectors` and replaced with a correct ones +* Fix cdoc2-client ApiClient timeouts (`cdoc2.client.server.*-timeout` were not working) +* Allow loading [pkcs11 (smart-card) test properties](README.md#pkcs11-tests) from file system (previously only classpath was working) ### Internal -* Upgraded Spring 3.2.5 -> 3.3.3 + other third-party dependency updates +* Third-party dependency updates to latest +* Added GitHub workflows for building and releasing +* Resolve issues reported by SonarCloud/SonarQube +* Update client and server certificates used for unit-tests. Add scripts for future updates ## [1.3.0] '/key-capsules' OAS v2.1.0 support (2024-07-02) diff --git a/VERSIONING.md b/VERSIONING.md index 6d3f0842..3e37bce0 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -53,7 +53,7 @@ General release procedure: * `prepare_release.sh` (changes versions to RELEASE versions and runs tests) * Verify changes (`git diff`) * Edit CHANGELOG.md -* `make_release.sh` (`git commit; git push` RELEASE branch and `mvn deploy` RELEASE artifacts) +* `make_release.sh -d` (`git commit; git push` to RELEASE branch) This will change -SNAPSHOT version to release version, update dependencies in all modules to latest non-SNAPSHOT version. Build, test, create release branch, push changes, deploy maven artifacts. @@ -64,8 +64,8 @@ version in parent pom before changing other versions. If everything went well, then * release branch was created with name 'release_v' -* Maven artifacts with release version are in Maven repository * original branch is checked out ('master' usually) +* Nothing is commited to main branch ('master') To finish create squash merge from release branch to main branch ```bash @@ -74,6 +74,10 @@ git commit -m "Squashed commit from $RELEASE_BRANCH" git push $GIT_REMOTE $GIT_BRANCH ``` +or create GitHub PR (recommended) from release branch and merge from GitHub. + +Finish by [publishing](README.md#publishing) deliverables from a release tag. + ### Release cdoc2-java-ref-impl and cdoc2-capsule-server Since test code for cdoc2-capsule-server depends on cdoc2-java-ref-impl `cdoc2-lib` module and diff --git a/cdoc2-cli/pom.xml b/cdoc2-cli/pom.xml index a886b8a8..fd4a99df 100644 --- a/cdoc2-cli/pom.xml +++ b/cdoc2-cli/pom.xml @@ -4,11 +4,11 @@ cdoc2 ee.cyber.cdoc2 - 1.4.0-SNAPSHOT + 1.4.0 cdoc2-cli - 1.5.0-SNAPSHOT + 1.5.0 Command line utility to create/process CDOC2 files @@ -42,7 +42,7 @@ ee.cyber.cdoc2 cdoc2-lib - 2.0.0-SNAPSHOT + 2.0.0 diff --git a/cdoc2-client/pom.xml b/cdoc2-client/pom.xml index f7dcc8d0..5abbc3ae 100644 --- a/cdoc2-client/pom.xml +++ b/cdoc2-client/pom.xml @@ -4,11 +4,11 @@ cdoc2 ee.cyber.cdoc2 - 1.4.0-SNAPSHOT + 1.4.0 cdoc2-client - 1.5.0-SNAPSHOT + 1.5.0 CDOC2 server client generation from openapi specification diff --git a/cdoc2-lib/pom.xml b/cdoc2-lib/pom.xml index 7a19c072..2333e03f 100644 --- a/cdoc2-lib/pom.xml +++ b/cdoc2-lib/pom.xml @@ -3,12 +3,12 @@ cdoc2 ee.cyber.cdoc2 - 1.4.0-SNAPSHOT + 1.4.0 4.0.0 cdoc2-lib - 2.0.0-SNAPSHOT + 2.0.0 CDOC2 creation and processing library @@ -20,13 +20,13 @@ ee.cyber.cdoc2 cdoc2-schema - 1.3.0-SNAPSHOT + 1.3.0 ee.cyber.cdoc2 cdoc2-client - 1.5.0-SNAPSHOT + 1.5.0 diff --git a/cdoc2-schema/pom.xml b/cdoc2-schema/pom.xml index 24e2dd94..5b2e0317 100644 --- a/cdoc2-schema/pom.xml +++ b/cdoc2-schema/pom.xml @@ -3,13 +3,13 @@ 4.0.0 - 1.4.0-SNAPSHOT + 1.4.0 ee.cyber.cdoc2 cdoc2 cdoc2-schema - 1.3.0-SNAPSHOT + 1.3.0 CDOC2 flatbuffer schemas and related functionality diff --git a/pom.xml b/pom.xml index 6dabb73d..c31de393 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - 1.4.0-SNAPSHOT + 1.4.0 ee.cyber.cdoc2 cdoc2 CDOC2 reference implementation diff --git a/prepare_release.sh b/prepare_release.sh index 2f94c45c..0d7797a1 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -34,5 +34,9 @@ done # replace module -SNAPSHOT version with release version (non-SNAPSHOT) mvn versions:set -DremoveSnapshot +mvn versions:set -DremoveSnapshot -pl cdoc2-schema +mvn versions:set -DremoveSnapshot -pl cdoc2-client +mvn versions:set -DremoveSnapshot -pl cdoc2-lib +mvn versions:set -DremoveSnapshot -pl cdoc2-cli # build and install into local maven package repository mvn install From b72df2622c72c2c9b83acda44a8bca18a0442466 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Mon, 2 Sep 2024 17:01:17 +0300 Subject: [PATCH 2/2] Comment out xtrace for make_rele --- make_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make_release.sh b/make_release.sh index f0cf1e6b..f22fa313 100755 --- a/make_release.sh +++ b/make_release.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -o xtrace +#set -o xtrace # git commit # git tag # git push