X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=a6c84edd81f627e86410707cfbf81b364078dcdf;hb=063d4d281e8de776823d9c298af60bd0e623fbae;hp=538c4eedfbc6e1ab7843a20947896eecd9e9f5eb;hpb=73a406a81fdf14a93367c94ca915a72fed8945b8;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 538c4ee..a6c84ed 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -752,8 +752,6 @@ public class Repackage {
 			URL sourcesUrl = alternateUri != null ? new URL(alternateUri)
 					: M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact);
 			Path sourcesDownloaded = downloadMaven(sourcesUrl, sourcesArtifact);
-			if (!props.containsKey(ARGEO_ORIGIN_SOURCES_URI.toString()))
-				ARGEO_ORIGIN_SOURCES_URI.put(props, sourcesUrl.toString());
 			processM2SourceJar(sourcesDownloaded, targetBundleDir, merging ? artifact : null, unmodified);
 			logger.log(TRACE, () -> "Processed source " + sourcesDownloaded);
 		} catch (Exception e) {
@@ -1478,24 +1476,23 @@ public class Repackage {
 					logger.log(ERROR, "No licence URL for " + jarDir);
 				}
 			}
-			writer.write("\n");
 
 			// origin
-			String m2Repo = ARGEO_ORIGIN_M2_REPO.get(mapping);
-			String originDesc = ARGEO_ORIGIN_M2.get(mapping);
+			String originDesc = ARGEO_ORIGIN_URI.get(mapping);
 			if (originDesc != null)
-				writer.append("The original component has M2 coordinates:\n" + originDesc.replace(',', '\n') + "\n"
-						+ (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
+				writer.append("\nThe original component comes from " + originDesc + ".\n");
 			else {
-				originDesc = ARGEO_ORIGIN_URI.get(mapping);
+				String m2Repo = ARGEO_ORIGIN_M2_REPO.get(mapping);
+				originDesc = ARGEO_ORIGIN_M2.get(mapping);
 				if (originDesc != null)
-					writer.append("The original component comes from " + originDesc + ".\n");
+					writer.append("\nThe original component has M2 coordinates:\n" + originDesc.replace(',', '\n')
+							+ "\n" + (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
 				else
 					logger.log(ERROR, "Cannot find origin information in " + jarDir);
 			}
 			String originSources = ARGEO_ORIGIN_SOURCES_URI.get(mapping);
 			if (originSources != null)
-				writer.append("The original sources come from " + originSources + ".\n");
+				writer.append("\nThe original sources come from " + originSources + ".\n");
 
 			if (Files.exists(jarDir.resolve(CHANGES)))
 				writer.append("\nA detailed list of changes is available under " + CHANGES + ".\n");
@@ -1508,7 +1505,6 @@ public class Repackage {
 					writer.append("Corresponding sources are available under OSGI-OPT/src.\n");
 			}
 		}
-
 	}
 
 	/**