From 995c3ea94925d6b4950242632d10d628b0039a72 Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs Date: Wed, 11 Nov 2026 14:01:31 +0200 Subject: [PATCH 01/10] 71349-bunny-cdn https://redmine.regulaforensics.com/issues/71349 -added bunny cdn upload and repo clean --- client/build.gradle.kts | 74 +++++++++++++--- scripts/maven_clean.sh | 189 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 252 insertions(+), 11 deletions(-) create mode 100644 scripts/maven_clean.sh diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 17c541a..dffd2dc 100755 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -47,33 +47,85 @@ if (project.hasProperty("regulaforensicsMavenUser")) { val regulaforensicsMavenPassword: String by project val regulaforensicsMavenUser: String by project + val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" + + val type = when { + version.toString().contains("beta", ignoreCase = true) -> "Beta" + version.toString().contains("nightly", ignoreCase = true) -> "Nightly" + version.toString().contains("rc", ignoreCase = true) -> "RC" + else -> "" + } + + val finalUrl = uri("sftp://maven-master.regulaforensics.com:22/RegulaDocumentReaderWebClient/$type") publishing { publications { create("client") { artifactId = "webclient" + version = project.version.toString().split('-')[0] + from(components["java"]) } } + repositories { maven { - - val releasesRepoUrl = uri("sftp://maven-master.regulaforensics.com:22/RegulaDocumentReaderWebClient") - val betaRepoUrl = uri("sftp://maven-master.regulaforensics.com:22/RegulaDocumentReaderWebClient/Beta") - val rcRepoUrl = uri("sftp://maven-master.regulaforensics.com:22/RegulaDocumentReaderWebClient/RC") - val nightlyRepoUrl = uri("sftp://maven-master.regulaforensics.com:22/RegulaDocumentReaderWebClient/Nightly") - name = "regulaforensics" - url = if (version.toString().contains("beta")) betaRepoUrl - else if(version.toString().contains("nightly")) nightlyRepoUrl - else if(version.toString().contains("rc")) rcRepoUrl - else releasesRepoUrl - version = version.toString().split('-')[0] + url = finalUrl credentials { username = regulaforensicsMavenUser password = regulaforensicsMavenPassword } } + + maven { + name = "BunnyCDN" + url = + uri("https://storage.bunnycdn.com/maven-production-regulaforensics-sz/RegulaDocumentReaderWebClient/$type/") + + credentials(HttpHeaderCredentials::class) { + name = "AccessKey" + value = bunnyCreds + } + + authentication { + create("header") + } + } + } + } + + tasks.register("runMavenClean") { + val typeParam = (project.findProperty("type") as? String) ?: "" + val regulaforensicsMavenPassword: String by project + val regulaforensicsMavenUser: String by project + val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" + + val scriptDir = project.rootProject.file("scripts") + + doLast { + if (typeParam.isNotEmpty() && + regulaforensicsMavenUser.isNotEmpty() && + regulaforensicsMavenPassword.isNotEmpty() && + bunnyCreds.isNotEmpty() + ) { + println("Conditions met, executing maven_clean.sh") + + project.exec { + workingDir = scriptDir + commandLine( + "bash", + "maven_clean.sh", + typeParam, + regulaforensicsMavenUser, + regulaforensicsMavenPassword, + bunnyCreds + ) + } + + } else { + println("Skipping execution: Some parameters are missing.") + } } } } diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh new file mode 100644 index 0000000..1062414 --- /dev/null +++ b/scripts/maven_clean.sh @@ -0,0 +1,189 @@ +#!/bin/bash + +#1 - type (Release, Temp, Beta, Nightly or Stage) +#2 - package for remove (RegulaDocumentReaderGit/com/regula/documentreader/api or com/regula/face/core/basic) + +TYPE=$1 +LOGIN=$2 +PASSW=$3 +BUNNY_CREDS=$4 +DELETE_OLDER=15 + +# Protect Release builds +if [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "release" ]; then + echo "Release packages cannot be cleaned." + exit 0 +fi + +# --- Server Environments --- + FTP_HOST="maven-master.regulaforensics.com" + FTP_USER="$LOGIN" + FTP_PASS="$PASSW" + FTP_BASE_URL="https://maven-master.regulaforensics.com/RegulaDocumentReaderWebClient/$TYPE" + FTP_PATH="RegulaDocumentReaderWebClient/$TYPE/" + +BUNNY_BASE_URL="https://storage.bunnycdn.com/maven-production-regulaforensics-sz/RegulaDocumentReaderWebClient/${TYPE}" + + +# --- Update XML & Generate Hashes --- +update_metadata_and_hashes() { + local version="$1" + local file="maven-metadata.xml" + local date_str=$(date '+%Y%m%d%H%M%S') + + if [ ! -f "$file" ]; then + echo "Error: $file does not exist for update." + return 1 + fi + + # Update XML metadata + xmlstarlet ed --inplace \ + --delete "/metadata/versioning/versions/version[contains(text(),'$version')]" \ + --var dateValue "'$date_str'" \ + --update '/metadata/versioning/latest' \ + --expr '/metadata/versioning/versions/version[last()]/text()' \ + --update '/metadata/versioning/release' \ + --expr '/metadata/versioning/versions/version[last()]/text()' \ + --update '/metadata/versioning/lastUpdated' \ + --expr '$dateValue' \ + "$file" + + # Generate checksums + md5sum "$file" > "$file.md5" + + openssl dgst -sha1 -out "$file.sha1" "$file" + sed -i 's/SHA1(maven-metadata.xml)= //g' "$file.sha1" + + openssl dgst -sha256 -out "$file.sha256" "$file" + sed -i 's/SHA2-256(maven-metadata.xml)= //g' "$file.sha256" + + openssl dgst -sha512 -out "$file.sha512" "$file" + sed -i 's/SHA2-512(maven-metadata.xml)= //g' "$file.sha512" +} + + + +# FTP: Deletes via lftp and updates FTP maven-metadata +delete_ftp_version() { + local version="$1" + echo " [FTP] Updating metadata and deleting version: $version" + + local temp_work_dir=$(mktemp -d) + cd "$temp_work_dir" || return + + # Download current metadata from FTP + wget -q "$FTP_BASE_URL/$PACKAGE/maven-metadata.xml" -O maven-metadata.xml + + if [ -f maven-metadata.xml ]; then + update_metadata_and_hashes "$version" + + # Delete directory & re-upload updated metadata + lftp -u "$FTP_USER,$FTP_PASS" "$FTP_HOST" << EOF +cd $FTP_PATH +mrm $version/* +rmdir $version +mput maven-metadata.* +bye +EOF + echo " [FTP] Successfully cleaned version $version." + else + echo " [FTP] Warning: Could not download maven-metadata.xml from FTP." + fi + + cd - > /dev/null || return + rm -rf "$temp_work_dir" +} + +# Bunny CDN : Deletes via HTTP REST API and updates Bunny maven-metadata +delete_bunny_version() { + local version="$1" + echo " [Bunny CDN] Updating metadata and deleting version: $version" + + local temp_work_dir=$(mktemp -d) + cd "$temp_work_dir" || return + + # Download current metadata from Bunny CDN + curl -sS -X GET "$BUNNY_BASE_URL/maven-metadata.xml" \ + -H "AccessKey: $BUNNY_CREDS" \ + -o maven-metadata.xml + + if [ -f maven-metadata.xml ] && [ -s maven-metadata.xml ]; then + update_metadata_and_hashes "$version" + + # 1. Delete directory via Bunny API + curl -sS -X DELETE "$BUNNY_BASE_URL/$version/" \ + -H "AccessKey: $BUNNY_CREDS" > /dev/null + + # 2. Upload updated metadata files to Bunny CDN + for ext in "" ".md5" ".sha1" ".sha256" ".sha512"; do + local file_to_upload="maven-metadata.xml${ext}" + if [ -f "$file_to_upload" ]; then + curl -sS -X PUT "$BUNNY_BASE_URL/$file_to_upload" \ + -H "AccessKey: $BUNNY_CREDS" \ + --data-binary "@$file_to_upload" > /dev/null + fi + done + echo " [Bunny CDN] Successfully cleaned version $version." + else + echo " [Bunny CDN] Warning: Could not fetch valid maven-metadata.xml from Bunny CDN." + fi + + cd - > /dev/null || return + rm -rf "$temp_work_dir" +} + + +# --- Search and Trigger Logic --- + +process_ftp_storage() { + echo "=== Processing FTP Storage ===" + lftp -c "open -u '$FTP_USER,$FTP_PASS' '$FTP_HOST'; cd '$FTP_PATH'; ls -l" | while read -r line; do + if [[ $line == d* ]]; then + local date_str=$(echo "$line" | awk '{print $6, $7, $8}') + local version=$(echo "$line" | awk '{print $9}') + + local folder_date=$(date -d "$date_str" +%s 2>/dev/null) + local current_date=$(date +%s) + + if [ -n "$folder_date" ]; then + local age=$(( (current_date - folder_date) / 86400 )) + echo "FTP Version: $version | Age: $age days" + + if [ "$age" -gt "$DELETE_OLDER" ]; then + echo "delete_ftp_version "$version"" + fi + fi + fi + done +} + +process_bunny_storage() { + echo "=== Processing Bunny CDN Storage ===" + + local response=$(curl -sS -X GET "$BUNNY_BASE_URL/" \ + -H "AccessKey: $BUNNY_CREDS" \ + -H "Accept: application/json") + + echo "$response" | jq -r '.[]? | select(.IsDirectory == true) | "\(.ObjectName)\t\(.LastChanged)"' \ + | while IFS=$'\t' read -r version last_changed; do + if [ -n "$version" ]; then + local iso_date=$(echo "$last_changed" | cut -d'T' -f1) + local folder_date=$(date -d "$iso_date" +%s 2>/dev/null) + local current_date=$(date +%s) + + if [ -n "$folder_date" ]; then + local age=$(( (current_date - folder_date) / 86400 )) + echo "Bunny Version: $version | Age: $age days" + + if [ "$age" -gt "$DELETE_OLDER" ]; then + echo "delete_bunny_version "$version"" + fi + fi + fi + done +} + + +# --- Execution --- +process_ftp_storage +process_bunny_storage \ No newline at end of file From 37275566b784f7667403d16b968110c218d6faa3 Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs Date: Wed, 11 Nov 2026 16:13:35 +0200 Subject: [PATCH 02/10] Update build.gradle.kts -println --- client/build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index dffd2dc..dad73ca 100755 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -48,6 +48,7 @@ if (project.hasProperty("regulaforensicsMavenUser")) { val regulaforensicsMavenPassword: String by project val regulaforensicsMavenUser: String by project val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" + println("Bunny: ${bunnyCreds}") val type = when { version.toString().contains("beta", ignoreCase = true) -> "Beta" @@ -101,6 +102,8 @@ if (project.hasProperty("regulaforensicsMavenUser")) { val regulaforensicsMavenUser: String by project val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" + println("Bunny: ${bunnyCreds}") + val scriptDir = project.rootProject.file("scripts") doLast { From c1e2a71e6db3cd82bf983f6f4d29a3da091498fa Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Wed, 11 Nov 2026 16:45:38 +0200 Subject: [PATCH 03/10] Update build.gradle.kts -typo --- client/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index dad73ca..74a43cb 100755 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -97,7 +97,7 @@ if (project.hasProperty("regulaforensicsMavenUser")) { } tasks.register("runMavenClean") { - val typeParam = (project.findProperty("type") as? String) ?: "" + val typeParam = (project.findProperty("Type") as? String) ?: "" val regulaforensicsMavenPassword: String by project val regulaforensicsMavenUser: String by project val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" From 5531aded12eee298cffae1b2fea77304b47c7b69 Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Wed, 11 Nov 2026 16:55:55 +0200 Subject: [PATCH 04/10] Update maven_clean.sh -debug --- scripts/maven_clean.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh index 1062414..3c3e792 100644 --- a/scripts/maven_clean.sh +++ b/scripts/maven_clean.sh @@ -19,6 +19,7 @@ fi FTP_HOST="maven-master.regulaforensics.com" FTP_USER="$LOGIN" FTP_PASS="$PASSW" + echo "LOGIN ${LOGIN}" FTP_BASE_URL="https://maven-master.regulaforensics.com/RegulaDocumentReaderWebClient/$TYPE" FTP_PATH="RegulaDocumentReaderWebClient/$TYPE/" From c488dab11edc731e293624700fe08ec7ce7c90ba Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Thu, 12 Nov 2026 08:59:40 +0200 Subject: [PATCH 05/10] Update maven_clean.sh -proper path --- scripts/maven_clean.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh index 3c3e792..c4dd7b9 100644 --- a/scripts/maven_clean.sh +++ b/scripts/maven_clean.sh @@ -13,13 +13,18 @@ DELETE_OLDER=15 if [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "release" ]; then echo "Release packages cannot be cleaned." exit 0 +elif ["$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "nightly" ]; then + $TYPE="Nightly" +elif ["$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "rc" ]; then + $TYPE="RC" +elif ["$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "beta" ]; then + $TYPE="Beta" fi # --- Server Environments --- FTP_HOST="maven-master.regulaforensics.com" FTP_USER="$LOGIN" FTP_PASS="$PASSW" - echo "LOGIN ${LOGIN}" FTP_BASE_URL="https://maven-master.regulaforensics.com/RegulaDocumentReaderWebClient/$TYPE" FTP_PATH="RegulaDocumentReaderWebClient/$TYPE/" From 8c15358e5d1e43e5b545bb13806c1888cc8e6787 Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Thu, 12 Nov 2026 09:02:55 +0200 Subject: [PATCH 06/10] Update maven_clean.sh -syntax --- scripts/maven_clean.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh index c4dd7b9..16c2fa1 100644 --- a/scripts/maven_clean.sh +++ b/scripts/maven_clean.sh @@ -13,12 +13,12 @@ DELETE_OLDER=15 if [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "release" ]; then echo "Release packages cannot be cleaned." exit 0 -elif ["$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "nightly" ]; then - $TYPE="Nightly" -elif ["$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "rc" ]; then - $TYPE="RC" -elif ["$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "beta" ]; then - $TYPE="Beta" +elif [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "nightly" ]; then + TYPE="Nightly" +elif [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "rc" ]; then + TYPE="RC" +elif [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "beta" ]; then + TYPE="Beta" fi # --- Server Environments --- From 5203ee771e317d2dd097c9d43fd3aa7d0b525d5d Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Thu, 12 Nov 2026 09:10:11 +0200 Subject: [PATCH 07/10] Update maven_clean.sh -package added --- scripts/maven_clean.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh index 16c2fa1..6d4d3dd 100644 --- a/scripts/maven_clean.sh +++ b/scripts/maven_clean.sh @@ -8,6 +8,7 @@ LOGIN=$2 PASSW=$3 BUNNY_CREDS=$4 DELETE_OLDER=15 +PACKAGE="com/regula/documentreader/webclient/" # Protect Release builds if [ "$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')" == "release" ]; then @@ -26,9 +27,9 @@ fi FTP_USER="$LOGIN" FTP_PASS="$PASSW" FTP_BASE_URL="https://maven-master.regulaforensics.com/RegulaDocumentReaderWebClient/$TYPE" - FTP_PATH="RegulaDocumentReaderWebClient/$TYPE/" + FTP_PATH="RegulaDocumentReaderWebClient/$TYPE/$PACKAGE" -BUNNY_BASE_URL="https://storage.bunnycdn.com/maven-production-regulaforensics-sz/RegulaDocumentReaderWebClient/${TYPE}" +BUNNY_BASE_URL="https://storage.bunnycdn.com/maven-production-regulaforensics-sz/RegulaDocumentReaderWebClient/${TYPE}/${PACKAGE}" # --- Update XML & Generate Hashes --- From 81ccc1563812470450bf07918a1588de0f4b5432 Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Thu, 12 Nov 2026 09:55:53 +0200 Subject: [PATCH 08/10] Update build.gradle.kts -debug --- client/build.gradle.kts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 74a43cb..a7ec071 100755 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -48,7 +48,6 @@ if (project.hasProperty("regulaforensicsMavenUser")) { val regulaforensicsMavenPassword: String by project val regulaforensicsMavenUser: String by project val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" - println("Bunny: ${bunnyCreds}") val type = when { version.toString().contains("beta", ignoreCase = true) -> "Beta" @@ -58,7 +57,7 @@ if (project.hasProperty("regulaforensicsMavenUser")) { } val finalUrl = uri("sftp://maven-master.regulaforensics.com:22/RegulaDocumentReaderWebClient/$type") - + println("DEBUG: The AccessKey length is ${bunnyCreds?.length}") publishing { publications { create("client") { @@ -85,8 +84,8 @@ if (project.hasProperty("regulaforensicsMavenUser")) { uri("https://storage.bunnycdn.com/maven-production-regulaforensics-sz/RegulaDocumentReaderWebClient/$type/") credentials(HttpHeaderCredentials::class) { - name = "AccessKey" - value = bunnyCreds + this.name = "AccessKey" + this.value = bunnyCreds } authentication { @@ -101,9 +100,6 @@ if (project.hasProperty("regulaforensicsMavenUser")) { val regulaforensicsMavenPassword: String by project val regulaforensicsMavenUser: String by project val bunnyCreds = (project.findProperty("BunnyCdn") as? String) ?: "" - - println("Bunny: ${bunnyCreds}") - val scriptDir = project.rootProject.file("scripts") doLast { From 8a4fc9a773f6286f8bdb8bc06184702eeb858bc0 Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Thu, 12 Nov 2026 10:29:47 +0200 Subject: [PATCH 09/10] Cleanup -actual deletion --- client/build.gradle.kts | 1 - scripts/maven_clean.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index a7ec071..fe40f26 100755 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -57,7 +57,6 @@ if (project.hasProperty("regulaforensicsMavenUser")) { } val finalUrl = uri("sftp://maven-master.regulaforensics.com:22/RegulaDocumentReaderWebClient/$type") - println("DEBUG: The AccessKey length is ${bunnyCreds?.length}") publishing { publications { create("client") { diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh index 6d4d3dd..c3a287b 100644 --- a/scripts/maven_clean.sh +++ b/scripts/maven_clean.sh @@ -157,7 +157,7 @@ process_ftp_storage() { echo "FTP Version: $version | Age: $age days" if [ "$age" -gt "$DELETE_OLDER" ]; then - echo "delete_ftp_version "$version"" + delete_ftp_version "$version" fi fi fi @@ -183,7 +183,7 @@ process_bunny_storage() { echo "Bunny Version: $version | Age: $age days" if [ "$age" -gt "$DELETE_OLDER" ]; then - echo "delete_bunny_version "$version"" + delete_bunny_version "$version" fi fi fi From 1c109b0ca1e4b07b0f1853bf1a98b4a774bdc8da Mon Sep 17 00:00:00 2001 From: Maris Skvorcovs <19667811+mskvorcovs@users.noreply.github.com> Date: Thu, 12 Nov 2026 11:53:02 +0200 Subject: [PATCH 10/10] Update maven_clean.sh -storage time reduced --- scripts/maven_clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maven_clean.sh b/scripts/maven_clean.sh index c3a287b..aad19fc 100644 --- a/scripts/maven_clean.sh +++ b/scripts/maven_clean.sh @@ -7,7 +7,7 @@ TYPE=$1 LOGIN=$2 PASSW=$3 BUNNY_CREDS=$4 -DELETE_OLDER=15 +DELETE_OLDER=7 PACKAGE="com/regula/documentreader/webclient/" # Protect Release builds