Improve workspace normalization

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

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java
index 9b3bfe7e07040323d54365fdb5696732757db921..4e8d3fb832f54ac6c6f24d905e4c8850682f3209 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java
@@ -100,7 +100,7 @@ public class MavenConventionsUtils {
        /** Relative path to the directories where the files will be stored */
        public static String artifactParentPath(Artifact artifact) {
                return artifact.getGroupId().replace('.', '/') + '/'
-                               + artifact.getArtifactId() + '/' + artifact.getVersion();
+                               + artifact.getArtifactId() + '/' + artifact.getBaseVersion();
        }
 
        public static String artifactsAsDependencyPom(Artifact pomArtifact,
@@ -163,9 +163,9 @@ public class MavenConventionsUtils {
                p.append("</dependencyManagement>\n");
 
                // Repositories
-//             p.append("<repositories>\n");
-//             p.append("<repository><id>argeo</id><url>http://maven.argeo.org/argeo</url></repository>\n");
-//             p.append("</repositories>\n");
+               // p.append("<repositories>\n");
+               // p.append("<repository><id>argeo</id><url>http://maven.argeo.org/argeo</url></repository>\n");
+               // p.append("</repositories>\n");
 
                p.append("</project>\n");
                return p.toString();