Skip to content

Commit ca33434

Browse files
SychevAndreySychevAndrey
authored
Merge branch 'devel' into dbeaver/pro#7990-qmdb-csv-export
2 parents ef62719 + 3dcae70 commit ca33434

60 files changed

Lines changed: 164 additions & 83 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎server/bundles/io.cloudbeaver.model.cli/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
33
Bundle-Vendor: DBeaver Corp
44
Bundle-Name: Cloudbeaver Web Model
55
Bundle-SymbolicName: io.cloudbeaver.model.cli;singleton:=true
6-
Bundle-Version: 1.0.9.qualifier
7-
Bundle-Release-Date: 20260504
6+
Bundle-Version: 1.0.10.qualifier
7+
Bundle-Release-Date: 20260518
88
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.jkiss.dbeaver.model.cli;visibility:=reexport

‎server/bundles/io.cloudbeaver.model.cli/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<relativePath>../</relativePath>
1111
</parent>
1212
<artifactId>io.cloudbeaver.model.cli</artifactId>
13-
<version>1.0.9-SNAPSHOT</version>
13+
<version>1.0.10-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>
1515

1616
</project>

‎server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
33
Bundle-Vendor: DBeaver Corp
44
Bundle-Name: Cloudbeaver Web Model
55
Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
6-
Bundle-Version: 1.0.100.qualifier
7-
Bundle-Release-Date: 20260504
6+
Bundle-Version: 1.0.101.qualifier
7+
Bundle-Release-Date: 20260518
88
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,

‎server/bundles/io.cloudbeaver.model/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<relativePath>../</relativePath>
1111
</parent>
1212
<artifactId>io.cloudbeaver.model</artifactId>
13-
<version>1.0.100-SNAPSHOT</version>
13+
<version>1.0.101-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>
1515

1616
</project>

‎server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@ public void removeEventHandler(@NotNull CBWebSessionEventHandler handler) {
116116
}
117117
}
118118

119+
public void migrateEventHandlersTo(@NotNull BaseWebSession target) {
120+
synchronized (sessionEventHandlers) {
121+
sessionEventHandlers.forEach(target::addEventHandler);
122+
sessionEventHandlers.clear();
123+
}
124+
}
125+
119126
public boolean updateSMSession(SMAuthInfo smAuthInfo) throws DBException {
120127
return userContext.refresh(smAuthInfo);
121128
}

‎server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
33
Bundle-Vendor: DBeaver Corp
44
Bundle-Name: Cloudbeaver Community Product
55
Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true
6-
Bundle-Version: 26.0.4.qualifier
7-
Bundle-Release-Date: 20260504
6+
Bundle-Version: 26.0.5.qualifier
7+
Bundle-Release-Date: 20260518
88
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: io.cloudbeaver.server.ce

‎server/bundles/io.cloudbeaver.product.ce/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<relativePath>../</relativePath>
1111
</parent>
1212
<artifactId>io.cloudbeaver.product.ce</artifactId>
13-
<version>26.0.4-SNAPSHOT</version>
13+
<version>26.0.5-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>
1515

1616
</project>

‎server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Cloudbeaver Base JDBC drivers
44
Bundle-SymbolicName: io.cloudbeaver.resources.drivers.base;singleton:=true
5-
Bundle-Version: 1.0.145.qualifier
6-
Bundle-Release-Date: 20260504
5+
Bundle-Version: 1.0.146.qualifier
6+
Bundle-Release-Date: 20260518
77
Bundle-Vendor: DBeaver Corp
88
Bundle-ActivationPolicy: lazy
99
Automatic-Module-Name: io.cloudbeaver.resources.drivers.base

‎server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<relativePath>../</relativePath>
1010
</parent>
1111
<artifactId>io.cloudbeaver.resources.drivers.base</artifactId>
12-
<version>1.0.145-SNAPSHOT</version>
12+
<version>1.0.146-SNAPSHOT</version>
1313
<packaging>eclipse-plugin</packaging>
1414
</project>

‎server/bundles/io.cloudbeaver.server.ce/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
33
Bundle-Vendor: DBeaver Corp
44
Bundle-Name: CloudBeaver Community
55
Bundle-SymbolicName: io.cloudbeaver.server.ce;singleton:=true
6-
Bundle-Version: 26.0.4.qualifier
7-
Bundle-Release-Date: 20260504
6+
Bundle-Version: 26.0.5.qualifier
7+
Bundle-Release-Date: 20260518
88
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Bundle-ActivationPolicy: lazy
1010
Bundle-Activator: io.cloudbeaver.server.CBPlatformActivator

0 commit comments

Comments
 (0)