From 09863ea260e5ed42a6da8192b6bd9c17ffde4a99 Mon Sep 17 00:00:00 2001 From: Dmitrii Barnukov <29237913+Nexus6v2@users.noreply.github.com> Date: Tue, 31 Mar 2026 16:52:46 +0200 Subject: [PATCH 1/3] dbeaver/pro#7963 extended openurl event, added client event (#4247) * dbeaver/pro#7963 extended openurl event, added client event * dbeaver/pro#7963 fix typo --- .../bundles/io.cloudbeaver.model/plugin.xml | 2 + .../cloudbeaver/model/session/WebSession.java | 13 +++++- .../WSSessionCancelActionClientEvent.java | 40 +++++++++++++++++++ .../schema/service.events.graphqls | 11 ++++- .../websockets/CBClientEventProcessor.java | 9 ++++- 5 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/websocket/event/client/WSSessionCancelActionClientEvent.java diff --git a/server/bundles/io.cloudbeaver.model/plugin.xml b/server/bundles/io.cloudbeaver.model/plugin.xml index 8f6f3cc06d..de60a46338 100644 --- a/server/bundles/io.cloudbeaver.model/plugin.xml +++ b/server/bundles/io.cloudbeaver.model/plugin.xml @@ -46,6 +46,8 @@ class="io.cloudbeaver.websocket.event.client.WSSessionTaskConfirmationEvent"/> + diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java index 36f2f22a21..1dad4b17e5 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.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. @@ -1037,7 +1037,6 @@ public class WebSession extends BaseWebSession } } - public void handleTaskConfirmationWithParameters(@NotNull String taskId, @NotNull Map parameters) { String attributeName = getTaskConfirmationAttributeName(taskId); CompletableFuture> confirmationFuture = getAttribute(attributeName); @@ -1049,6 +1048,16 @@ public class WebSession extends BaseWebSession } } + public void handleActionCancelledEvent(@NotNull String actionId) { + Object attributeValue = getAttribute(actionId); + if (!(attributeValue instanceof CompletableFuture future)) { + log.info("Action to be cancelled not found, skipping: " + actionId); + return; + } + future.completeExceptionally(new DBWebException("Action cancelled by user: " + actionId)); + removeAttribute(actionId); + } + @NotNull private String getTaskConfirmationAttributeName(@NotNull String taskId) { return WebSQLConstants.TASK_CONFIRMATION_ATTR_PREFIX + taskId; diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/websocket/event/client/WSSessionCancelActionClientEvent.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/websocket/event/client/WSSessionCancelActionClientEvent.java new file mode 100644 index 0000000000..f4c4d97fca --- /dev/null +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/websocket/event/client/WSSessionCancelActionClientEvent.java @@ -0,0 +1,40 @@ +/* + * DBeaver - Universal Database Manager + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.cloudbeaver.websocket.event.client; + +import org.jkiss.code.NotNull; +import org.jkiss.dbeaver.model.websocket.WSConstants; +import org.jkiss.dbeaver.model.websocket.event.WSClientEvent; + +public class WSSessionCancelActionClientEvent extends WSClientEvent { + public static final String ID = "cb_client_cancel_action"; + + @NotNull + private final String actionId; + + public WSSessionCancelActionClientEvent( + @NotNull String actionId + ) { + super(ID, WSConstants.TOPIC_SESSION_ACTION); + this.actionId = actionId; + } + + @NotNull + public String getActionId() { + return actionId; + } +} diff --git a/server/bundles/io.cloudbeaver.server/schema/service.events.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.events.graphqls index a296a1272e..bd3b47d321 100644 --- a/server/bundles/io.cloudbeaver.server/schema/service.events.graphqls +++ b/server/bundles/io.cloudbeaver.server/schema/service.events.graphqls @@ -38,7 +38,8 @@ enum CBClientEventId { cb_client_topic_subscribe, cb_client_topic_unsubscribe, cb_client_projects_active, - cb_client_session_ping + cb_client_session_ping, + cb_client_cancel_action @since(version: "26.0.2") } "Client subscribes on topic to receive only related events" @@ -136,6 +137,13 @@ type CBProjectsActiveEvent implements CBClientEvent { projectIds: [String!]! } +"Action cancelled by user" +type CBActionCancelledEvent implements CBClientEvent @since(version: "26.0.2") { + id: CBClientEventId! + topicId: CBEventTopic + actionId: String! +} + "Async task info status event" type WSAsyncTaskInfo @since(version: "24.3.1") { id: CBServerEventId! @@ -167,6 +175,7 @@ type WSOpenUrlEvent implements CBServerEvent @since(version: "25.3.1") { topicId: CBEventTopic! timestamp: Int! url: String! + actionId: String! } extend type Query { diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBClientEventProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBClientEventProcessor.java index fef9fffdc0..08eb1f97e9 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBClientEventProcessor.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBClientEventProcessor.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. @@ -91,6 +91,13 @@ public class CBClientEventProcessor { } break; } + case WSSessionCancelActionClientEvent.ID: { + if (webSession instanceof WebSession session) { + var cancelActionEvent = (WSSessionCancelActionClientEvent) clientEvent; + session.handleActionCancelledEvent(cancelActionEvent.getActionId()); + } + break; + } default: var e = new DBWebException("Unknown client event: " + clientEvent.getId()); log.error(e.getMessage(), e); From 446bd81e082dedc8675920de7227f91a75aedacc Mon Sep 17 00:00:00 2001 From: Viktor Kirst Date: Tue, 31 Mar 2026 19:28:50 +0400 Subject: [PATCH 2/3] dbeaver/pro#8392 Add H2 2.4 JDBC driver (#4227) * dbeaver/pro#8392 Add H2 2.4 JDBC driver * dbeaver/pro#8392 Fixed h2 driver description * dbeaver/pro#8392 Add H2 V.2.4 module * dbeaver/pro#8392 Fixed module name * dbeaver/pro#8392 Rename H2 v2.4 driver to v3 --------- Co-authored-by: MashaKorax <84867187+MashaKorax@users.noreply.github.com> --- .../plugin.xml | 3 +++ server/drivers/h2_v3/pom.xml | 27 +++++++++++++++++++ server/drivers/pom.xml | 1 + 3 files changed, 31 insertions(+) create mode 100644 server/drivers/h2_v3/pom.xml diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml index 93ffbaf603..aa00541b0d 100644 --- a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml +++ b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml @@ -14,6 +14,7 @@ + @@ -35,6 +36,7 @@ + @@ -55,6 +57,7 @@ + diff --git a/server/drivers/h2_v3/pom.xml b/server/drivers/h2_v3/pom.xml new file mode 100644 index 0000000000..f7b8e36a22 --- /dev/null +++ b/server/drivers/h2_v3/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + drivers.h2_v3 + 1.0.0 + + io.cloudbeaver + drivers + 1.0.0 + ../ + + pom + + + h2_v3 + + + + + com.h2database + h2 + 2.4.240 + test + + + + diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml index 1481ccb735..681d140c0d 100644 --- a/server/drivers/pom.xml +++ b/server/drivers/pom.xml @@ -23,6 +23,7 @@ duckdb h2 h2_v2 + h2_v3 jaybird kyuubi mysql From b06a96dc314f136285cbc9eeab19b5ce93ffff84 Mon Sep 17 00:00:00 2001 From: dbeaver-devops <94534301+dbeaver-devops@users.noreply.github.com> Date: Tue, 31 Mar 2026 23:17:03 +0200 Subject: [PATCH 3/3] dbeaver/pro#8893 26.0.3 version bump --- server/bundles/io.cloudbeaver.model.cli/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.model.cli/pom.xml | 2 +- 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.ce/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.server.ce/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.ldap.auth/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.ldap.auth/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/product/web-server/CloudbeaverServer.product | 2 +- server/product/web-server/pom.xml | 2 +- webapp/packages/product-default/package.json | 2 +- 43 files changed, 59 insertions(+), 59 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model.cli/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model.cli/META-INF/MANIFEST.MF index b04c3d5671..52e84cd0af 100644 --- a/server/bundles/io.cloudbeaver.model.cli/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.model.cli/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.cli;singleton:=true -Bundle-Version: 1.0.7.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.8.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: org.jkiss.dbeaver.model.cli;visibility:=reexport diff --git a/server/bundles/io.cloudbeaver.model.cli/pom.xml b/server/bundles/io.cloudbeaver.model.cli/pom.xml index 09859c5ec9..60301d5dd4 100644 --- a/server/bundles/io.cloudbeaver.model.cli/pom.xml +++ b/server/bundles/io.cloudbeaver.model.cli/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.model.cli - 1.0.7-SNAPSHOT + 1.0.8-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF index 6c8c6e9aa0..a559aef247 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.98.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.99.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport, diff --git a/server/bundles/io.cloudbeaver.model/pom.xml b/server/bundles/io.cloudbeaver.model/pom.xml index f263b3ed6b..ca87479995 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.98-SNAPSHOT + 1.0.99-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 66a56028ed..da9f0b756c 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: 26.0.2.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 26.0.3.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: io.cloudbeaver.server.ce diff --git a/server/bundles/io.cloudbeaver.product.ce/pom.xml b/server/bundles/io.cloudbeaver.product.ce/pom.xml index 032bd65014..1f9988b7e2 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 - 26.0.2-SNAPSHOT + 26.0.3-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 217bd951be..2e2a08d13c 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: Cloudbeaver Base JDBC drivers Bundle-SymbolicName: io.cloudbeaver.resources.drivers.base;singleton:=true -Bundle-Version: 1.0.143.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.144.qualifier +Bundle-Release-Date: 20260420 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 974198594e..c2b325ff6e 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.143-SNAPSHOT + 1.0.144-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.server.ce/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.server.ce/META-INF/MANIFEST.MF index ee9807bb64..cd821792bb 100644 --- a/server/bundles/io.cloudbeaver.server.ce/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.server.ce/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: CloudBeaver Community Bundle-SymbolicName: io.cloudbeaver.server.ce;singleton:=true -Bundle-Version: 26.0.2.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 26.0.3.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Activator: io.cloudbeaver.server.CBPlatformActivator diff --git a/server/bundles/io.cloudbeaver.server.ce/pom.xml b/server/bundles/io.cloudbeaver.server.ce/pom.xml index 5ca0f344af..a5a9b2b016 100644 --- a/server/bundles/io.cloudbeaver.server.ce/pom.xml +++ b/server/bundles/io.cloudbeaver.server.ce/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.server.ce - 26.0.2-SNAPSHOT + 26.0.3-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 1a086668b6..617530de17 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: 26.0.2.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 26.0.3.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.core.runtime;visibility:=reexport, diff --git a/server/bundles/io.cloudbeaver.server/pom.xml b/server/bundles/io.cloudbeaver.server/pom.xml index 280d65d341..6eeb6921d4 100644 --- a/server/bundles/io.cloudbeaver.server/pom.xml +++ b/server/bundles/io.cloudbeaver.server/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.server - 26.0.2-SNAPSHOT + 26.0.3-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 31a20bcd95..981e56c38f 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.142.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.143.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: io.cloudbeaver.server.ce, diff --git a/server/bundles/io.cloudbeaver.service.admin/pom.xml b/server/bundles/io.cloudbeaver.service.admin/pom.xml index 3b58aa2fe1..92e992e9e0 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.142-SNAPSHOT + 1.0.143-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 bbdd2e7d20..f6e3208549 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.142.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.143.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: io.cloudbeaver.server.ce diff --git a/server/bundles/io.cloudbeaver.service.auth/pom.xml b/server/bundles/io.cloudbeaver.service.auth/pom.xml index 5598367f1a..6802aa0ab6 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.142-SNAPSHOT + 1.0.143-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 427c6d8941..9b3ead44a3 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.143.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.144.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: io.cloudbeaver.server.ce, diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml b/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml index 016a8fb95c..61454edaf2 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.143-SNAPSHOT + 1.0.144-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 8ad5ee9fa3..4b263c1941 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.60.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.61.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: io.cloudbeaver.server.ce, diff --git a/server/bundles/io.cloudbeaver.service.fs/pom.xml b/server/bundles/io.cloudbeaver.service.fs/pom.xml index 2e0e1ef407..0696c09d18 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.60-SNAPSHOT + 1.0.61-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.ldap.auth/META-INF/MANIFEST.MF index 2433cdb05f..815dd8377c 100644 --- a/server/bundles/io.cloudbeaver.service.ldap.auth/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.ldap.auth/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Cloudbeaver Web Service - LDAP Bundle-Vendor: DBeaver Corp Bundle-SymbolicName: io.cloudbeaver.service.ldap.auth;singleton:=true -Bundle-Version: 1.0.25.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.26.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: org.jkiss.dbeaver.model;visibility:=reexport, diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/pom.xml b/server/bundles/io.cloudbeaver.service.ldap.auth/pom.xml index 25f49ca792..70b81afbc3 100644 --- a/server/bundles/io.cloudbeaver.service.ldap.auth/pom.xml +++ b/server/bundles/io.cloudbeaver.service.ldap.auth/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.ldap.auth - 1.0.25-SNAPSHOT + 1.0.26-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 6238d5862e..541530da70 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.146.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.147.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: io.cloudbeaver.server diff --git a/server/bundles/io.cloudbeaver.service.metadata/pom.xml b/server/bundles/io.cloudbeaver.service.metadata/pom.xml index 522b51e755..8376bc1bfe 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.146-SNAPSHOT + 1.0.147-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 5fe46892be..9bad3800a4 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.60.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.61.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: io.cloudbeaver.model, diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml b/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml index 29f85771fa..d24f164b44 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.60-SNAPSHOT + 1.0.61-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 efd2183b47..7219451702 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.95.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.96.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: io.cloudbeaver.server, diff --git a/server/bundles/io.cloudbeaver.service.rm/pom.xml b/server/bundles/io.cloudbeaver.service.rm/pom.xml index def5aa4f4b..1c6edd2f2d 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.95-SNAPSHOT + 1.0.96-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 8f2875e9ce..0802161d67 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-Name: Cloudbeaver Web Service - Security Bundle-Vendor: DBeaver Corp Bundle-SymbolicName: io.cloudbeaver.service.security;singleton:=true -Bundle-Version: 1.0.98.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.99.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: org.jkiss.dbeaver.model;visibility:=reexport, diff --git a/server/bundles/io.cloudbeaver.service.security/pom.xml b/server/bundles/io.cloudbeaver.service.security/pom.xml index 20adb0b8af..ba0c173146 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.98-SNAPSHOT + 1.0.99-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 00e6435a54..f0a8b2c86c 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.58.qualifier -Bundle-Release-Date: 20260406 +Bundle-Version: 1.0.59.qualifier +Bundle-Release-Date: 20260420 Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Fragment-Host: slf4j.api diff --git a/server/bundles/io.cloudbeaver.slf4j/pom.xml b/server/bundles/io.cloudbeaver.slf4j/pom.xml index f2f5923634..cf6369cde9 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.58-SNAPSHOT + 1.0.59-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 f6811ebaac..c13f9fe823 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 5b5a1259f6..7ba871230a 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.166-SNAPSHOT + 1.0.167-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 de48003232..d7e693b097 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 3d5acace80..ae12beb1de 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 - 26.0.2-SNAPSHOT + 26.0.3-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml index 54fdb95c56..4fdd492007 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 1acc38fce7..0220eb59a4 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 - 26.0.2-SNAPSHOT + 26.0.3-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.ws.feature/feature.xml b/server/features/io.cloudbeaver.ws.feature/feature.xml index 8d845eee2a..538fcd77bf 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 f483e95cb6..5a37c5afe5 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.96-SNAPSHOT + 1.0.97-SNAPSHOT eclipse-feature diff --git a/server/product/web-server/CloudbeaverServer.product b/server/product/web-server/CloudbeaverServer.product index a4c37f2e4d..21cb0af503 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 caa38d3f7e..13b8ea93ea 100644 --- a/server/product/web-server/pom.xml +++ b/server/product/web-server/pom.xml @@ -9,7 +9,7 @@ 1.0.0-SNAPSHOT ../../ - 26.0.2-SNAPSHOT + 26.0.3-SNAPSHOT web-server eclipse-repository Cloudbeaver Server Product diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index 2543ec7480..f4d4eb8aaa 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -9,7 +9,7 @@ "public/**/*", "src/**/*.css" ], - "version": "26.0.2", + "version": "26.0.3", "description": "CloudBeaver Community", "license": "DBeaver Corp", "exports": {