You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/09/24 18:47:06 UTC
git commit: install-kar goal handles mvn URL containing repository
location
Repository: karaf
Updated Branches:
refs/heads/master dee199274 -> 651ec813c
install-kar goal handles mvn URL containing repository location
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/651ec813
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/651ec813
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/651ec813
Branch: refs/heads/master
Commit: 651ec813c4faaecd432f40830034a530c1de234e
Parents: dee1992
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Sep 24 18:46:29 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Sep 24 18:46:29 2014 +0200
----------------------------------------------------------------------
.../org/apache/karaf/tooling/features/InstallKarsMojo.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/651ec813/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
index a5f77ea..ff4021d 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
@@ -408,6 +408,14 @@ public class InstallKarsMojo extends MojoSupport {
// for bad formed URL (like in Camel for mustache-compiler), we remove the trailing /
bundleLocation = bundleLocation.substring(0, bundleLocation.length() - 1);
}
+ if (bundleLocation.startsWith("mvn:http")) {
+ // cleanup the URL containing the repository location directly in the URL
+ int index = bundleLocation.indexOf("!");
+ if (index != -1) {
+ bundleLocation = bundleLocation.substring(index + 1);
+ bundleLocation = "mvn:" + bundleLocation;
+ }
+ }
bundleFile = dependencyHelper.resolveById(bundleLocation, getLog());
bundleLocation = dependencyHelper.pathFromMaven(bundleLocation);
} else {