From eb0ca7a41a00ede2cd14fe84a586524a2a8472fd Mon Sep 17 00:00:00 2001
From: Ainur <ainur.iagudin@dbeaver.com>
Date: Fri, 4 Sep 2026 11:12:40 +0200
Subject: [PATCH 1/2] dbeaver/pro#9627 Refactor CloudBeaver modules

---
 deploy/build-backend.sh                                   | 7 ++++---
 deploy/build.bat                                          | 5 +++--
 .../META-INF/MANIFEST.MF                                  | 8 ++++----
 .../OSGI-INF/l10n/bundle.properties                       | 0
 .../OSGI-INF/l10n/bundle_ru.properties                    | 0
 .../build.properties                                      | 0
 .../icons/ldap.svg                                        | 0
 .../plugin.xml                                            | 2 +-
 .../pom.xml                                               | 2 +-
 .../cloudbeaver/service/auth/ldap}/LdapAuthProvider.java  | 6 +++---
 .../io/cloudbeaver/service/auth/ldap}/LdapConstants.java  | 4 ++--
 .../io/cloudbeaver/service/auth/ldap}/LdapSession.java    | 4 ++--
 .../io/cloudbeaver/service/auth/ldap}/LdapSettings.java   | 6 +++---
 .../src/io/cloudbeaver/service/auth/ldap}/LdapUtils.java  | 2 +-
 .../service/auth/ldap}/ssl/LdapSslSetting.java            | 4 ++--
 .../service/auth/ldap}/ssl/LdapSslSocketFactory.java      | 4 ++--
 server/bundles/pom.xml                                    | 2 +-
 server/features/io.cloudbeaver.server.feature/feature.xml | 2 +-
 server/product/aggregate/build-full.cmd                   | 2 +-
 19 files changed, 31 insertions(+), 29 deletions(-)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth => io.cloudbeaver.service.auth.ldap}/META-INF/MANIFEST.MF (63%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth => io.cloudbeaver.service.auth.ldap}/OSGI-INF/l10n/bundle.properties (100%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth => io.cloudbeaver.service.auth.ldap}/OSGI-INF/l10n/bundle_ru.properties (100%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth => io.cloudbeaver.service.auth.ldap}/build.properties (100%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth => io.cloudbeaver.service.auth.ldap}/icons/ldap.svg (100%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth => io.cloudbeaver.service.auth.ldap}/plugin.xml (98%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth => io.cloudbeaver.service.auth.ldap}/pom.xml (90%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth => io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap}/LdapAuthProvider.java (99%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth => io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap}/LdapConstants.java (93%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth => io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap}/LdapSession.java (93%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth => io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap}/LdapSettings.java (96%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth => io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap}/LdapUtils.java (94%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth => io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap}/ssl/LdapSslSetting.java (91%)
 rename server/bundles/{io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth => io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap}/ssl/LdapSslSocketFactory.java (96%)

diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh
index 64f1b42438a..35e21a6aa3c 100755
--- a/deploy/build-backend.sh
+++ b/deploy/build-backend.sh
@@ -19,6 +19,7 @@ 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 datadam-api ] && git clone --depth 1 https://github.com/dbeaver/datadam-api.git
+MVNW="$PWD/dbeaver-common/mvnw"
 
 
 cd cloudbeaver/deploy
@@ -26,14 +27,14 @@ cd cloudbeaver/deploy
 echo "Build CloudBeaver server"
 
 cd ../server/product/aggregate
-mvn clean verify $MAVEN_COMMON_OPTS -Dheadless-platform
+"$MVNW" clean verify $MAVEN_COMMON_OPTS -Dheadless-platform
 if [[ "$?" -ne 0 ]] ; then
   echo 'Could not perform package'; exit $rc
 fi
 cd ../../../deploy
 
 echo "Generate cloudbeaver.conf file"
-mvn -f ../apps/config-generator compile exec:java -Dconfig.output="cloudbeaver/conf/cloudbeaver.conf"
+"$MVNW" -f ../apps/config-generator compile exec:java -Dconfig.output="cloudbeaver/conf/cloudbeaver.conf"
 
 echo "Copy server packages"
 
