Rename default artifact base path

[gpl/argeo-slc.git] / runtime / org.argeo.slc.repo / src / main / java / org / argeo / slc / repo / maven / ImportMavenDependencies.java

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
index 684e75cdaed2761f152987e7f9df11c514cfc791..19d7c8d8c2084f36fb0badccae551b3f715986ef 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
@@ -56,12 +56,13 @@ public class ImportMavenDependencies implements Runnable {
        private AetherTemplate aetherTemplate;
        private String rootCoordinates = "org.argeo.dep:versions-all:pom:1.2.0";
        private String distCoordinates = "org.argeo.tp:dist:pom:1.3.0";
+       private String parentPomCoordinates = "org.argeo:parent:1.2.0";
        private Set<String> excludedArtifacts = new HashSet<String>();
 
        private Repository repository;
        private String workspace;
 
-       private String artifactBasePath = RepoConstants.ARTIFACTS_BASE_PATH;
+       private String artifactBasePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH;
 
        private ArtifactIndexer artifactIndexer = new ArtifactIndexer();
        private JarFileIndexer jarFileIndexer = new JarFileIndexer();
@@ -88,7 +89,7 @@ public class ImportMavenDependencies implements Runnable {
                                        node.remove();
                        }
                        session.save();
-                       
+
                        // sync
                        syncDistribution(session, artifacts);
                } catch (Exception e) {
@@ -112,7 +113,8 @@ public class ImportMavenDependencies implements Runnable {
                                        registeredArtifacts, pomArtifact);
                        Artifact sdkArtifact = new DefaultArtifact(distCoordinates);
                        String sdkPom = MavenConventionsUtils.artifactsAsDependencyPom(
-                                       sdkArtifact, registeredArtifacts);
+                                       sdkArtifact, registeredArtifacts, new DefaultArtifact(
+                                                       parentPomCoordinates));
                        if (log.isDebugEnabled())
                                log.debug("Gathered " + registeredArtifacts.size()
                                                + " artifacts:\n" + sdkPom);