Merge branch 'devel' into CB-5424-provide-a-means-to-disable-or-purge…

…-the-query-manager-history
dbeaver · Oct 11, 2024 · a4e4aae · a4e4aae
2 parents 41fe737 + d44c9f3
commit a4e4aae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/server/drivers/db2-jt400/pom.xml b/server/drivers/db2-jt400/pom.xml
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>net.sf.jt400</groupId>
 			<artifactId>jt400</artifactId>
-			<version>10.5</version>
+			<version>20.0.7</version>
 		</dependency>
     </dependencies>
 

diff --git a/server/drivers/mysql/pom.xml b/server/drivers/mysql/pom.xml
@@ -20,6 +20,10 @@
             <artifactId>mysql-connector-j</artifactId>
             <version>8.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml
@@ -1,7 +1,12 @@
 <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>
-    <groupId>io.cloudbeaver</groupId>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>cloudbeaver</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
     <artifactId>drivers</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>