@@ -45,4 +46,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"
diff --git a/deploy/build.bat b/deploy/build.bat
index 00984f8af78..07585c02d18 100644
--- a/deploy/build.bat
+++ b/deploy/build.bat
@@ -21,13 +21,14 @@ echo Pull dbeaver platform
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
 IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git
 IF NOT EXIST datadam-api git clone https://github.com/dbeaver/datadam-api.git
+SET MVNW=%CD%\dbeaver-common\mvnw.cmd
 
 cd cloudbeaver\deploy
 
 echo Build cloudbeaver server
 
 cd ..\server\product\aggregate
-call mvn clean verify -Dheadless-platform
+call "%MVNW%" clean verify -Dheadless-platform
 
 cd ..\..\..\deploy
 
@@ -44,7 +45,7 @@ copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.js
 move drivers cloudbeaver >NUL
 
 echo Generate cloudbeaver.conf file
-call mvn -f ..\apps\config-generator compile exec:java -Dconfig.output="cloudbeaver\conf\cloudbeaver.conf" || goto :error
+call "%MVNW%" -f ..\apps\config-generator compile exec:java -Dconfig.output="cloudbeaver\conf\cloudbeaver.conf" || goto :error
 
 echo "Build static content"
 
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.auth.ldap/META-INF/MANIFEST.MF
similarity index 63%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/META-INF/MANIFEST.MF
rename to server/bundles/io.cloudbeaver.service.auth.ldap/META-INF/MANIFEST.MF
index 9ac5c489df4..64ebcf8d8a7 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloudbeaver Web Service - LDAP
 Bundle-Vendor: DBeaver Corp
-Bundle-SymbolicName: io.cloudbeaver.service.ldap.auth;singleton:=true
+Bundle-SymbolicName: io.cloudbeaver.service.auth.ldap;singleton:=true
 Bundle-Version: 1.0.36.qualifier
 Bundle-Release-Date: 20260921
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.cloudbeaver.model;visibility:=reexport
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: io.cloudbeaver.service.ldap.auth,
- io.cloudbeaver.service.ldap.auth.ssl
-Automatic-Module-Name: io.cloudbeaver.service.ldap.auth
+Export-Package: io.cloudbeaver.service.auth.ldap,
+ io.cloudbeaver.service.auth.ldap.ssl
+Automatic-Module-Name: io.cloudbeaver.service.auth.ldap
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/OSGI-INF/l10n/bundle.properties b/server/bundles/io.cloudbeaver.service.auth.ldap/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/OSGI-INF/l10n/bundle.properties
rename to server/bundles/io.cloudbeaver.service.auth.ldap/OSGI-INF/l10n/bundle.properties
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/OSGI-INF/l10n/bundle_ru.properties b/server/bundles/io.cloudbeaver.service.auth.ldap/OSGI-INF/l10n/bundle_ru.properties
similarity index 100%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/OSGI-INF/l10n/bundle_ru.properties
rename to server/bundles/io.cloudbeaver.service.auth.ldap/OSGI-INF/l10n/bundle_ru.properties
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/build.properties b/server/bundles/io.cloudbeaver.service.auth.ldap/build.properties
similarity index 100%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/build.properties
rename to server/bundles/io.cloudbeaver.service.auth.ldap/build.properties
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/icons/ldap.svg b/server/bundles/io.cloudbeaver.service.auth.ldap/icons/ldap.svg
similarity index 100%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/icons/ldap.svg
rename to server/bundles/io.cloudbeaver.service.auth.ldap/icons/ldap.svg
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/plugin.xml b/server/bundles/io.cloudbeaver.service.auth.ldap/plugin.xml
similarity index 98%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/plugin.xml
rename to server/bundles/io.cloudbeaver.service.auth.ldap/plugin.xml
index b55aab05db6..2704eae1e0b 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/plugin.xml
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/plugin.xml
@@ -5,7 +5,7 @@
     <extension point="org.jkiss.dbeaver.auth.provider">
         <authProvider id="ldap" label="LDAP" description="LDAP authentication provider"
             configurable="true"
