From 97186595a97dea7f44fd09a60e5a9c044e6b8bba Mon Sep 17 00:00:00 2001 From: Olesja Aarma Date: Thu, 27 Feb 2025 14:43:02 +0200 Subject: [PATCH 1/2] update versions and changelog --- CHANGELOG.md | 10 ++++++++++ pom.xml | 2 +- prepare_release.sh | 10 +++++----- server-db/pom.xml | 4 ++-- server-openapi/pom.xml | 4 ++-- shares-server/pom.xml | 10 +++++----- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50302bf..290790d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [0.4.2] Version update (2025-02-27) + +### Maven package versions: +``` +cdoc2-shares-server-pom 0.2.0 +cdoc2-shares-server 0.4.2 +cdoc2-css-db 0.1.2 +cdoc2-css-openapi 0.1.1 +``` + ## [0.4.2-SNAPSHOT] Added index on `key_material_share_nonce` table Features: diff --git a/pom.xml b/pom.xml index 075760a..9426105 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ cdoc2-shares-server-pom ee.cyber.cdoc2 - 0.2.0-SNAPSHOT + 0.2.0 CDOC2 key shares server pom diff --git a/prepare_release.sh b/prepare_release.sh index ffaea62..3fc6777 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -51,17 +51,16 @@ fi #clean up local maven repo -#mvn dependency:purge-local-repository -Dexclude=ee.cyber.cdoc2:cdoc2-lib,ee.cyber -.cdoc2:cdoc2-key-shares-openapi -Dinclude=ee.cyber.cdoc2:shares-server,ee.cyber.cdoc2:cdoc2-server-db -DresolutionFuzziness=artifactId +#mvn dependency:purge-local-repository -Dinclude=ee.cyber.cdoc2:cdoc2-auth-token,ee.cyber.cdoc2:cdoc2-css-openapi,ee.cyber.cdoc2:cdoc2-shares-server,ee.cyber.cdoc2:cdoc2-css-db -DresolutionFuzziness=artifactId #https://github.com/amoschov/maven-dependency-plugin/blob/master/src/site/apt/examples/purging-local-repository.apt.vm # mvn -P 'github,!gitlab.ext' dependency:purge-local-repository -DactTransitively=false -DreResolve=false -DmanualInclude=ee.cyber.cdoc2.openapi:cdoc2-key-shares-openapi -Dverbose=true -# mvn -P 'github,!gitlab.ext' dependency:purge-local-repository -DmanualInclude=ee.cyber.cdoc2.openapi:cdoc2-key-shares-openapi +# mvn -P 'github,!gitlab.ext' dependency:purge-local-repository -DmanualInclude=ee.cyber.cdoc2.openapi:cdoc2-css-openapi # replace module -SNAPSHOT version with release version (non-SNAPSHOT) -mvn -f cdoc2-shared-crypto versions:set -DremoveSnapshot +mvn -f cdoc2-shares-server versions:set -DremoveSnapshot # build and install into local maven package repository -mvn -f cdoc2-shared-crypto install +mvn -f cdoc2-shares-server install # update version for cdoc2-openapi module # versions are not updated for cdoc2-key-shares-openapi OpenApi specifications @@ -74,6 +73,7 @@ mvn versions:set -DremoveSnapshot mvn -f server-openapi versions:set -DremoveSnapshot mvn -f server-db versions:set -DremoveSnapshot +mvn -f shares-server versions:set -DremoveSnapshot # replace ee.cyber.cdoc2:* dependency versions with latest release version (includes packages from local maven repo) mvn versions:use-latest-versions -Dincludes=ee.cyber.cdoc2:* -DexcludeReactor=false -DallowSnapshots=false -DallowDowngrade=true diff --git a/server-db/pom.xml b/server-db/pom.xml index 098224e..f49077f 100644 --- a/server-db/pom.xml +++ b/server-db/pom.xml @@ -5,12 +5,12 @@ ee.cyber.cdoc2 cdoc2-shares-server-pom - 0.2.0-SNAPSHOT + 0.2.0 .. cdoc2-css-db - 0.1.2-SNAPSHOT + 0.1.2 jar diff --git a/server-openapi/pom.xml b/server-openapi/pom.xml index f24a723..b2a1a98 100644 --- a/server-openapi/pom.xml +++ b/server-openapi/pom.xml @@ -7,12 +7,12 @@ ee.cyber.cdoc2 cdoc2-shares-server-pom - 0.2.0-SNAPSHOT + 0.2.0 .. cdoc2-css-openapi - 0.1.1-SNAPSHOT + 0.1.1 CDOC2 shares server stub generation from OpenAPI spec diff --git a/shares-server/pom.xml b/shares-server/pom.xml index 9ad7e84..190666e 100644 --- a/shares-server/pom.xml +++ b/shares-server/pom.xml @@ -11,7 +11,7 @@ ee.cyber.cdoc2 cdoc2-shares-server - 0.4.2-SNAPSHOT + 0.4.2 jar cdoc2-shares-server @@ -61,7 +61,7 @@ ee.cyber.cdoc2 cdoc2-client - SID-1.6.1-SNAPSHOT + 2.0.0 test @@ -187,19 +187,19 @@ ee.cyber.cdoc2 cdoc2-auth-token - 0.3.3-SNAPSHOT + 0.3.3 ee.cyber.cdoc2 cdoc2-css-openapi - 0.1.1-SNAPSHOT + 0.1.1 ee.cyber.cdoc2 cdoc2-css-db - 0.1.2-SNAPSHOT + 0.1.2 From ff8c1985c59c02974a1bd2ef40fadc806fb633d1 Mon Sep 17 00:00:00 2001 From: Olesja Aarma Date: Thu, 27 Feb 2025 15:13:30 +0200 Subject: [PATCH 2/2] extend changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 290790d..2efdc31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog -## [0.4.2] Version update (2025-02-27) +## [0.4.2] Bug fix for config property initialization (2025-02-27) + +### Internal + +* Bug fix for config property initialization inside `KeyShareApiService` and unit tests. ### Maven package versions: ```