From b736de032952bf3a3d09e144fa72602a470ce83e Mon Sep 17 00:00:00 2001 From: ShadelessFox <35821147+ShadelessFox@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:36:15 +0100 Subject: [PATCH 01/14] dbeaver/pro#2589 Project reference fix (#2460) --- .../server/jobs/WebDataSourceMonitorJob.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java index a3a5d650dd..fadbf4e873 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java @@ -20,9 +20,11 @@ import io.cloudbeaver.model.session.WebSession; import io.cloudbeaver.server.CBApplication; import io.cloudbeaver.server.CBPlatform; +import org.jkiss.code.NotNull; import org.jkiss.dbeaver.model.DBPDataSource; import org.jkiss.dbeaver.model.DBPDataSourceContainer; import org.jkiss.dbeaver.model.app.DBPPlatform; +import org.jkiss.dbeaver.model.app.DBPProject; import org.jkiss.dbeaver.model.auth.SMSession; import org.jkiss.dbeaver.model.websocket.event.WSEventType; import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent; @@ -46,22 +48,23 @@ public WebDataSourceMonitorJob(DBPPlatform platform) { protected void doJob() { Collection allSessions = CBPlatform.getInstance().getSessionManager().getAllActiveSessions(); allSessions.parallelStream().forEach(s -> { - checkDataSourceAliveInWorkspace(s.getWorkspace(), s::getLastAccessTimeMillis); + checkDataSourceAliveInWorkspace(s.getWorkspace(), s.getLastAccessTimeMillis()); }); } @Override - public void showNotification(DBPDataSource dataSource, DBPDataSourceContainer dsDescriptor, SMSession smSession) { - if (smSession instanceof WebSession webSession) { - webSession.addSessionEvent( //TODO: Add new event for disconnect datasource - WSDataSourceEvent.update( - webSession.getSessionId(), - webSession.getUserId(), - dsDescriptor.getProject().getId(), - List.of(dsDescriptor.getId()), - WSDataSourceProperty.CONFIGURATION) - ); + protected void showNotification(@NotNull DBPDataSource dataSource) { + final DBPProject project = dataSource.getContainer().getProject(); + if (project.getWorkspaceSession() instanceof WebSession webSession) { + // TODO: Add new event for disconnect datasource + webSession.addSessionEvent(WSDataSourceEvent.update( + webSession.getSessionId(), + webSession.getUserId(), + project.getId(), + List.of(dataSource.getContainer().getId()), + WSDataSourceProperty.CONFIGURATION + )); } } } From f8de956a6928b18467fbc4a751b38d74feb6e4b8 Mon Sep 17 00:00:00 2001 From: sergeyteleshev Date: Tue, 12 Mar 2024 14:01:44 +0100 Subject: [PATCH 02/14] CB-4765 adds to object viewer rename table handler (#2425) * CB-4765 adds to object viewer rename table handler * CB-4765 code cleanup * CB-4765 handle node rename runs in mobx action --------- Co-authored-by: s.teleshev Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com> --- .../src/ObjectViewerTabService.ts | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts index 508e6e8d62..cf2696bc03 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts +++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts @@ -7,6 +7,7 @@ */ import { action, makeObservable, runInAction } from 'mobx'; +import { importLazyComponent } from '@cloudbeaver/core-blocks'; import { Connection, ConnectionInfoActiveProjectKey, @@ -21,7 +22,14 @@ import { import { injectable } from '@cloudbeaver/core-di'; import { NotificationService } from '@cloudbeaver/core-events'; import type { IExecutionContextProvider, ISyncContextLoader } from '@cloudbeaver/core-executor'; -import { type INodeNavigationData, NavNodeManagerService, NodeManagerUtils, objectNavNodeProvider } from '@cloudbeaver/core-navigation-tree'; +import { + INavNodeRenameData, + type INodeNavigationData, + NavNodeManagerService, + NavTreeResource, + NodeManagerUtils, + objectNavNodeProvider, +} from '@cloudbeaver/core-navigation-tree'; import { projectProvider } from '@cloudbeaver/core-projects'; import { ResourceKey, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-resource'; import { ITab, NavigationTabsService, TabHandler } from '@cloudbeaver/plugin-navigation-tabs'; @@ -30,10 +38,11 @@ import type { IObjectViewerTabContext } from './IObjectViewerTabContext'; import type { IObjectViewerTabState } from './IObjectViewerTabState'; import { DBObjectPageService } from './ObjectPage/DBObjectPageService'; import type { ObjectPage } from './ObjectPage/ObjectPage'; -import { ObjectViewerPanel } from './ObjectViewerPanel'; -import { ObjectViewerTab } from './ObjectViewerTab'; import { objectViewerTabHandlerKey } from './objectViewerTabHandlerKey'; +const ObjectViewerPanel = importLazyComponent(() => import('./ObjectViewerPanel').then(m => m.ObjectViewerPanel)); +const ObjectViewerTab = importLazyComponent(() => import('./ObjectViewerTab').then(m => m.ObjectViewerTab)); + @injectable() export class ObjectViewerTabService { readonly tabHandler: TabHandler; @@ -45,6 +54,7 @@ export class ObjectViewerTabService { private readonly navigationTabsService: NavigationTabsService, private readonly connectionInfoResource: ConnectionInfoResource, private readonly connectionNavNodeService: ConnectionNavNodeService, + private readonly navTreeResource: NavTreeResource, ) { this.tabHandler = this.navigationTabsService.registerTabHandler({ key: objectViewerTabHandlerKey, @@ -78,6 +88,17 @@ export class ObjectViewerTabService { this.connectionInfoResource.onItemUpdate.addHandler(this.updateConnectionTabs.bind(this)); this.connectionInfoResource.onItemDelete.addHandler(this.closeConnectionTabs.bind(this)); this.navNodeManagerService.navTree.onItemDelete.addHandler(this.removeTabs.bind(this)); + this.navTreeResource.onNodeRename.addHandler(this.handleNodeRename.bind(this)); + } + + private handleNodeRename(data: INavNodeRenameData, contexts: IExecutionContextProvider) { + runInAction(() => { + const context = contexts.getContext(this.objectViewerTabContext); + + if (context.tab) { + context.tab.handlerState.objectId = data.newNodeId; + } + }); } isPageActive(tab: ITab, page: ObjectPage): boolean { From 8adb27f7b1f3e66ffdb01729c98827dcf2dbf7a9 Mon Sep 17 00:00:00 2001 From: Anastasiya <45152336+LonwoLonwo@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:47:46 +0300 Subject: [PATCH 03/14] CB-4839 fix reverse-proxy logout URL label (#2461) --- server/bundles/io.cloudbeaver.service.security/plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.service.security/plugin.xml b/server/bundles/io.cloudbeaver.service.security/plugin.xml index 6fb281f13a..2a079301e4 100644 --- a/server/bundles/io.cloudbeaver.service.security/plugin.xml +++ b/server/bundles/io.cloudbeaver.service.security/plugin.xml @@ -28,7 +28,7 @@ - + From 2cacb3e1fa2c1ea84d44bce04cccf33b0932489d Mon Sep 17 00:00:00 2001 From: Anastasiya <45152336+LonwoLonwo@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:48:09 +0300 Subject: [PATCH 04/14] CB-4842 change brute force exception message (#2465) --- .../service/security/bruteforce/BruteForceUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java index 8be8e7f262..fdc80ad57b 100644 --- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java +++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java @@ -61,7 +61,7 @@ public static void checkBruteforce(SMControllerConfiguration smConfig, List Date: Tue, 12 Mar 2024 15:37:08 +0100 Subject: [PATCH 05/14] dbeaver/pro#2522 Use custom launcher for all products --- deploy/scripts/run-server.bat | 2 +- deploy/scripts/run-server.sh | 2 +- server/features/io.cloudbeaver.server.feature/feature.xml | 2 +- server/features/io.cloudbeaver.ws.feature/feature.xml | 2 +- server/product/web-server/run.cmd | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 server/product/web-server/run.cmd diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat index 7a1f726d43..32367aa93c 100644 --- a/deploy/scripts/run-server.bat +++ b/deploy/scripts/run-server.bat @@ -1,5 +1,5 @@ @echo off -for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a" +for /f %%a in ('dir /B /S server\plugins\org.jkiss.dbeaver.launcher*.jar') do SET launcherJar="%%a" echo "Starting Cloudbeaver Server" diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh index c0308fb005..17ddf088f7 100755 --- a/deploy/scripts/run-server.sh +++ b/deploy/scripts/run-server.sh @@ -1,6 +1,6 @@ #!/bin/bash -launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar ) +launcherJar=( server/plugins/org.jkiss.dbeaver.launcher*.jar ) echo "Starting Cloudbeaver Server" diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml index 87807228e5..032c9d5737 100644 --- a/server/features/io.cloudbeaver.server.feature/feature.xml +++ b/server/features/io.cloudbeaver.server.feature/feature.xml @@ -18,7 +18,6 @@ - @@ -31,6 +30,7 @@ + diff --git a/server/features/io.cloudbeaver.ws.feature/feature.xml b/server/features/io.cloudbeaver.ws.feature/feature.xml index 9f8f30909e..76217dfcbf 100644 --- a/server/features/io.cloudbeaver.ws.feature/feature.xml +++ b/server/features/io.cloudbeaver.ws.feature/feature.xml @@ -18,7 +18,7 @@ - + diff --git a/server/product/web-server/run.cmd b/server/product/web-server/run.cmd deleted file mode 100644 index 289ed27939..0000000000 --- a/server/product/web-server/run.cmd +++ /dev/null @@ -1 +0,0 @@ -java -jar plugins/org.eclipse.equinox.launcher_1.5.600.v20191014-2022.jar -product io.cloudbeaver.server.product -data C:/data/cloudbeaver/workspace From c5930852b974640f7998e2723415b4347b01ded8 Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Tue, 12 Mar 2024 15:55:19 +0100 Subject: [PATCH 06/14] CB-4696 truncate string value fix (#2456) * CB-4696 truncate content string value fix * CB-4696 extend isText check to show quota message --------- Co-authored-by: naumov --- .../io/cloudbeaver/service/sql/WebSQLUtils.java | 7 +++++++ .../Actions/ResultSet/ResultSetFormatAction.ts | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java index 49493a878b..667539783d 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java @@ -150,6 +150,13 @@ private static Object serializeContentValue(WebSession session, DBDContent value Map map = createMapOfType(WebSQLConstants.VALUE_TYPE_CONTENT); if (ContentUtils.isTextContent(value)) { String stringValue = ContentUtils.getContentStringValue(session.getProgressMonitor(), value); + int textPreviewMaxLength = CommonUtils.toInt( + CBApplication.getInstance().getAppConfiguration().getResourceQuota( + WebSQLConstants.QUOTA_PROP_TEXT_PREVIEW_MAX_LENGTH, + WebSQLConstants.TEXT_PREVIEW_MAX_LENGTH)); + if (stringValue != null && stringValue.length() > textPreviewMaxLength) { + stringValue = stringValue.substring(0, textPreviewMaxLength); + } map.put(WebSQLConstants.ATTR_TEXT, stringValue); } else { map.put(WebSQLConstants.ATTR_BINARY, true); diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction.ts index 4c819c2c09..9fe13cfc00 100644 --- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction.ts +++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetFormatAction.ts @@ -109,7 +109,19 @@ export class ResultSetFormatAction const column = this.view.getColumn(key.column); - return column?.dataKind?.toLocaleLowerCase() === 'string'; + if (column?.dataKind?.toLocaleLowerCase() === 'string') { + return true; + } + + if (key.row && !this.isBinary(key)) { + const value = this.get(key as IResultSetElementKey); + + if (isResultSetContentValue(value)) { + return value.text !== undefined; + } + } + + return false; } getHeaders(): string[] { From a1f5aab1f7f48e5350a9f19cd637709acfdd7872 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 12 Mar 2024 23:33:41 +0800 Subject: [PATCH 07/14] chore: update vscode workspace (#2466) --- .vscode/launch.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b33fae1f67..86904cf91a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -23,15 +23,12 @@ "name": "CloudBeaver CE", "cwd": "${workspaceFolder}/../opt/cbce", "request": "launch", - "mainClass": "org.eclipse.equinox.launcher.Main", + "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher", "windows": { "type": "java", "name": "CloudBeaver CE", "request": "launch", - "mainClass": "org.eclipse.equinox.launcher.Main", - "classPaths": [ - "${workspaceFolder}/../eclipse/eclipse/plugins/org.eclipse.equinox.launcher_1.6.600.v20231106-1826.jar" - ], + "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher", "args": [ "-product", "io.cloudbeaver.product.ce.product", @@ -63,10 +60,7 @@ "type": "java", "name": "CloudBeaver CE", "request": "launch", - "mainClass": "org.eclipse.equinox.launcher.Main", - "classPaths": [ - "${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.equinox.launcher_1.6.600.v20231106-1826.jar" - ], + "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher", "args": [ "-product", "io.cloudbeaver.product.ce.product", From 70dafdc895206bc6a9da5b36342456e9b04e5a90 Mon Sep 17 00:00:00 2001 From: alex <48489896+devnaumov@users.noreply.github.com> Date: Tue, 12 Mar 2024 18:08:33 +0100 Subject: [PATCH 08/14] CB-4761 remove rtl mode from menu (#2424) Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- .../src/TopNavBar/AppStateMenu/AppStateMenu.tsx | 2 +- webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/AppStateMenu.tsx b/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/AppStateMenu.tsx index 8eec9722e8..30aca88eeb 100644 --- a/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/AppStateMenu.tsx +++ b/webapp/packages/plugin-top-app-bar/src/TopNavBar/AppStateMenu/AppStateMenu.tsx @@ -46,7 +46,7 @@ export const AppStateMenu = observer(function AppStateMenu() { return (
- +
); diff --git a/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx b/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx index eea77bf362..6e41d271a7 100644 --- a/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx +++ b/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx @@ -31,7 +31,7 @@ export const UserMenu = observer(function UserMenu() { return ( - + From 08702465b97a866ed818a72a7343cb257264a1dd Mon Sep 17 00:00:00 2001 From: alex <48489896+devnaumov@users.noreply.github.com> Date: Wed, 13 Mar 2024 09:35:00 +0100 Subject: [PATCH 09/14] Cb 3989 sub folder deletion (#2444) * CB-3989 preload all folders to validate folder name * CB-3989 preload project --------- Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- .../src/NavNodes/ConnectionFoldersBootstrap.ts | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/webapp/packages/plugin-connections/src/NavNodes/ConnectionFoldersBootstrap.ts b/webapp/packages/plugin-connections/src/NavNodes/ConnectionFoldersBootstrap.ts index 75f5919a2f..d9c0cd100b 100644 --- a/webapp/packages/plugin-connections/src/NavNodes/ConnectionFoldersBootstrap.ts +++ b/webapp/packages/plugin-connections/src/NavNodes/ConnectionFoldersBootstrap.ts @@ -43,7 +43,7 @@ import { ROOT_NODE_PATH, } from '@cloudbeaver/core-navigation-tree'; import { getProjectNodeId, NAV_NODE_TYPE_PROJECT, ProjectInfoResource } from '@cloudbeaver/core-projects'; -import { CachedMapAllKey, ResourceKeyAlias, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-resource'; +import { CachedMapAllKey, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-resource'; import { createPath } from '@cloudbeaver/core-utils'; import { ACTION_NEW_FOLDER, ActionService, DATA_CONTEXT_MENU, IAction, MenuService } from '@cloudbeaver/core-view'; import { DATA_CONTEXT_ELEMENTS_TREE, type IElementsTree, MENU_ELEMENTS_TREE_TOOLS } from '@cloudbeaver/plugin-navigation-tree'; @@ -275,21 +275,8 @@ export class ConnectionFoldersBootstrap extends Bootstrap { return false; } - let parentKey: - | ResourceKeyAlias< - any, - { - projectId: string; - } - > - | IConnectionFolderParam = ConnectionFolderProjectKey(projectId); - - if (folder) { - parentKey = createConnectionFolderParam(projectId, folder); - } - try { - await this.connectionFolderResource.load(parentKey); + await this.connectionFolderResource.load(ConnectionFolderProjectKey(projectId)); return !this.connectionFolderResource.has(createConnectionFolderParam(projectId, createPath(folder, trimmed))); } catch (exception: any) { From a28f4eb1e700e4fe8c5dc506b85e0bf6db624517 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Wed, 13 Mar 2024 16:26:29 +0100 Subject: [PATCH 10/14] 24.0.1 version bump --- server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.model/pom.xml | 2 +- server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.product.ce/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml | 2 +- server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.server/pom.xml | 2 +- .../bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.admin/pom.xml | 2 +- .../bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.auth/pom.xml | 2 +- .../io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.data.transfer/pom.xml | 2 +- server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.fs/pom.xml | 2 +- .../io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.metadata/pom.xml | 2 +- .../io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.rm.nio/pom.xml | 2 +- server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.rm/pom.xml | 2 +- .../io.cloudbeaver.service.security/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.security/pom.xml | 2 +- server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.slf4j/pom.xml | 2 +- server/features/io.cloudbeaver.ce.drivers.feature/feature.xml | 2 +- server/features/io.cloudbeaver.ce.drivers.feature/pom.xml | 2 +- server/features/io.cloudbeaver.product.ce.feature/feature.xml | 2 +- server/features/io.cloudbeaver.product.ce.feature/pom.xml | 2 +- server/features/io.cloudbeaver.server.feature/feature.xml | 2 +- server/features/io.cloudbeaver.server.feature/pom.xml | 2 +- server/features/io.cloudbeaver.ws.feature/feature.xml | 2 +- server/features/io.cloudbeaver.ws.feature/pom.xml | 2 +- server/pom.xml | 2 +- server/product/web-server/CloudbeaverServer.product | 2 +- server/product/web-server/pom.xml | 2 +- 37 files changed, 50 insertions(+), 50 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF index 9b7160d002..a9f71d7df5 100644 --- a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Model Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true -Bundle-Version: 1.0.48.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.49.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.model/pom.xml b/server/bundles/io.cloudbeaver.model/pom.xml index 5508b9e619..b8df120598 100644 --- a/server/bundles/io.cloudbeaver.model/pom.xml +++ b/server/bundles/io.cloudbeaver.model/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.model - 1.0.48-SNAPSHOT + 1.0.49-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF index 6f67a4fdec..2016d561e4 100644 --- a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Community Product Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true -Bundle-Version: 24.0.0.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 24.0.1.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.product.ce/pom.xml b/server/bundles/io.cloudbeaver.product.ce/pom.xml index df021cfa95..d3ad047a52 100644 --- a/server/bundles/io.cloudbeaver.product.ce/pom.xml +++ b/server/bundles/io.cloudbeaver.product.ce/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.product.ce - 24.0.0-SNAPSHOT + 24.0.1-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF index bfff456a01..e60294cffb 100644 --- a/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Base JDBC drivers Bundle-SymbolicName: io.cloudbeaver.resources.drivers.base;singleton:=true -Bundle-Version: 1.0.93.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.94.qualifier +Bundle-Release-Date: 20240325 Bundle-Vendor: DBeaver Corp Bundle-ActivationPolicy: lazy Automatic-Module-Name: io.cloudbeaver.resources.drivers.base diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml index 5566a40952..6caab1bddf 100644 --- a/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml +++ b/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml @@ -9,6 +9,6 @@ ../ io.cloudbeaver.resources.drivers.base - 1.0.93-SNAPSHOT + 1.0.94-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF index c289ca9f31..f72a7917cb 100644 --- a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Server Bundle-SymbolicName: io.cloudbeaver.server;singleton:=true -Bundle-Version: 24.0.0.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 24.0.1.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Activator: io.cloudbeaver.server.CBPlatformActivator diff --git a/server/bundles/io.cloudbeaver.server/pom.xml b/server/bundles/io.cloudbeaver.server/pom.xml index fe78021b19..d84c044428 100644 --- a/server/bundles/io.cloudbeaver.server/pom.xml +++ b/server/bundles/io.cloudbeaver.server/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.server - 24.0.0-SNAPSHOT + 24.0.1-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF index da31b2e715..c0ebf44902 100644 --- a/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Administration Bundle-SymbolicName: io.cloudbeaver.service.admin;singleton:=true -Bundle-Version: 1.0.92.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.93.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.admin/pom.xml b/server/bundles/io.cloudbeaver.service.admin/pom.xml index 5b007647d7..4c5993c293 100644 --- a/server/bundles/io.cloudbeaver.service.admin/pom.xml +++ b/server/bundles/io.cloudbeaver.service.admin/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.admin - 1.0.92-SNAPSHOT + 1.0.93-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF index 7af3587180..4a810e0c0e 100644 --- a/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Authentication Bundle-SymbolicName: io.cloudbeaver.service.auth;singleton:=true -Bundle-Version: 1.0.92.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.93.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.auth/pom.xml b/server/bundles/io.cloudbeaver.service.auth/pom.xml index 1e507757ad..ac7f6a3d80 100644 --- a/server/bundles/io.cloudbeaver.service.auth/pom.xml +++ b/server/bundles/io.cloudbeaver.service.auth/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.auth - 1.0.92-SNAPSHOT + 1.0.93-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF index a82383ae4f..fa0c556f34 100644 --- a/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Data Transfer Bundle-SymbolicName: io.cloudbeaver.service.data.transfer;singleton:=true -Bundle-Version: 1.0.93.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.94.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml b/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml index d27362d356..d7b054262c 100644 --- a/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml +++ b/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.data.transfer - 1.0.93-SNAPSHOT + 1.0.94-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF index 27f774374f..95489e5409 100644 --- a/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - File System Bundle-SymbolicName: io.cloudbeaver.service.fs;singleton:=true -Bundle-Version: 1.0.10.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.11.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.fs/pom.xml b/server/bundles/io.cloudbeaver.service.fs/pom.xml index d9f3475edb..4005e69b41 100644 --- a/server/bundles/io.cloudbeaver.service.fs/pom.xml +++ b/server/bundles/io.cloudbeaver.service.fs/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.fs - 1.0.10-SNAPSHOT + 1.0.11-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF index 8e9422a258..193af49aec 100644 --- a/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Metadata Bundle-SymbolicName: io.cloudbeaver.service.metadata;singleton:=true -Bundle-Version: 1.0.96.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.97.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.metadata/pom.xml b/server/bundles/io.cloudbeaver.service.metadata/pom.xml index 07a998448f..cc0b3aa2c7 100644 --- a/server/bundles/io.cloudbeaver.service.metadata/pom.xml +++ b/server/bundles/io.cloudbeaver.service.metadata/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.metadata - 1.0.96-SNAPSHOT + 1.0.97-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF index a69bc3fef9..48bf4d353f 100644 --- a/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Resource manager NIO implementation Bundle-SymbolicName: io.cloudbeaver.service.rm.nio;singleton:=true -Bundle-Version: 1.0.10.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.11.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml b/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml index df11fc9a00..925fe61f23 100644 --- a/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml +++ b/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.rm.nio - 1.0.10-SNAPSHOT + 1.0.11-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF index 07ebc7d07a..0f497f11b5 100644 --- a/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Resource manager Bundle-SymbolicName: io.cloudbeaver.service.rm;singleton:=true -Bundle-Version: 1.0.45.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.46.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.rm/pom.xml b/server/bundles/io.cloudbeaver.service.rm/pom.xml index 148ebe8ba6..bd538fb56b 100644 --- a/server/bundles/io.cloudbeaver.service.rm/pom.xml +++ b/server/bundles/io.cloudbeaver.service.rm/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.rm - 1.0.45-SNAPSHOT + 1.0.46-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF index a43fb3f7af..0b27a59aa1 100644 --- a/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: Cloudbeaver Web Service - Security Bundle-Vendor: DBeaver Corp Bundle-SymbolicName: io.cloudbeaver.service.security;singleton:=true -Bundle-Version: 1.0.48.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.49.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.security/pom.xml b/server/bundles/io.cloudbeaver.service.security/pom.xml index 08fe6e850a..76b37db158 100644 --- a/server/bundles/io.cloudbeaver.service.security/pom.xml +++ b/server/bundles/io.cloudbeaver.service.security/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.security - 1.0.48-SNAPSHOT + 1.0.49-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF index b018076ff4..c747797783 100644 --- a/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: CloudBeaver SLF4j Binding Bundle-SymbolicName: io.cloudbeaver.slf4j;singleton:=true -Bundle-Version: 1.0.8.qualifier -Bundle-Release-Date: 20240304 +Bundle-Version: 1.0.9.qualifier +Bundle-Release-Date: 20240325 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.slf4j/pom.xml b/server/bundles/io.cloudbeaver.slf4j/pom.xml index 226e9e177c..2741fcbca2 100644 --- a/server/bundles/io.cloudbeaver.slf4j/pom.xml +++ b/server/bundles/io.cloudbeaver.slf4j/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.slf4j - 1.0.8-SNAPSHOT + 1.0.9-SNAPSHOT eclipse-plugin diff --git a/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml b/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml index cda176dd47..c535d5b298 100644 --- a/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml +++ b/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml b/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml index 886c24d95c..bfdcf1d7ac 100644 --- a/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml +++ b/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml @@ -9,6 +9,6 @@ ../ io.cloudbeaver.ce.drivers.feature - 1.0.116-SNAPSHOT + 1.0.117-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.product.ce.feature/feature.xml b/server/features/io.cloudbeaver.product.ce.feature/feature.xml index 8152aa24d3..6e19816899 100644 --- a/server/features/io.cloudbeaver.product.ce.feature/feature.xml +++ b/server/features/io.cloudbeaver.product.ce.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server/features/io.cloudbeaver.product.ce.feature/pom.xml b/server/features/io.cloudbeaver.product.ce.feature/pom.xml index b355b77f33..fb4353db82 100644 --- a/server/features/io.cloudbeaver.product.ce.feature/pom.xml +++ b/server/features/io.cloudbeaver.product.ce.feature/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.product.ce.feature - 24.0.0-SNAPSHOT + 24.0.1-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml index 032c9d5737..d6bdb59982 100644 --- a/server/features/io.cloudbeaver.server.feature/feature.xml +++ b/server/features/io.cloudbeaver.server.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server/features/io.cloudbeaver.server.feature/pom.xml b/server/features/io.cloudbeaver.server.feature/pom.xml index 28f89d53cd..8366ba7ac6 100644 --- a/server/features/io.cloudbeaver.server.feature/pom.xml +++ b/server/features/io.cloudbeaver.server.feature/pom.xml @@ -10,6 +10,6 @@ ../ io.cloudbeaver.server.feature - 24.0.0-SNAPSHOT + 24.0.1-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.ws.feature/feature.xml b/server/features/io.cloudbeaver.ws.feature/feature.xml index 76217dfcbf..545520f711 100644 --- a/server/features/io.cloudbeaver.ws.feature/feature.xml +++ b/server/features/io.cloudbeaver.ws.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server/features/io.cloudbeaver.ws.feature/pom.xml b/server/features/io.cloudbeaver.ws.feature/pom.xml index 446ec23248..1f198441f7 100644 --- a/server/features/io.cloudbeaver.ws.feature/pom.xml +++ b/server/features/io.cloudbeaver.ws.feature/pom.xml @@ -10,6 +10,6 @@ ../ io.cloudbeaver.ws.feature - 1.0.46-SNAPSHOT + 1.0.47-SNAPSHOT eclipse-feature diff --git a/server/pom.xml b/server/pom.xml index 46b9c9b36d..510fbcd9c0 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -19,7 +19,7 @@ CloudBeaver CE - 24.0.0 + 24.0.1 diff --git a/server/product/web-server/CloudbeaverServer.product b/server/product/web-server/CloudbeaverServer.product index bb8cd96ce5..78db4be4d8 100644 --- a/server/product/web-server/CloudbeaverServer.product +++ b/server/product/web-server/CloudbeaverServer.product @@ -2,7 +2,7 @@ diff --git a/server/product/web-server/pom.xml b/server/product/web-server/pom.xml index a1c36b0aff..da009545d8 100644 --- a/server/product/web-server/pom.xml +++ b/server/product/web-server/pom.xml @@ -9,7 +9,7 @@ 1.0.0-SNAPSHOT ../../ - 24.0.0-SNAPSHOT + 24.0.1-SNAPSHOT web-server eclipse-repository Cloudbeaver Server Product From 2d58c012575b588b3c371d4249465c1b2ac544f3 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Wed, 13 Mar 2024 16:27:26 +0100 Subject: [PATCH 11/14] 24.0.1 version bump --- webapp/packages/product-default/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index 331f2ebe4d..e13634bb09 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -5,7 +5,7 @@ "src/**/*.scss", "public/**/*" ], - "version": "24.0.0", + "version": "24.0.1", "description": "CloudBeaver Community", "license": "Apache-2.0", "main": "dist/index.js", From 1f8ed6231a3e8dedaf3f8c9f44dfd7301b9a586a Mon Sep 17 00:00:00 2001 From: serge-rider Date: Thu, 14 Mar 2024 08:51:10 +0100 Subject: [PATCH 12/14] Copyrights and release date updates --- .../cloudbeaver/server/jobs/WebDataSourceMonitorJob.java | 7 +------ webapp/packages/core-app/src/BodyLazy.ts | 2 +- webapp/packages/core-blocks/src/importLazyComponent.ts | 2 +- .../src/DataGrid/useTableDataMeasurements.ts | 2 +- .../DatabaseDataModel/Actions/DatabaseDataResultAction.ts | 2 +- .../DatabaseDataModel/Actions/DatabaseMetadataAction.ts | 2 +- .../Actions/IDatabaseDataMetadataAction.ts | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java index fadbf4e873..5a244b6156 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java @@ -1,6 +1,6 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2023 DBeaver Corp and others + * Copyright (C) 2010-2024 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. @@ -18,18 +18,13 @@ import io.cloudbeaver.model.session.BaseWebSession; import io.cloudbeaver.model.session.WebSession; -import io.cloudbeaver.server.CBApplication; import io.cloudbeaver.server.CBPlatform; import org.jkiss.code.NotNull; import org.jkiss.dbeaver.model.DBPDataSource; -import org.jkiss.dbeaver.model.DBPDataSourceContainer; import org.jkiss.dbeaver.model.app.DBPPlatform; import org.jkiss.dbeaver.model.app.DBPProject; -import org.jkiss.dbeaver.model.auth.SMSession; -import org.jkiss.dbeaver.model.websocket.event.WSEventType; import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent; import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty; -import org.jkiss.dbeaver.runtime.DBWorkbench; import org.jkiss.dbeaver.runtime.jobs.DataSourceMonitorJob; import java.util.Collection; diff --git a/webapp/packages/core-app/src/BodyLazy.ts b/webapp/packages/core-app/src/BodyLazy.ts index 4e12407945..3d8043c34d 100644 --- a/webapp/packages/core-app/src/BodyLazy.ts +++ b/webapp/packages/core-app/src/BodyLazy.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2023 DBeaver Corp and others + * Copyright (C) 2020-2024 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/core-blocks/src/importLazyComponent.ts b/webapp/packages/core-blocks/src/importLazyComponent.ts index 5f2da91239..22f4eb4652 100644 --- a/webapp/packages/core-blocks/src/importLazyComponent.ts +++ b/webapp/packages/core-blocks/src/importLazyComponent.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2023 DBeaver Corp and others + * Copyright (C) 2020-2024 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useTableDataMeasurements.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useTableDataMeasurements.ts index 09fb22e935..d6d6b6d52e 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useTableDataMeasurements.ts +++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/useTableDataMeasurements.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2023 DBeaver Corp and others + * Copyright (C) 2020-2024 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataResultAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataResultAction.ts index eb95b012d4..5299f6c41b 100644 --- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataResultAction.ts +++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseDataResultAction.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2023 DBeaver Corp and others + * Copyright (C) 2020-2024 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseMetadataAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseMetadataAction.ts index 1e48d4be3f..9f70f7f519 100644 --- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseMetadataAction.ts +++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/DatabaseMetadataAction.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2023 DBeaver Corp and others + * Copyright (C) 2020-2024 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataMetadataAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataMetadataAction.ts index d924a3eba8..181de66694 100644 --- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataMetadataAction.ts +++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/IDatabaseDataMetadataAction.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2023 DBeaver Corp and others + * Copyright (C) 2020-2024 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. From 826d0c6f605b2f5958b0a8b9313e217d96701dd4 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Thu, 14 Mar 2024 14:19:05 +0400 Subject: [PATCH 13/14] CB-4819 update composite documents attribute values (#2452) Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com> --- .../cloudbeaver/service/sql/WebSQLProcessor.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java index 3b98256a50..7d4f225192 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java @@ -585,12 +585,19 @@ private DBSDataManipulator generateUpdateResultsDataBatch( Object[] rowValues = new Object[updateAttributes.length + keyAttributes.length]; // put key values first in case of updating them + DBDDocument document = null; for (int i = 0; i < keyAttributes.length; i++) { DBDAttributeBinding keyAttribute = keyAttributes[i]; boolean isDocumentValue = keyAttributes.length == 1 && keyAttribute.getDataKind() == DBPDataKind.DOCUMENT && dataContainer instanceof DBSDocumentLocator; if (isDocumentValue) { - rowValues[updateAttributes.length + i] = - makeDocumentInputValue(session, (DBSDocumentLocator) dataContainer, resultsInfo, row, metaData); + document = makeDocumentInputValue( + session, + (DBSDocumentLocator) dataContainer, + resultsInfo, + row, + metaData + ); + rowValues[updateAttributes.length + i] = document; } else { rowValues[updateAttributes.length + i] = keyAttribute.getValueHandler().getValueFromObject( session, @@ -610,6 +617,9 @@ private DBSDataManipulator generateUpdateResultsDataBatch( DBDAttributeBinding updateAttribute = updateAttributes[i]; Object value = updateValues.get(String.valueOf(updateAttribute.getOrdinalPosition())); Object realCellValue = setCellRowValue(value, webSession, session, updateAttribute, withoutExecution); + if (document instanceof DBDComposite compositeDoc) { + compositeDoc.setAttributeValue(updateAttribute, realCellValue); + } rowValues[i] = realCellValue; finalRow[updateAttribute.getOrdinalPosition()] = realCellValue; } From 25b895c7aa89216cbd3cf658c43a2bef272d548c Mon Sep 17 00:00:00 2001 From: alex <48489896+devnaumov@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:31:09 +0100 Subject: [PATCH 14/14] CB-3977 remove connection from resource on driver delete (#2428) Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- .../core-connections/src/ConnectionInfoResource.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts index b1b5bfc35a..befdb6ef5e 100644 --- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts +++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts @@ -40,6 +40,7 @@ import { schemaValidationError } from '@cloudbeaver/core-utils'; import { CONNECTION_INFO_PARAM_SCHEMA, type IConnectionInfoParams } from './CONNECTION_INFO_PARAM_SCHEMA'; import { ConnectionInfoEventHandler, IConnectionInfoEvent } from './ConnectionInfoEventHandler'; import type { DatabaseConnection } from './DatabaseConnection'; +import { DBDriverResource } from './DBDriverResource'; export type Connection = DatabaseConnection & { authProperties?: UserConnectionAuthPropertiesFragment[]; @@ -89,6 +90,7 @@ export class ConnectionInfoResource extends CachedMapResource this.sessionUpdate)); this.onConnectionCreate.addHandler(ExecutorInterrupter.interrupter(() => this.sessionUpdate)); + dbDriverResource.onItemDelete.addHandler(data => { + const hiddenConnections = this.values.filter(connection => connection.driverId === data); + this.delete(resourceKeyList(hiddenConnections.map(connection => createConnectionParam(connection)))); + }); + userInfoResource.onUserChange.addHandler(() => { this.clear(); });