-            class="io.cloudbeaver.service.ldap.auth.LdapAuthProvider"
+            class="io.cloudbeaver.service.auth.ldap.LdapAuthProvider"
             icon="platform:/plugin/org.jkiss.dbeaver.model/icons/idp/ldap.svg"
             caseInsensitive="true">
             <configuration>
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/pom.xml b/server/bundles/io.cloudbeaver.service.auth.ldap/pom.xml
similarity index 90%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/pom.xml
rename to server/bundles/io.cloudbeaver.service.auth.ldap/pom.xml
index c6aeb386026..612be9c7b6d 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/pom.xml
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/pom.xml
@@ -9,7 +9,7 @@
         <version>1.0.0-SNAPSHOT</version>
          <relativePath>../</relativePath>
     </parent>
-    <artifactId>io.cloudbeaver.service.ldap.auth</artifactId>
+    <artifactId>io.cloudbeaver.service.auth.ldap</artifactId>
     <version>1.0.36-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapAuthProvider.java b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapAuthProvider.java
similarity index 99%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapAuthProvider.java
rename to server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapAuthProvider.java
index 165998d619f..1cf969507e5 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapAuthProvider.java
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapAuthProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.service.ldap.auth;
+package io.cloudbeaver.service.auth.ldap;
 
 import io.cloudbeaver.DBWUserIdentity;
 import io.cloudbeaver.auth.SMAuthProviderAssigner;
@@ -24,8 +24,8 @@
 import io.cloudbeaver.auth.provider.local.LocalAuthProviderConstants;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.model.user.WebUser;
