Maven model refactoring

Former-commit-id: 81ea7be3

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

@@ -846,9 +846,9 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
             validateFilesPresence(runnableContext);
         }
 
-        long st = System.currentTimeMillis();
+//        long st = System.currentTimeMillis();
         resolveDependencies(runnableContext);
-        System.out.println("Resolve: " + (System.currentTimeMillis() - st) + "ms");
+//        System.out.println("Resolve: " + (System.currentTimeMillis() - st) + "ms");
 
         List<URL> libraryURLs = new ArrayList<>();
         // Load libraries

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

@@ -174,7 +174,11 @@ public class MavenArtifact
         return localVersions;
     }
 
-    public void setActiveVersion(String activeVersion) {
+    public String getActiveVersionName() {
+        return activeVersion;
+    }
+
+    public void setActiveVersionName(String activeVersion) {
         this.activeVersion = activeVersion;
     }
 
@@ -224,7 +228,6 @@ public class MavenArtifact
         if (version == null) {
             version = new MavenArtifactVersion(monitor, this, versionStr);
             localVersions.add(version);
-            repository.flushCache();
         }
         if (setActive) {
             activeVersion = versionStr;

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

@@ -166,7 +166,7 @@ public class MavenRepository
                                 MavenRepository.this,
                                 atts.getValue(ATTR_GROUP_ID),
                                 atts.getValue(ATTR_ARTIFACT_ID));
-                            lastArtifact.setActiveVersion(atts.getValue(ATTR_ACTIVE_VERSION));
+                            lastArtifact.setActiveVersionName(atts.getValue(ATTR_ACTIVE_VERSION));
                             cachedArtifacts.put(
                                 MavenArtifactReference.makeId(lastArtifact.getGroupId(), lastArtifact.getArtifactId()),
                                 lastArtifact);
@@ -229,16 +229,13 @@ public class MavenRepository
                     xml.addAttribute(ATTR_URL, url);
 
                     for (MavenArtifact artifact : cachedArtifacts.values()) {
-                        if (CommonUtils.isEmpty(artifact.getLocalVersions())) {
+                        if (CommonUtils.isEmpty(artifact.getActiveVersionName())) {
                             continue;
                         }
-                        MavenArtifactVersion activeVersion = artifact.getActiveVersion();
-                        if (activeVersion != null) {
-                            try (XMLBuilder.Element e1 = xml.startElement(TAG_ARTIFACT)) {
-                                xml.addAttribute(ATTR_GROUP_ID, artifact.getGroupId());
-                                xml.addAttribute(ATTR_ARTIFACT_ID, artifact.getArtifactId());
-                                xml.addAttribute(ATTR_ACTIVE_VERSION, activeVersion.getVersion());
-                            }
+                        try (XMLBuilder.Element e1 = xml.startElement(TAG_ARTIFACT)) {
+                            xml.addAttribute(ATTR_GROUP_ID, artifact.getGroupId());
+                            xml.addAttribute(ATTR_ARTIFACT_ID, artifact.getArtifactId());
+                            xml.addAttribute(ATTR_ACTIVE_VERSION, artifact.getActiveVersionName());
                         }
                     }
                 }