From 8c960cb7473ed2cabf6946b31cdb65da1c5c300f Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 14 Feb 2018 23:53:45 +0300
Subject: [PATCH] #500 PG Postgis support (exclude tranvsitive dependencies)

---
 .../registry/driver/DriverLibraryMavenArtifact.java      | 9 +++++++++
 plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml      | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenArtifact.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
index 781214ef15..4c9a39b645 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
@@ -47,6 +47,7 @@ public class DriverLibraryMavenArtifact extends DriverLibraryAbstract
     private MavenArtifactReference reference;
     protected MavenArtifactVersion localVersion;
     private String preferredVersion;
+    private boolean ignoreDependencies;
 
     public DriverLibraryMavenArtifact(DriverDescriptor driver, FileType type, String path, String preferredVersion) {
         super(driver, type, path);
@@ -55,6 +56,7 @@ public class DriverLibraryMavenArtifact extends DriverLibraryAbstract
 
     public DriverLibraryMavenArtifact(DriverDescriptor driver, IConfigurationElement config) {
         super(driver, config);
+        ignoreDependencies = CommonUtils.toBoolean(config.getAttribute("ignore-dependencies"));
         initArtifactReference(null);
     }
 
@@ -91,6 +93,10 @@ public class DriverLibraryMavenArtifact extends DriverLibraryAbstract
         return true;
     }
 
+    public boolean isIgnoreDependencies() {
+        return ignoreDependencies;
+    }
+
     @NotNull
     @Override
     public Collection<String> getAvailableVersions(DBRProgressMonitor monitor) throws IOException {
@@ -184,6 +190,9 @@ public class DriverLibraryMavenArtifact extends DriverLibraryAbstract
     @Override
     public Collection<? extends DBPDriverLibrary> getDependencies(@NotNull DBRProgressMonitor monitor) throws IOException {
         List<DriverLibraryMavenDependency> dependencies = new ArrayList<>();
+        if (ignoreDependencies) {
+            return dependencies;
+        }
         MavenArtifactVersion localVersion = resolveLocalVersion(monitor, false);
         if (localVersion != null) {
 
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml b/plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml
index e56598ba3e..28d1b718d4 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml
@@ -210,8 +210,8 @@
                     description="%driver.postgresql.description">
                     <replace provider="generic" driver="postgresql"/>
                     <file type="jar" path="maven:/org.postgresql:postgresql:RELEASE[42.2.0.jre7]" bundle="!drivers.postgresql"/>
-                    <file type="jar" path="maven:/net.postgis:postgis-jdbc:RELEASE[2.2.1]" bundle="!drivers.postgresql"/>
-                    <file type="jar" path="maven:/net.postgis:postgis-jdbc-jtsparser:RELEASE[2.2.1]" bundle="!drivers.postgresql"/>
+                    <file type="jar" path="maven:/net.postgis:postgis-jdbc:RELEASE[2.2.1]" ignore-dependencies="true" bundle="!drivers.postgresql"/>
+                    <file type="jar" path="maven:/net.postgis:postgis-jdbc-jtsparser:RELEASE[2.2.1]" ignore-dependencies="true" bundle="!drivers.postgresql"/>
 
                     <file type="license" path="drivers/postgresql/LICENSE.txt" bundle="drivers.postgresql"/>
                     <file type="jar" path="drivers/postgresql/postgresql.jar" bundle="drivers.postgresql"/>
-- 
GitLab