From 87b6fff13d582c8c26caaa16071ea7c29f68de34 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 14 Mar 2025 13:47:38 +0100
Subject: [PATCH 1/3] CB-6291 uses prepare_repo_and_dependencies script from
 dbeaver-common repo

---
 deploy/build-backend.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh
index ba401ce61f8..77e95182e67 100755
--- a/deploy/build-backend.sh
+++ b/deploy/build-backend.sh
@@ -2,6 +2,9 @@
 set -Eeo pipefail
 set +u
 
+script_dir="$(realpath "$(dirname "$0")")"
+repositories_root_dir="$(realpath "$script_dir/../..")"
+
 echo "Clone and build Cloudbeaver"
 
 rm -rf ./drivers
@@ -16,10 +19,9 @@ echo "Pull cloudbeaver platform"
 cd ../..
 
 echo "Pull dbeaver platform"
-[ ! -d dbeaver ] && git clone --depth 1 https://github.com/dbeaver/dbeaver.git
-[ ! -d dbeaver-common ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git
-[ ! -d dbeaver-jdbc-libsql ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-jdbc-libsql.git
-
+[ ! -d "$repositories_root_dir/dbeaver-common" ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git "$repositories_root_dir/dbeaver-common"
+source "$repositories_root_dir/dbeaver-common/scripts/clone.sh"
+prepare_repo_and_dependencies "$repositories_root_dir" cloudbeaver
 
 cd cloudbeaver/deploy
 

From d1805b63d51d6d73d98c17e10bc30493512577d1 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 14 Mar 2025 18:18:52 +0100
Subject: [PATCH 2/3] CB-6291 renames file path to the script

---
 deploy/build-backend.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh
index 77e95182e67..d43a5daa400 100755
--- a/deploy/build-backend.sh
+++ b/deploy/build-backend.sh
@@ -19,8 +19,7 @@ echo "Pull cloudbeaver platform"
 cd ../..
 
 echo "Pull dbeaver platform"
-[ ! -d "$repositories_root_dir/dbeaver-common" ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git "$repositories_root_dir/dbeaver-common"
-source "$repositories_root_dir/dbeaver-common/scripts/clone.sh"
+source "$repositories_root_dir/dbeaver-common/scripts/git_utils.sh"
 prepare_repo_and_dependencies "$repositories_root_dir" cloudbeaver
 
 cd cloudbeaver/deploy

From 2b3b54b18d321370e24a61c11d6812bbb1bc5767 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Tue, 18 Mar 2025 10:39:45 +0100
Subject: [PATCH 3/3] CB-6291 reverts cloning befroe pulling other repos
 dbeaver-common

---
 deploy/build-backend.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh
index d43a5daa400..13186cca7e5 100755
--- a/deploy/build-backend.sh
+++ b/deploy/build-backend.sh
@@ -19,6 +19,7 @@ echo "Pull cloudbeaver platform"
 cd ../..
 
 echo "Pull dbeaver platform"
+[ ! -d "$repositories_root_dir/dbeaver-common" ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git "$repositories_root_dir/dbeaver-common"
 source "$repositories_root_dir/dbeaver-common/scripts/git_utils.sh"
 prepare_repo_and_dependencies "$repositories_root_dir" cloudbeaver
 
@@ -43,4 +44,4 @@ cp -rp  ../config/core/* cloudbeaver/conf
 cp -rp ../config/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
 mv drivers cloudbeaver
 
-echo "End of backend build"
\ No newline at end of file
+echo "End of backend build"