From a698363dfd5f404bcec2241e35b32b605edc52fb Mon Sep 17 00:00:00 2001
From: Alexey <wrouds@gmail.com>
Date: Wed, 31 Jan 2024 18:25:00 +0300
Subject: [PATCH 1/4] chore: update javaConfig (#2346)

---
 javaConfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javaConfig.json b/javaConfig.json
index 081953fccf..50a5fcc07c 100644
--- a/javaConfig.json
+++ b/javaConfig.json
@@ -1,4 +1,4 @@
 {
-  "projects": ["../dbeaver", "../cloudbeaver/server"],
+  "projects": ["../dbeaver-common", "../dbeaver", "../cloudbeaver/server"],
   "targetPlatform": "./org.jkiss.cloudbeaver.tp.target"
 }

From cf2d647aeaacd26716035672bfa029445f36da04 Mon Sep 17 00:00:00 2001
From: alex <48489896+devnaumov@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:17:48 +0100
Subject: [PATCH 2/4] CB-4591 do not require password if its saved (#2342)

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 .../packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index f362430998..4e8ffb20af 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -138,7 +138,7 @@ export const SSH: TabContainerPanelComponent<Props> = observer(function SSH({ st
               state={handlerState}
               disabled={disabled || !enabled}
               readOnly={readonly}
-              required={!keyAuth && handlerState.savePassword}
+              required={!passwordSaved && !keyAuth && handlerState.savePassword}
               description={passwordSaved ? translate('ui_processing_saved') : undefined}
               tiny
               fill

From d79ab9593e8c89fb390ff84dc7e212167427f131 Mon Sep 17 00:00:00 2001
From: alex <48489896+devnaumov@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:18:23 +0100
Subject: [PATCH 3/4] CB-4489 increase class priority (#2345)

Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com>
---
 .../src/Dialog/ProcessorConfigureDialog.m.css                   | 2 +-
 .../plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.m.css b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.m.css
index 9f1949f500..2ada5bd288 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.m.css
+++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.m.css
@@ -1,4 +1,4 @@
-.propertiesTable {
+.container .propertiesTable {
   flex: 1;
   overflow: hidden;
   padding: 12px 0;
diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx
index e6dc2ec094..0e18958ed5 100644
--- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx
+++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx
@@ -82,7 +82,7 @@ export const ProcessorConfigureDialog = observer<Props>(function ProcessorConfig
   }
 
   return styled(useStyles(UNDERLINE_TAB_STYLES))(
-    <CommonDialogWrapper size="large" fixedSize>
+    <CommonDialogWrapper className={s(styles, { container: true })} size="large" fixedSize>
       <CommonDialogHeader title={title} onReject={onClose} />
       <CommonDialogBody noOverflow noBodyPadding>
         {!processor.isBinary ? (

From 11adc7d3d665a07bff68c38f263625b3dcbf9d14 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Wed, 31 Jan 2024 19:23:05 +0300
Subject: [PATCH 4/4] dbeaver/pro#2404 Revert legacy Clickhouse driver (#2337)

Co-authored-by: Matvey16 <82543000+Matvey16@users.noreply.github.com>
Co-authored-by: Ainur <59531286+yagudin10@users.noreply.github.com>
---
 server/drivers/clickhouse/pom.xml | 32 -------------------------------
 server/drivers/pom.xml            |  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 server/drivers/clickhouse/pom.xml

diff --git a/server/drivers/clickhouse/pom.xml b/server/drivers/clickhouse/pom.xml
deleted file mode 100644
index e55e276e7f..0000000000
--- a/server/drivers/clickhouse/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>drivers.clickhouse</artifactId>
-    <version>1.0.0</version>
-    <parent>
-        <groupId>io.cloudbeaver</groupId>
-        <artifactId>drivers</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <properties>
-        <deps.output.dir>clickhouse</deps.output.dir>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>ru.yandex.clickhouse</groupId>
-            <artifactId>clickhouse-jdbc</artifactId>
-            <classifier>shaded</classifier>
-            <version>0.3.1-patch</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml
index a08ab3ae98..2d5d4b3718 100644
--- a/server/drivers/pom.xml
+++ b/server/drivers/pom.xml
@@ -11,7 +11,6 @@
     </properties>
 
     <modules>
-        <module>clickhouse</module>
         <module>clickhouse_com</module>
         <module>db2</module>
         <module>db2-jt400</module>