-import io.cloudbeaver.service.ldap.auth.ssl.LdapSslSetting;
-import io.cloudbeaver.service.ldap.auth.ssl.LdapSslSocketFactory;
+import io.cloudbeaver.service.auth.ldap.ssl.LdapSslSetting;
+import io.cloudbeaver.service.auth.ldap.ssl.LdapSslSocketFactory;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapConstants.java b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapConstants.java
similarity index 93%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapConstants.java
rename to server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapConstants.java
index 3481c5419df..41fbc17a9d5 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapConstants.java
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapConstants.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.service.ldap.auth;
+package io.cloudbeaver.service.auth.ldap;
 
 public interface LdapConstants {
     String PARAM_HOST = "ldap-host";
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapSession.java b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapSession.java
similarity index 93%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapSession.java
rename to server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapSession.java
index c4326af395e..7b9cb6a05d1 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapSession.java
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapSession.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.service.ldap.auth;
+package io.cloudbeaver.service.auth.ldap;
 
 import io.cloudbeaver.auth.provider.fa.AbstractSessionExternal;
 import org.jkiss.code.NotNull;
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapSettings.java b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapSettings.java
similarity index 96%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapSettings.java
rename to server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapSettings.java
index 46f5a6d0678..c5b5879e5d7 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapSettings.java
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapSettings.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.service.ldap.auth;
+package io.cloudbeaver.service.auth.ldap;
 
-import io.cloudbeaver.service.ldap.auth.ssl.LdapSslSetting;
+import io.cloudbeaver.service.auth.ldap.ssl.LdapSslSetting;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
 import org.jkiss.utils.CommonUtils;
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapUtils.java b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapUtils.java
similarity index 94%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapUtils.java
rename to server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapUtils.java
index fa74031eacd..da25799dcde 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapUtils.java
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/LdapUtils.java
@@ -1,4 +1,4 @@
-package io.cloudbeaver.service.ldap.auth;
+package io.cloudbeaver.service.auth.ldap;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/ssl/LdapSslSetting.java b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/ssl/LdapSslSetting.java
similarity index 91%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/ssl/LdapSslSetting.java
rename to server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/ssl/LdapSslSetting.java
index f0b63f9c968..9101c66844a 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/ssl/LdapSslSetting.java
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/ssl/LdapSslSetting.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.service.ldap.auth.ssl;
+package io.cloudbeaver.service.auth.ldap.ssl;
 
 import org.jkiss.code.Nullable;
 
diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/ssl/LdapSslSocketFactory.java b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/ssl/LdapSslSocketFactory.java
similarity index 96%
rename from server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/ssl/LdapSslSocketFactory.java
rename to server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/ssl/LdapSslSocketFactory.java
index 9cc0d017326..5155b889d7a 100644
--- a/server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/ssl/LdapSslSocketFactory.java
+++ b/server/bundles/io.cloudbeaver.service.auth.ldap/src/io/cloudbeaver/service/auth/ldap/ssl/LdapSslSocketFactory.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.service.ldap.auth.ssl;
+package io.cloudbeaver.service.auth.ldap.ssl;
 
 import org.jkiss.code.NotNull;
 
diff --git a/server/bundles/pom.xml b/server/bundles/pom.xml
index 6b25ef6d7f3..a506fae5b1a 100644
--- a/server/bundles/pom.xml
+++ b/server/bundles/pom.xml
@@ -29,7 +29,7 @@
         <module>io.cloudbeaver.service.data.transfer</module>
 
         <module>io.cloudbeaver.service.security</module>
-        <module>io.cloudbeaver.service.ldap.auth</module>
+        <module>io.cloudbeaver.service.auth.ldap</module>
 
         <module>io.cloudbeaver.resources.drivers.base</module>
 
diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml
index db740c67099..6644371cc12 100644
--- a/server/features/io.cloudbeaver.server.feature/feature.xml
+++ b/server/features/io.cloudbeaver.server.feature/feature.xml
@@ -42,7 +42,7 @@
     <plugin id="io.cloudbeaver.service.rm.nio" version="0.0.0"/>
 
     <plugin id="io.cloudbeaver.service.security" version="0.0.0"/>
-    <plugin id="io.cloudbeaver.service.ldap.auth" version="0.0.0"/>
+    <plugin id="io.cloudbeaver.service.auth.ldap" version="0.0.0"/>
 
     <!-- Extra plugins -->
     <plugin id="org.jkiss.dbeaver.data.office" version="0.0.0"/>
diff --git a/server/product/aggregate/build-full.cmd b/server/product/aggregate/build-full.cmd
index 0e3c5f476a3..bed5ae82a10 100644
--- a/server/product/aggregate/build-full.cmd
+++ b/server/product/aggregate/build-full.cmd
@@ -1,6 +1,6 @@
 @echo off
 set MAVEN_OPTS=-Xmx2048m
 
-call mvn clean verify -Dheadless-platform -T 1C
+call ..\..\..\..\dbeaver-common\mvnw.cmd clean verify -Dheadless-platform -T 1C
 
 pause

From 1500bb5bf510371db4e13fed773252e82b61759a Mon Sep 17 00:00:00 2001
From: Ainur <ainur.iagudin@dbeaver.com>
Date: Fri, 4 Sep 2026 13:09:50 +0200
Subject: [PATCH 2/2] dbeaver/pro#9627 Fix Maven wrapper scripts

---
 deploy/build-backend.sh                 | 9 ++++++---
 server/product/aggregate/build-full.cmd | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh
index 35e21a6aa3c..b7fa8b8dd2e 100755
--- a/deploy/build-backend.sh
+++ b/deploy/build-backend.sh
@@ -27,9 +27,12 @@ cd cloudbeaver/deploy
 echo "Build CloudBeaver server"
 
 cd ../server/product/aggregate
-"$MVNW" clean verify $MAVEN_COMMON_OPTS -Dheadless-platform
-if [[ "$?" -ne 0 ]] ; then
-  echo 'Could not perform package'; exit $rc
+if "$MVNW" clean verify $MAVEN_COMMON_OPTS -Dheadless-platform; then
+  :
+else
+  rc=$?
+  echo 'Could not perform package'
+  exit "$rc"
 fi
 cd ../../../deploy
 
diff --git a/server/product/aggregate/build-full.cmd b/server/product/aggregate/build-full.cmd
index bed5ae82a10..1de5069b793 100644
--- a/server/product/aggregate/build-full.cmd
+++ b/server/product/aggregate/build-full.cmd
@@ -1,6 +1,6 @@
 @echo off
 set MAVEN_OPTS=-Xmx2048m
 
-call ..\..\..\..\dbeaver-common\mvnw.cmd clean verify -Dheadless-platform -T 1C
+call "..\..\..\..\dbeaver-common\mvnw.cmd" clean verify -Dheadless-platform -T 1C
 
 pause