dbeaver · yagudin10 · Sep 9, 2026 · Sep 4, 2026 · Sep 4, 2026 · Sep 9, 2026
diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh
@@ -19,21 +19,25 @@ 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
 
 echo "Build CloudBeaver server"
 
 cd ../server/product/aggregate
-mvn 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
 
 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 +49,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"
+echo "End of backend build"
diff --git 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/...er.service.ldap.auth/META-INF/MANIFEST.MF → ...er.service.auth.ldap/META-INF/MANIFEST.MF b/...er.service.ldap.auth/META-INF/MANIFEST.MF → ...er.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/...ldap.auth/OSGI-INF/l10n/bundle.properties → ...auth.ldap/OSGI-INF/l10n/bundle.properties b/...ldap.auth/OSGI-INF/l10n/bundle.properties → ...auth.ldap/OSGI-INF/l10n/bundle.properties
diff --git a/...p.auth/OSGI-INF/l10n/bundle_ru.properties → ...h.ldap/OSGI-INF/l10n/bundle_ru.properties b/...p.auth/OSGI-INF/l10n/bundle_ru.properties → ...h.ldap/OSGI-INF/l10n/bundle_ru.properties
diff --git a/...beaver.service.ldap.auth/build.properties → ...beaver.service.auth.ldap/build.properties b/...beaver.service.ldap.auth/build.properties → ...beaver.service.auth.ldap/build.properties
diff --git a/...udbeaver.service.ldap.auth/icons/ldap.svg → ...udbeaver.service.auth.ldap/icons/ldap.svg b/...udbeaver.service.ldap.auth/icons/ldap.svg → ...udbeaver.service.auth.ldap/icons/ldap.svg
diff --git a/....cloudbeaver.service.ldap.auth/plugin.xml → ....cloudbeaver.service.auth.ldap/plugin.xml b/....cloudbeaver.service.ldap.auth/plugin.xml → ....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/.../io.cloudbeaver.service.ldap.auth/pom.xml → .../io.cloudbeaver.service.auth.ldap/pom.xml b/.../io.cloudbeaver.service.ldap.auth/pom.xml → .../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/...r/service/ldap/auth/LdapAuthProvider.java → ...r/service/auth/ldap/LdapAuthProvider.java b/...r/service/ldap/auth/LdapAuthProvider.java → ...r/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/...aver/service/ldap/auth/LdapConstants.java → ...aver/service/auth/ldap/LdapConstants.java b/...aver/service/ldap/auth/LdapConstants.java → ...aver/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,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;
 
 public interface LdapConstants {
     String PARAM_HOST = "ldap-host";
    String PARAM_PORT = "ldap-port";
    String PARAM_DN = "ldap-dn";

diff --git a/...beaver/service/ldap/auth/LdapSession.java → ...beaver/service/auth/ldap/LdapSession.java b/...beaver/service/ldap/auth/LdapSession.java → ...beaver/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/...eaver/service/ldap/auth/LdapSettings.java → ...eaver/service/auth/ldap/LdapSettings.java b/...eaver/service/ldap/auth/LdapSettings.java → ...eaver/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/...udbeaver/service/ldap/auth/LdapUtils.java → ...udbeaver/service/auth/ldap/LdapUtils.java b/...udbeaver/service/ldap/auth/LdapUtils.java → ...udbeaver/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/...service/ldap/auth/ssl/LdapSslSetting.java → ...service/auth/ldap/ssl/LdapSslSetting.java b/...service/ldap/auth/ssl/LdapSslSetting.java → ...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/...e/ldap/auth/ssl/LdapSslSocketFactory.java → ...e/auth/ldap/ssl/LdapSslSocketFactory.java b/...e/ldap/auth/ssl/LdapSslSocketFactory.java → ...e/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
@@ -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
@@ -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
@@ -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