Revert "Update dependencies, fix build (#653)"

This reverts commit 9548db6.

Author: yahavi

.gitignore

@@ -16,5 +16,4 @@ build-info.iws
 atlassian-*.xml
 /.nb-gradle/private/
 /itest/src/test/resources/org/jfrog/build/cache
-/build-info-extractor/src/test/resources/artifactory-bi.properties
-local.properties
+/build-info-extractor/src/test/resources/artifactory-bi.properties

build-info-api/src/main/java/org/jfrog/build/api/builder/BuildInfoBuilder.java

@@ -1,14 +1,7 @@
 package org.jfrog.build.api.builder;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jfrog.build.api.Agent;
-import org.jfrog.build.api.Build;
-import org.jfrog.build.api.BuildAgent;
-import org.jfrog.build.api.BuildRetention;
-import org.jfrog.build.api.Issues;
-import org.jfrog.build.api.MatrixParameter;
-import org.jfrog.build.api.Module;
-import org.jfrog.build.api.Vcs;
+import org.jfrog.build.api.*;
 import org.jfrog.build.api.release.PromotionStatus;
 
 import java.text.SimpleDateFormat;

build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/transformer/PomTransformer.java

@@ -5,13 +5,13 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.JDOMException;
-import org.jdom2.Namespace;
-import org.jdom2.input.SAXBuilder;
-import org.jdom2.output.Format;
-import org.jdom2.output.XMLOutputter;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.Namespace;
+import org.jdom.input.SAXBuilder;
+import org.jdom.output.Format;
+import org.jdom.output.XMLOutputter;
 import org.jfrog.build.extractor.EolDetectingInputStream;
 import org.jfrog.build.extractor.maven.reader.ModuleName;
 

build-info-extractor-npm/src/main/java/org/jfrog/build/extractor/npm/extractor/NpmDependencyTree.java

@@ -13,8 +13,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.swing.tree.TreeNode;
-
 /**
  * @author Yahav Itzhak
  */
@@ -33,10 +31,9 @@ public class NpmDependencyTree {
     public static DependencyTree createDependencyTree(JsonNode npmList, NpmScope scope, Path workingDir) {
         DependencyTree rootNode = new DependencyTree();
         populateDependenciesTree(rootNode, npmList.get("dependencies"), new String[]{getProjectName(npmList, workingDir)}, scope);
-        for (TreeNode child : rootNode.getChildren()) {
-            DependencyTree dependencyTree = (DependencyTree) child;
-            NpmPackageInfo packageInfo = (NpmPackageInfo) dependencyTree.getUserObject();
-            dependencyTree.setScopes(getScopes(packageInfo.getName(), packageInfo.getScope()));
+        for (DependencyTree child : rootNode.getChildren()) {
+            NpmPackageInfo packageInfo = (NpmPackageInfo) child.getUserObject();
+            child.setScopes(getScopes(packageInfo.getName(), packageInfo.getScope()));
         }
         return rootNode;
     }

build-info-extractor/src/main/java/org/jfrog/build/extractor/builder/BuildInfoBuilder.java

@@ -3,7 +3,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jfrog.build.api.release.PromotionStatus;
 import org.jfrog.build.extractor.ci.*;
-import org.jfrog.build.extractor.ci.Module;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

build-info-extractor/src/main/java/org/jfrog/build/extractor/builder/BuildInfoMavenBuilder.java

@@ -4,7 +4,6 @@
 import org.jfrog.build.api.release.PromotionStatus;
 import org.jfrog.build.api.util.CommonUtils;
 import org.jfrog.build.extractor.ci.*;
-import org.jfrog.build.extractor.ci.Module;
 
 import java.util.Date;
 import java.util.List;

build-info-extractor/src/main/java/org/jfrog/build/extractor/scan/DependencyTree.java

@@ -6,8 +6,6 @@
 import org.jfrog.build.api.util.Log;
 
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -112,7 +110,7 @@ public void setMetadata(boolean metadata) {
 
     public void setPrefix(String prefix) {
         packagePrefix = prefix.toLowerCase() + "://";
-        getChildren().forEach(node -> ((DependencyTree)node).setPrefix(prefix));
+        getChildren().forEach(node -> node.setPrefix(prefix));
     }
 
     /**
@@ -127,13 +125,13 @@ public int getIssueCount() {
      * @return Node's children
      */
     @SuppressWarnings({"WeakerAccess", "unchecked"})
-    public Vector<TreeNode> getChildren() {
+    public Vector<DependencyTree> getChildren() {
         return children != null ? children : new Vector<>();
     }
 
     @JsonProperty(value = "nodes")
     @SuppressWarnings({"unchecked", "unused"})
-    public List<TreeNode> getNodes() {
+    public List<DependencyTree> getNodes() {
         return children;
     }
 
@@ -148,7 +146,7 @@ public List<TreeNode> getNodes() {
     @SuppressWarnings({"WeakerAccess", "unused"})
     public Set<Issue> processTreeIssues() {
         setIssuesComponent();
-        getChildren().forEach(child -> issues.addAll(((DependencyTree)child).processTreeIssues()));
+        getChildren().forEach(child -> issues.addAll(child.processTreeIssues()));
         setTopIssue();
         sortChildren();
         return issues;
@@ -162,10 +160,7 @@ private void setIssuesComponent() {
     }
 
     private void sortChildren() {
-        Vector children = getChildren();
-        Vector<DependencyTree> dependencyTrees = (Vector<DependencyTree>) children;
-
-        dependencyTrees.sort(Comparator
+        getChildren().sort(Comparator
                 .comparing(DependencyTree::getTopIssue, Comparator.comparing(Issue::getSeverity))
                 .thenComparing(DependencyTree::getIssueCount)
                 .thenComparing(DependencyTree::getChildCount)
@@ -193,7 +188,7 @@ private void setTopIssue() {
     public Set<License> processTreeViolatedLicenses() {
         setViolatedLicensesComponent();
         violatedLicenses.addAll(licenses.stream().filter(License::isViolate).collect(Collectors.toSet()));
-        getChildren().forEach(child -> violatedLicenses.addAll(((DependencyTree)child).processTreeViolatedLicenses()));
+        getChildren().forEach(child -> violatedLicenses.addAll(child.processTreeViolatedLicenses()));
         return violatedLicenses;
     }
 
@@ -231,7 +226,7 @@ public DependencyTree find(String componentId) {
             return this;
         }
         return getChildren().stream()
-                .map(child -> ((DependencyTree)child).find(componentId))
+                .map(child -> child.find(componentId))
                 .filter(Objects::nonNull)
                 .findAny()
                 .orElse(null);

build-info-extractor/src/test/java/org/jfrog/build/extractor/BuildExtractorUtilsTest.java

@@ -5,7 +5,6 @@
 import org.jfrog.build.extractor.builder.DependencyBuilder;
 import org.jfrog.build.extractor.builder.ModuleBuilder;
 import org.jfrog.build.extractor.ci.*;
-import org.jfrog.build.extractor.ci.Module;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;

build-info-extractor/src/test/java/org/jfrog/build/extractor/clientConfiguration/client/ArtifactoryManagerTest.java

@@ -7,7 +7,6 @@
 import org.jfrog.build.api.release.PromotionStatus;
 import org.jfrog.build.extractor.builder.BuildInfoBuilder;
 import org.jfrog.build.extractor.ci.*;
-import org.jfrog.build.extractor.ci.Module;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;