From 57d452d7df48d769f98dc65f9b46052743a8b7d8 Mon Sep 17 00:00:00 2001
From: Nikita Akilov <26031301+flambchap@users.noreply.github.com>
Date: Thu, 15 Jan 2026 17:27:55 +0100
Subject: [PATCH 1/2] dbeaver/dbeaver-devops#2370 use mvnw

---
 .github/workflows/backend-build.yml | 2 --
 deploy/build-backend.sh             | 9 ++++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/backend-build.yml b/.github/workflows/backend-build.yml
index 389934cdd34..6419271ebf5 100644
--- a/.github/workflows/backend-build.yml
+++ b/.github/workflows/backend-build.yml
@@ -27,8 +27,6 @@ jobs:
           java-version: "21"
           cache: maven
 
-      - uses: dbeaver/github-actions/install-maven@devel
-
       - name: Run build script
         run: ./build-backend.sh
         shell: bash
diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh
index ba401ce61f8..efae597ae03 100755
--- a/deploy/build-backend.sh
+++ b/deploy/build-backend.sh
@@ -1,9 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 set -Eeo pipefail
 set +u
 
 echo "Clone and build Cloudbeaver"
 
+script_dir="$(realpath "$(dirname "$0")")"
+
 rm -rf ./drivers
 rm -rf ./cloudbeaver
 mkdir ./cloudbeaver
@@ -26,7 +29,7 @@ cd cloudbeaver/deploy
 echo "Build CloudBeaver server"
 
 cd ../server/product/aggregate
-mvn clean verify $MAVEN_COMMON_OPTS -Dheadless-platform
+"$script_dir/../../dbeaver-common/mvnw" clean verify $MAVEN_COMMON_OPTS -Dheadless-platform
 if [[ "$?" -ne 0 ]] ; then
   echo 'Could not perform package'; exit $rc
 fi
@@ -42,4 +45,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"

From 0d92cd1218babf7e1417f309b40bc9cb2e5da1a2 Mon Sep 17 00:00:00 2001
From: Nikita Akilov <26031301+flambchap@users.noreply.github.com>
Date: Thu, 15 Jan 2026 20:16:33 +0100
Subject: [PATCH 2/2] dbeaver/dbeaver-devops#2370 use mvnw

---
 .github/workflows/push-pr-devel.yml | 2 +-
 deploy/build-backend.sh             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push-pr-devel.yml b/.github/workflows/push-pr-devel.yml
index bb58d4b7024..f979ed9c5f7 100644
--- a/.github/workflows/push-pr-devel.yml
+++ b/.github/workflows/push-pr-devel.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   build-server:
-    uses: dbeaver/dbeaver-common/.github/workflows/mvn-package.yml@devel
+    uses: dbeaver/dbeaver-common/.github/workflows/mvn-package.yml@dbeaver/dbeaver-devops#2370-mvnw
     name: Check
     secrets: inherit
     with:
diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh
index efae597ae03..28e1ddfa342 100755
--- a/deploy/build-backend.sh
+++ b/deploy/build-backend.sh
@@ -29,7 +29,7 @@ cd cloudbeaver/deploy
 echo "Build CloudBeaver server"
 
 cd ../server/product/aggregate
-"$script_dir/../../dbeaver-common/mvnw" clean verify $MAVEN_COMMON_OPTS -Dheadless-platform
+"$script_dir/../../dbeaver-common/mvnw" clean verify "${MAVEN_COMMON_OPTS--T1C}" -Dheadless-platform
 if [[ "$?" -ne 0 ]] ; then
   echo 'Could not perform package'; exit $rc
 fi