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/19 09:14:37 UTC
git commit: [KARAF-3224] Add wrap and blueprint URL support in MOJO
Repository: karaf
Updated Branches:
refs/heads/master 0fe0599bc -> c0589bc4b
[KARAF-3224] Add wrap and blueprint URL support in MOJO
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c0589bc4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c0589bc4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c0589bc4
Branch: refs/heads/master
Commit: c0589bc4b6a644c3c759963f7bd4651368510526
Parents: 0fe0599
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Sep 19 09:13:59 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Sep 19 09:13:59 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/tooling/features/MavenUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c0589bc4/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java
index 6c7a15e..52bfcec 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MavenUtil.java
@@ -41,7 +41,7 @@ public class MavenUtil {
static final DefaultRepositoryLayout layout = new DefaultRepositoryLayout();
private static final Pattern aetherPattern = Pattern.compile("([^: ]+):([^: ]+)(:([^: ]*)(:([^: ]+))?)?:([^: ]+)");
- private static final Pattern mvnPattern = Pattern.compile("(?:wrap:)?mvn:([^/ ]+)/([^/ ]+)/([^/\\$ ]*)(/([^/\\$ ]+)(/([^/\\$ ]+))?)?(\\$.+)?");
+ private static final Pattern mvnPattern = Pattern.compile("(?:(?:wrap:)|(?:blueprint:))?mvn:([^/ ]+)/([^/ ]+)/([^/\\$ ]*)(/([^/\\$ ]+)(/([^/\\$ ]+))?)?(/\\$.+)?");
/**
* Convert PAX URL mvn format to aether coordinate format.