Merge branch 'release_v1.4.1' into 'master'

Release cdoc2-capsule-server version 1.4.1 See merge request cdoc2/cdoc2-capsule-server!56
open-eid · Sep 19, 2024 · a5f40d3 · a5f40d3
2 parents 7e83672 + 1bf55bc
commit a5f40d3
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.4.1] Bug fixes (2024-09-19)
+
+### Features
+* Publish `cdoc2-server-liquibase` image as part of release to allow easier [database creation](postgres.README.md)
+
+### Bugfixes
+* Update DB clean-up function of expired key-capsules to correctly report number deleted records
+* Fix Junit tests on Windows
+* Another try to fix loading pkcs11 (smart-card) test properties from file system
+
+### Internal
+* Use Java 21 JVM for `cdoc2-*-server` Docker images to support Java 21 virtual threads and improved throughput
+* Update admin-guide.md and add recommendations for running with Docker
+* Base release branch version on `cdoc2-put-server` version not `cdoc2-server` pom version (`make_release.sh` script) 
+
 ## [1.4.0] Maintenance (Spring Boot 3.3.3) (2024-09-03)
 
 ### Bugfixes

diff --git a/admin-guide.md b/admin-guide.md
@@ -120,9 +120,11 @@ To get better throughput it's recommended to give at least 2 CPUs and 1GB of mem
 2 GB of memory per process is even better (some additional throughput gains).
 
 Instead of creating two VMs with 1CPU, create single VM with 2 CPU and run both
-`get-server` and `put-server` on that VM instance (two Java process per VM).
+`get-server` and `put-server` on that VM instance (two Java process per VM sharing 2 CPUs).
 
-For sample setup see [cdoc2-gatling-tests/setup-load-testing](https://github.com/open-eid/cdoc2-gatling-tests/tree/master/setup-load-testing)
+For sample setup see:
+* [cdoc2-gatling-tests/setup-load-testing](https://github.com/open-eid/cdoc2-gatling-tests/tree/master/setup-load-testing) for `docker run` examples
+* [cdoc2-java-ref-impl/test/config/server/docker-compose.yml](https://github.com/open-eid/cdoc2-java-ref-impl/blob/master/test/config/server/docker-compose.yml) for `docker compose` example
 
 ### Get Server
 

diff --git a/get-server/pom.xml b/get-server/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>cdoc2-get-server</artifactId>
 	<groupId>ee.cyber.cdoc2</groupId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.1</version>
 	<packaging>jar</packaging>
 
 	<name>cdoc2-get-server</name>
@@ -167,13 +167,13 @@
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-common-server</artifactId>
-			<version>2.1.0</version>
+			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-server-db</artifactId>
-			<version>2.1.0</version>
+			<version>2.2.0</version>
 		</dependency>
 
 		<dependency>
@@ -185,14 +185,14 @@
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-lib</artifactId>
-			<version>2.0.0</version>
+			<version>2.0.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-common-server</artifactId>
-			<version>2.1.0</version>
+			<version>2.1.1</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
@@ -265,7 +265,7 @@
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-lib</artifactId>
 <!--			for successful pkcs11 tests version must be at least 2.0.1-SNAPSHOT-->
-			<version>2.0.0</version>
+			<version>2.0.1</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>

diff --git a/make_release.sh b/make_release.sh
@@ -9,7 +9,7 @@
 # docker deploy
 
 #export GIT_REMOTE=gitlab.ext
-CDOC2_SERVER_VER=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+CDOC2_SERVER_VER=$(mvn -f put-server help:evaluate -Dexpression=project.version -q -DforceStdout)
 
 GIT_BRANCH=$(git branch --show-current)
 GIT_REMOTE=$(git config --get-regexp "branch\.$GIT_BRANCH\.remote" | sed -e "s/^.* //")

diff --git a/postgres.README.md b/postgres.README.md
@@ -20,14 +20,14 @@ docker run --rm --link cdoc2-psql \
   --env DB_URL=jdbc:postgresql://cdoc2-psql/cdoc2 \
   --env DB_PASSWORD=secret \
   --env DB_USER=postgres \
-  ghcr.io/jann0k/cdoc2-server-liquibase:v1.4.0-liquibase.4-2bf479fd63cdf4c7277fcbef799e3da801cf741f
+  ghcr.io/open-eid/cdoc2-server-liquibase:v1.4.1-rc.1-74cbc827e3cf08c2f4a51711a2072b6344f9aee1
 ```
 
-or use standard liquibase command options:
+or use standard liquibase command:
 
 ```
 docker run --rm --link cdoc2-psql \
-ghcr.io/jann0k/cdoc2-server-liquibase:v1.4.0-liquibase.4-2bf479fd63cdf4c7277fcbef799e3da801cf741f \
+ghcr.io/open-eid/cdoc2-server-liquibase:v1.4.1-rc.1-74cbc827e3cf08c2f4a51711a2072b6344f9aee1 \
   --url jdbc:postgresql://cdoc2-psql/cdoc2 \
   --username=postgres \
   --password=secret \

diff --git a/put-server/pom.xml b/put-server/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>cdoc2-put-server</artifactId>
 	<groupId>ee.cyber.cdoc2</groupId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.1</version>
 	<packaging>jar</packaging>
 
 	<name>cdoc2-put-server</name>
@@ -174,35 +174,35 @@
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-common-server</artifactId>
-			<version>2.1.0</version>
+			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-server-db</artifactId>
-			<version>2.1.0</version>
+			<version>2.2.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-common-server</artifactId>
-			<version>2.1.0</version>
+			<version>2.1.1</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-lib</artifactId>
-			<version>2.0.0</version>
+			<version>2.0.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-lib</artifactId>
 <!--			for successful pkcs11 tests version must be at least 2.0.1-SNAPSHOT-->
-			<version>2.0.0</version>
+			<version>2.0.1</version>
 			<!-- cdoc2-lib src/test compiled classes-->
 			<type>test-jar</type>
 			<scope>test</scope>

diff --git a/server-common/pom.xml b/server-common/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>cdoc2-common-server</artifactId>
-	<version>2.1.0</version>
+	<version>2.1.1</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -68,13 +68,13 @@
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-server-db</artifactId>
-			<version>2.1.0</version>
+			<version>2.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-client</artifactId>
-			<version>1.5.0</version>
+			<version>1.5.1</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/server-db/pom.xml b/server-db/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>cdoc2-server-db</artifactId>
-	<version>2.1.0</version>
+	<version>2.2.0</version>
 	<packaging>jar</packaging>
 
 	<dependencies>