X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fmaven%2FMavenConventionsUtils.java;h=4e8d3fb832f54ac6c6f24d905e4c8850682f3209;hb=399702cec859f48ec171c30d268c55eb632d472a;hp=2bf08c5b39d31ecaca75455085d82c0d2184260a;hpb=4578db21c506c3f8eee57a896c9e71154e2065be;p=gpl%2Fargeo-slc.git

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 2bf08c5b3..4e8d3fb83 100644
--- 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.repo.maven;
 
 import java.io.File;
@@ -85,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,
@@ -95,7 +110,7 @@ public class MavenConventionsUtils {
 		// XML header
 		p.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 		p.append("<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n");
-		p.append("<modelVersion>4.0.0</modelVersion>");
+		p.append("<modelVersion>4.0.0</modelVersion>\n");
 
 		// Artifact
 		if (parent != null) {
@@ -148,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();