#scm-ver 0.1.0

Author: Kindratte

mdeps

@@ -1 +1 @@
-com.github.scm4j:scm4j-deployer-api:master-SNAPSHOT
+com.github.scm4j:scm4j-deployer-api:0.1.0

src/main/java/org/scm4j/deployer/engine/DeployerEngine.java

@@ -49,7 +49,11 @@ public void deploy(String artifactId, String version) {
                 log.warn(productName.append(" already installed!").toString());
             } else {
                 if (!product.getDependentProducts().isEmpty()) {
-                    deployDependent(product, deployedProducts);
+                    List<String> dependents = product.getDependentProducts();
+                    for(String dependent : dependents) {
+                        Artifact depArt = new DefaultArtifact(dependent);
+                        deploy(depArt.getArtifactId(), depArt.getVersion());
+                    }
                     deployedProducts = Utils.readYml(deployedProductsFolder);
                 }
                 File installersJar = runner.getDepCtx().get(artifactId).getArtifacts().get(INSTALLERS_JAR_NAME);
@@ -70,25 +74,6 @@ public void deploy(String artifactId, String version) {
         }
     }
 
-    private void deployDependent(IProduct product, Map<String, List<String>> deployedProducts) {
-            List<String> dependents = product.getDependentProducts();
-            for(String dep : dependents) {
-                log.info("Need to install " + dep);
-                String[] artIdPlusVers = dep.split("-");
-                if(deployedProducts.getOrDefault(artIdPlusVers[0], new ArrayList<>()).contains(artIdPlusVers[1])) {
-                    continue;
-                } else {
-                    File productFile = download(artIdPlusVers[0], artIdPlusVers[1]);
-                    IProduct dependent = runner.getProduct(productFile);
-                    if(dependent.isInstalled(artIdPlusVers[0])) {
-                        continue;
-                    } else {
-                        deploy(artIdPlusVers[0],artIdPlusVers[1]);
-                    }
-                }
-            }
-    }
-
     @Override
     public File download(String artifactId, String version) {
         String groupId = Utils.getGroupId(runner, artifactId);

src/main/java/org/scm4j/deployer/engine/DeployerRunner.java

@@ -48,7 +48,7 @@ public class DeployerRunner {
 
     @SneakyThrows
     public DeployerRunner(File flashFolder, File workingFolder, String productListArtifactoryUrl) {
-        if(flashFolder == null)
+        if (flashFolder == null)
             flashFolder = workingFolder;
         this.repository = new File(workingFolder, REPOSITORY_FOLDER_NAME);
         this.flashRepository = new File(flashFolder, REPOSITORY_FOLDER_NAME);
@@ -109,12 +109,11 @@ private List<Artifact> resolveDependencies(List<Artifact> artifacts) {
         List<Artifact> components = new ArrayList<>();
         session = Utils.newRepositorySystemSession(system, TMP_REPOSITORY);
         CollectRequest collectRequest = new CollectRequest();
-        List<String> urls = productList.getRepos().stream()
+        //TODO add localrepo in runtime
+        productList.getRepos().stream()
                 .map(ArtifactoryReader::toString)
-                .sorted()
-                .collect(Collectors.toList());
-        urls.forEach(url -> collectRequest.addRepository
-                (new RemoteRepository.Builder("", "default", url).build()));
+                .forEach(url -> collectRequest.addRepository
+                        (new RemoteRepository.Builder("", "default", url).build()));
         DependencyFilter filter = DependencyFilterUtils.classpathFilter(JavaScopes.COMPILE);
         for (Artifact artifact : artifacts) {
             collectRequest.setRoot(new Dependency(artifact, JavaScopes.COMPILE));

version

@@ -1 +1 @@
-0.1.0-SNAPSHOT
+0.1.0