Release cdoc2-java-ref-impl version 1.4.1

Author: jann0k

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.4.1] Bug fixes, documentation, tests improvements (2024-09-19)
+
+### Bug Fixes
+* Fix `cdoc2-cli decrypt` crash, when using server scenario
+* Fix Junit tests on Windows
+* Fix pkcs11 (smart-card) test properties loading from filesystem  
+
+### Internal
+* Added [cdoc2-lib Usage Guide](cdoc2-lib/README.md)
+* cdoc2-cli bats tests for server scenario (using docker compose)
+* Update cdoc2-example-app to use `cdoc2-lib:2.0.0`
+
 ## [1.4.0] Key label formatting (2024-09-02)
 
 ### Features

cdoc2-cli/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <artifactId>cdoc2</artifactId>
         <groupId>ee.cyber.cdoc2</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>cdoc2-cli</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <description>Command line utility to create/process CDOC2 files</description>
 
     <properties>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>ee.cyber.cdoc2</groupId>
             <artifactId>cdoc2-lib</artifactId>
-            <version>2.0.1-SNAPSHOT</version>
+            <version>2.0.1</version>
         </dependency>
     </dependencies>
 

cdoc2-client/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <artifactId>cdoc2</artifactId>
         <groupId>ee.cyber.cdoc2</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>cdoc2-client</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <description>CDOC2 server client generation from openapi specification</description>
 
     <properties>

cdoc2-lib/pom.xml

@@ -3,12 +3,12 @@
     <parent>
         <artifactId>cdoc2</artifactId>
         <groupId>ee.cyber.cdoc2</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>cdoc2-lib</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.1</version>
     <description>CDOC2 creation and processing library</description>
 
     <properties>

cdoc2-schema/pom.xml

@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
         <groupId>ee.cyber.cdoc2</groupId>
         <artifactId>cdoc2</artifactId>
     </parent>
 
     <artifactId>cdoc2-schema</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <description>CDOC2 flatbuffer schemas and related functionality </description>
 

inc_versions.sh

@@ -83,7 +83,7 @@ for module in $MODULES; do
         echo "Ignoring $module as it already on SNAPSHOT "
     else
         echo "Creating -SNAPSHOT minor version for $module;"
-        mvn -f "$module" versions:set -DnextSnapshot -DnextSnapshotIndexToIncrement=2
+        mvn -f "$module" versions:set -DnextSnapshot -DnextSnapshotIndexToIncrement=3
     fi
   else
     echo "Dry-run. Not increasing version for $module."

pom.xml

@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <groupId>ee.cyber.cdoc2</groupId>
     <artifactId>cdoc2</artifactId>
     <description>CDOC2 reference implementation </description>

prepare_release.sh

@@ -2,26 +2,16 @@
 
 GIT_BRANCH=$(git branch --show-current)
 
-if [[ "master" != "$GIT_BRANCH" ]]; then
-  echo "Release will be made from branch $GIT_BRANCH."
-  sleep 5
-fi
-
+CHECK_FOR_CLEAN_BRANCH=true
 
-if [[ -n $(git cherry -v) ]]; then
-  echo "Detected unpushed commits. Exit"
-  exit 1
-fi
-
-if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
-  echo "Uncommitted changes detected. Exit"
-  exit 1
-fi
-
-while getopts "v:" opt; do
+while getopts "v:c" opt; do
   case $opt in
+    c)
+      echo "Not checking for clean branch (-c)"
+      CHECK_FOR_CLEAN_BRANCH=false
+      ;;
     v)
-      echo "Changing parent pom version to: $OPTARG" >&2
+      echo "Changing parent pom version to: $OPTARG"
       mvn versions:set -DnewVersion="${OPTARG}" -DupdateMatchingVersions=false
       ;;
     ?)
@@ -31,6 +21,26 @@ while getopts "v:" opt; do
   esac
 done
 
+if [[ "$CHECK_FOR_CLEAN_BRANCH" = true ]]; then
+  echo "Checking for clean git checkout. Disable with '-c'"
+  if [[ "master" != "$GIT_BRANCH" ]]; then
+    echo "Not on 'master' branch. You have 5 seconds to abort."
+    sleep 5
+  fi
+
+  if [[ -n $(git cherry -v) ]]; then
+    echo "Detected unpushed commits. Exit"
+    exit 1
+  fi
+
+  if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
+    echo "Uncommited changes detected. Exit"
+    exit 1
+  fi
+else
+  echo "Not checking for clean branch CHECK_FOR_CLEAN_BRANCH=$CHECK_FOR_CLEAN_BRANCH"
+fi
+
 
 # replace module -SNAPSHOT version with release version (non-SNAPSHOT)
 mvn versions:set -DremoveSnapshot