Merge branch 'release_v1.3.0' into 'master'

Release cdoc2-java-ref-impl version 1.3.0

See merge request cdoc2/cdoc2-java-ref-impl!24

Author: jann0k

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.3.0] '/key-capsules' OAS v2.1.0 support (2024-07-02)
+
+### Features
+
+* Support for '/key-capsules' OAS v2.1.0 in cdoc2-client and cdoc2-cli (added `-exp`  option)
+* cli: Improvements to interactive password asking (Don't ask password twice for decrypt).
+  Label is not required, when CDOC2 file contains single password recipient.
+* Add example project to demonstrate usage of cdoc2-java-ref-impl with cdoc4j (convert cdoc -> cdoc2)
+
 ## [1.2.0 ] Repository split and maintenance (2024-05-30)
 
 ### Features

cdoc2-cli/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <artifactId>cdoc2</artifactId>
         <groupId>ee.cyber.cdoc2</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
     </parent>
 
     <artifactId>cdoc2-cli</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0</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>1.3.0-SNAPSHOT</version>
+            <version>1.4.0</version>
         </dependency>
     </dependencies>
 

cdoc2-client/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <artifactId>cdoc2</artifactId>
         <groupId>ee.cyber.cdoc2</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
     </parent>
 
     <artifactId>cdoc2-client</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
     <description>CDOC2 server client generation from openapi specification</description>
 
     <properties>
@@ -19,7 +19,7 @@
 
         <spotbugs-annotations.version>4.7.3</spotbugs-annotations.version>
         <!--info.version from cdoc2-openapi/cdoc2-key-capsules-openapi.yaml -->
-        <cdoc2-key-capsules-openapi.version>2.1.0-SNAPSHOT</cdoc2-key-capsules-openapi.version>
+        <cdoc2-key-capsules-openapi.version>2.1.0</cdoc2-key-capsules-openapi.version>
         <maven.repository.url>gitlab.ext.cyber.ee::::https://gitlab.ext.cyber.ee/api/v4/projects/39/packages/maven</maven.repository.url>
     </properties>
 

cdoc2-lib/pom.xml

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

cdoc2-schema/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <groupId>ee.cyber.cdoc2</groupId>
         <artifactId>cdoc2</artifactId>
     </parent>

make_release.sh

@@ -52,8 +52,9 @@ export RELEASE_TAG="v$CDOC2_VER"
 git checkout -b "$RELEASE_BRANCH" || exit 1
 git commit -a -m "Release cdoc2-java-ref-impl version $CDOC2_VER" || exit 1
 git push "$GIT_REMOTE" -u "$RELEASE_BRANCH" || exit 1
-git tag "$RELEASE_TAG" || exit 1
-git push --tags $GIT_REMOTE "$RELEASE_TAG" || exit 1
+# instead of creating release tag on branch, merge to master and then tag
+#git tag "$RELEASE_TAG" || exit 1
+#git push --tags $GIT_REMOTE "$RELEASE_TAG" || exit 1
 echo "Created release branch $RELEASE_BRANCH"
 
 # to delete branch, run:
@@ -76,8 +77,13 @@ fi
 # switch back to original branch
 git checkout $GIT_BRANCH
 
-echo "Created release branch $RELEASE_BRANCH"
-echo "To merge squash back to your branch. Run"
+echo "Release branch candidate $RELEASE_BRANCH"
+echo
+echo "To finish release and merge $RELEASE_BRANCH, run: "
 echo "git merge --squash $RELEASE_BRANCH"
 echo "git commit -m \"Squashed commit from $RELEASE_BRANCH\""
 echo "git push $GIT_REMOTE $GIT_BRANCH"
+echo "git tag \"$RELEASE_TAG\""
+echo "git push --tags $GIT_REMOTE \"$RELEASE_TAG\""
+echo
+echo "Or create MR on branch $RELEASE_BRANCH and squash merge it to $GIT_BRANCH"

pom.xml

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