Dependencies model

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDependencies.java

@@ -52,6 +52,7 @@ public class DriverDependencies implements DBPDriverDependencies
                 libraryList.clear();
                 libraryList.addAll(libMap.values());
 
+/*
                 {
                     StringBuilder sb = new StringBuilder();
                     Set<String> ns = new TreeSet<>();
@@ -72,12 +73,14 @@ public class DriverDependencies implements DBPDriverDependencies
                         dumpNode(node, 0);
                     }
                 }
+*/
             }
         } catch (IOException e) {
             throw new DBException("IO error while resolving dependencies", e);
         }
     }
 
+/*
     private void dumpNode(DependencyNode node, int level) {
         if (node.duplicate) {
             return;
@@ -88,6 +91,7 @@ public class DriverDependencies implements DBPDriverDependencies
             dumpNode(child, level + 1);
         }
     }
+*/
 
     private void resolveDependencies(DBRProgressMonitor monitor, DependencyNode ownerNode, Map<String, DBPDriverLibrary> libMap) throws IOException {
         Collection<? extends DBPDriverLibrary> dependencies = ownerNode.library.getDependencies(monitor);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java

@@ -236,13 +236,13 @@ public class MavenArtifactVersion {
         Element dependenciesElement = XMLUtils.getChildElement(element, "dependencies");
         if (dependenciesElement != null) {
             for (Element dep : XMLUtils.getChildElementList(dependenciesElement, "dependency")) {
-                String groupId = XMLUtils.getChildElementBody(dep, "groupId");
-                String artifactId = XMLUtils.getChildElementBody(dep, "artifactId");
+                String groupId = evaluateString(XMLUtils.getChildElementBody(dep, "groupId"));
+                String artifactId = evaluateString(XMLUtils.getChildElementBody(dep, "artifactId"));
                 if (groupId == null || artifactId == null) {
                     log.warn("Broken dependency reference: " + groupId + ":" + artifactId);
                     continue;
                 }
-                String version = XMLUtils.getChildElementBody(dep, "version");
+                String version = evaluateString(XMLUtils.getChildElementBody(dep, "version"));
                 if (version == null) {
                     version = findDependencyVersion(monitor, groupId, artifactId);
                 }
@@ -308,6 +308,9 @@ public class MavenArtifactVersion {
     }
 
     private String evaluateString(String value) {
+        if (value == null) {
+            return null;
+        }
         return GeneralUtils.replaceVariables(value, variableResolver);
     }